diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/EnumJsonReaderMethod.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/EnumJsonReaderMethod.mustache new file mode 100644 index 000000000000..da74fc22b3a1 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/EnumJsonReaderMethod.mustache @@ -0,0 +1 @@ +{{#allowableValues}}{{#enumVars}}{{#-first}}{{#isNumeric}}{{#isLong}}GetInt64{{/isLong}}{{#isFloat}}GetSingle{{/isFloat}}{{#isDouble}}GetDouble{{/isDouble}}{{#isDecimal}}GetDecimal{{/isDecimal}}{{^isLong}}{{^isFloat}}{{^isDouble}}{{^isDecimal}}GetInt32{{/isDecimal}}{{/isDouble}}{{/isFloat}}{{/isLong}}{{/isNumeric}}{{/-first}}{{/enumVars}}{{/allowableValues}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache index 7b779b3fa7c2..dcd7f73932d7 100644 --- a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache @@ -21,7 +21,7 @@ {{/-first}} {{/enumVars}} {{/allowableValues}} - {{>visibility}} enum {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{#vendorExtensions.x-enum-byte}}: byte{{/vendorExtensions.x-enum-byte}} + {{>visibility}} enum {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{#vendorExtensions.x-enum-byte}} : byte{{/vendorExtensions.x-enum-byte}}{{#isLong}} : long{{/isLong}} { {{#allowableValues}} {{#enumVars}} @@ -90,9 +90,42 @@ /// {{>visibility}} static {{>EnumValueDataType}} ToJsonValue({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} value) { - {{^isString}} + {{#isInteger}} return ({{>EnumValueDataType}}) value; - {{/isString}} + {{/isInteger}} + {{#isLong}} + return ({{>EnumValueDataType}}) value; + {{/isLong}} + {{#isFloat}} + {{#allowableValues}} + {{#enumVars}} + if (value == {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}.{{name}}) + return {{{value}}}f; + + {{/enumVars}} + {{/allowableValues}} + throw new NotImplementedException($"Value could not be handled: '{value}'"); + {{/isFloat}} + {{#isDouble}} + {{#allowableValues}} + {{#enumVars}} + if (value == {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}.{{name}}) + return {{{value}}}d; + + {{/enumVars}} + {{/allowableValues}} + throw new NotImplementedException($"Value could not be handled: '{value}'"); + {{/isDouble}} + {{#isDecimal}} + {{#allowableValues}} + {{#enumVars}} + if (value == {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}.{{name}}) + return {{{value}}}m; + + {{/enumVars}} + {{/allowableValues}} + throw new NotImplementedException($"Value could not be handled: '{value}'"); + {{/isDecimal}} {{#isString}} {{#allowableValues}} {{#enumVars}} @@ -121,6 +154,42 @@ /// public override {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + {{#isInteger}} + string rawValue = reader.{{>EnumJsonReaderMethod}}().ToString(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isInteger}} + {{#isLong}} + string rawValue = reader.{{>EnumJsonReaderMethod}}().ToString(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isLong}} + {{#isFloat}} + string rawValue = reader.GetSingle().ToString(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isFloat}} + {{#isDouble}} + string rawValue = reader.GetDouble().ToString(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isDouble}} + {{#isDecimal}} + string rawValue = reader.GetDecimal().ToString(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isDecimal}} + {{#isString}} string{{nrt?}} rawValue = reader.GetString(); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = rawValue == null @@ -131,6 +200,7 @@ return result.Value; throw new JsonException(); + {{/isString}} } /// @@ -141,7 +211,12 @@ /// public override void Write(Utf8JsonWriter writer, {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {{#lambda.camelcase_sanitize_param}}{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{/lambda.camelcase_sanitize_param}}, JsonSerializerOptions options) { + {{^isString}} + writer.WriteNumberValue({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.ToJsonValue({{#lambda.camelcase_sanitize_param}}{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{/lambda.camelcase_sanitize_param}})); + {{/isString}} + {{#isString}} writer.WriteStringValue({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.ToJsonValue({{#lambda.camelcase_sanitize_param}}{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{/lambda.camelcase_sanitize_param}}).ToString()); + {{/isString}} } } @@ -159,6 +234,45 @@ /// public override {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + + {{#isInteger}} + string rawValue = reader.{{>EnumJsonReaderMethod}}().ToString(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isInteger}} + {{#isLong}} + string rawValue = reader.{{>EnumJsonReaderMethod}}().ToString(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isLong}} + {{#isFloat}} + string rawValue = reader.GetSingle().ToString(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isFloat}} + {{#isDouble}} + string rawValue = reader.GetDouble().ToString(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isDouble}} + {{#isDecimal}} + string rawValue = reader.GetDecimal().ToString(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isDecimal}} + {{#isString}} string{{nrt?}} rawValue = reader.GetString(); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = rawValue == null @@ -169,6 +283,7 @@ return result.Value; throw new JsonException(); + {{/isString}} } /// @@ -179,7 +294,15 @@ /// public override void Write(Utf8JsonWriter writer, {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? {{#lambda.camelcase_sanitize_param}}{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{/lambda.camelcase_sanitize_param}}, JsonSerializerOptions options) { - writer.WriteStringValue({{#lambda.camelcase_sanitize_param}}{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{/lambda.camelcase_sanitize_param}}.HasValue ? {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.ToJsonValue({{#lambda.camelcase_sanitize_param}}{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{/lambda.camelcase_sanitize_param}}.Value).ToString() : "null"); + if ({{#lambda.camelcase_sanitize_param}}{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{/lambda.camelcase_sanitize_param}}.HasValue) + {{^isString}} + writer.WriteNumberValue({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.ToJsonValue({{#lambda.camelcase_sanitize_param}}{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{/lambda.camelcase_sanitize_param}}.Value)); + {{/isString}} + {{#isString}} + writer.WriteStringValue({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.ToJsonValue({{#lambda.camelcase_sanitize_param}}{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{/lambda.camelcase_sanitize_param}}.Value).ToString()); + {{/isString}} + else + writer.WriteNullValue(); } } {{/useGenericHost}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java index 86ae543e259e..a2684df5e9b5 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java @@ -260,4 +260,82 @@ private List getNames(List props) { if (props == null) return null; return props.stream().map(v -> v.name).collect(Collectors.toList()); } + + @Test + public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/csharp/integer-enum.yaml"); + final DefaultGenerator defaultGenerator = new DefaultGenerator(); + final ClientOptInput clientOptInput = new ClientOptInput(); + clientOptInput.openAPI(openAPI); + CSharpClientCodegen cSharpClientCodegen = new CSharpClientCodegen(); + cSharpClientCodegen.setLibrary("generichost"); + cSharpClientCodegen.setOutputDir(output.getAbsolutePath()); + clientOptInput.config(cSharpClientCodegen); + defaultGenerator.opts(clientOptInput); + + Map files = defaultGenerator.generate().stream() + .collect(Collectors.toMap(File::getPath, Function.identity())); + + // Verify integer enum uses numeric JSON reader with validation + File intEnumFile = files.get(Paths + .get(output.getAbsolutePath(), "src", "Org.OpenAPITools", "Model", "IntegerEnum.cs") + .toString() + ); + assertNotNull(intEnumFile, "Could not find file for model: IntegerEnum"); + assertFileContains(intEnumFile.toPath(), + "reader.GetInt32().ToString()", + "FromStringOrDefault(rawValue)", + "throw new JsonException()", + "writer.WriteNumberValue(", + "public static int ToJsonValue(IntegerEnum value)" + ); + assertFileNotContains(intEnumFile.toPath(), + "reader.GetString()", + "writer.WriteStringValue(", + ": long", + ": byte" + ); + + // Verify long enum uses int64 reader with validation and actual int64 values + File longEnumFile = files.get(Paths + .get(output.getAbsolutePath(), "src", "Org.OpenAPITools", "Model", "LongEnum.cs") + .toString() + ); + assertNotNull(longEnumFile, "Could not find file for model: LongEnum"); + assertFileContains(longEnumFile.toPath(), + "enum LongEnum : long", + "reader.GetInt64().ToString()", + "FromStringOrDefault(rawValue)", + "throw new JsonException()", + "writer.WriteNumberValue(", + "public static long ToJsonValue(LongEnum value)", + "AboveInt32Max = 2147483648", + "Int64Max = 9223372036854775807" + ); + assertFileNotContains(longEnumFile.toPath(), + "reader.GetString()", + "writer.WriteStringValue(" + ); + + // Verify double enum reads numeric value and converts to string for matching, writes as number + File doubleEnumFile = files.get(Paths + .get(output.getAbsolutePath(), "src", "Org.OpenAPITools", "Model", "DoubleEnum.cs") + .toString() + ); + assertNotNull(doubleEnumFile, "Could not find file for model: DoubleEnum"); + assertFileContains(doubleEnumFile.toPath(), + "reader.GetDouble().ToString()", + "writer.WriteNumberValue(", + "public static double ToJsonValue(DoubleEnum value)", + "return 1.1d;", + "return -1.2d;" + ); + assertFileNotContains(doubleEnumFile.toPath(), + "reader.GetString()", + "writer.WriteStringValue(", + "return (double) value" + ); + } } diff --git a/modules/openapi-generator/src/test/resources/3_0/csharp/integer-enum.yaml b/modules/openapi-generator/src/test/resources/3_0/csharp/integer-enum.yaml new file mode 100644 index 000000000000..5e494049f5bd --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/csharp/integer-enum.yaml @@ -0,0 +1,43 @@ +openapi: 3.0.1 +info: + title: Integer Enum Test + version: v1 +paths: + /some/api: + get: + tags: + - Example + operationId: ExampleApi + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/IntegerEnum' +components: + schemas: + IntegerEnum: + enum: + - 0 + - 1 + type: integer + format: int32 + x-enum-varnames: + - None + - Some + LongEnum: + enum: + - 2147483648 + - 9223372036854775807 + type: integer + format: int64 + x-enum-varnames: + - AboveInt32Max + - Int64Max + DoubleEnum: + enum: + - 1.1 + - -1.2 + type: number + format: double diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/AreaCode.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/AreaCode.cs index 12a51fd09fa5..a64da2370fe3 100644 --- a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/AreaCode.cs +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/AreaCode.cs @@ -177,6 +177,9 @@ public class AreaCodeNullableJsonConverter : JsonConverter /// public override AreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); AreaCode? result = rawValue == null @@ -197,7 +200,10 @@ public class AreaCodeNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, AreaCode? areaCode, JsonSerializerOptions options) { - writer.WriteStringValue(areaCode.HasValue ? AreaCodeValueConverter.ToJsonValue(areaCode.Value).ToString() : "null"); + if (areaCode.HasValue) + writer.WriteStringValue(AreaCodeValueConverter.ToJsonValue(areaCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/MarineAreaCode.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/MarineAreaCode.cs index 73e3e9e0c3df..5a962dc212e8 100644 --- a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/MarineAreaCode.cs +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/MarineAreaCode.cs @@ -149,6 +149,9 @@ public class MarineAreaCodeNullableJsonConverter : JsonConverter public override MarineAreaCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); MarineAreaCode? result = rawValue == null @@ -169,7 +172,10 @@ public class MarineAreaCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, MarineAreaCode? marineAreaCode, JsonSerializerOptions options) { - writer.WriteStringValue(marineAreaCode.HasValue ? MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode.Value).ToString() : "null"); + if (marineAreaCode.HasValue) + writer.WriteStringValue(MarineAreaCodeValueConverter.ToJsonValue(marineAreaCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/StateTerritoryCode.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/StateTerritoryCode.cs index f2e57c7ceecb..f9e78799b5d1 100644 --- a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/StateTerritoryCode.cs +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Model/StateTerritoryCode.cs @@ -149,6 +149,9 @@ public class StateTerritoryCodeNullableJsonConverter : JsonConverter public override StateTerritoryCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); StateTerritoryCode? result = rawValue == null @@ -169,7 +172,10 @@ public class StateTerritoryCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, StateTerritoryCode? stateTerritoryCode, JsonSerializerOptions options) { - writer.WriteStringValue(stateTerritoryCode.HasValue ? StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode.Value).ToString() : "null"); + if (stateTerritoryCode.HasValue) + writer.WriteStringValue(StateTerritoryCodeValueConverter.ToJsonValue(stateTerritoryCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Model/IconsSizeParameterAnyOf.cs b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Model/IconsSizeParameterAnyOf.cs index 723b53b5e97a..2c5bc0642d5f 100644 --- a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Model/IconsSizeParameterAnyOf.cs +++ b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Model/IconsSizeParameterAnyOf.cs @@ -163,6 +163,9 @@ public class IconsSizeParameterAnyOfNullableJsonConverter : JsonConverter public override IconsSizeParameterAnyOf? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); IconsSizeParameterAnyOf? result = rawValue == null @@ -183,7 +186,10 @@ public class IconsSizeParameterAnyOfNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, IconsSizeParameterAnyOf? iconsSizeParameterAnyOf, JsonSerializerOptions options) { - writer.WriteStringValue(iconsSizeParameterAnyOf.HasValue ? IconsSizeParameterAnyOfValueConverter.ToJsonValue(iconsSizeParameterAnyOf.Value).ToString() : "null"); + if (iconsSizeParameterAnyOf.HasValue) + writer.WriteStringValue(IconsSizeParameterAnyOfValueConverter.ToJsonValue(iconsSizeParameterAnyOf.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs index 252a51260bcf..1bed600a55f5 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs @@ -134,6 +134,9 @@ public class ChildCatAllOfPetTypeNullableJsonConverter : JsonConverter public override ChildCatAllOfPetType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ChildCatAllOfPetType? result = rawValue == null @@ -154,7 +157,10 @@ public class ChildCatAllOfPetTypeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, ChildCatAllOfPetType? childCatAllOfPetType, JsonSerializerOptions options) { - writer.WriteStringValue(childCatAllOfPetType.HasValue ? ChildCatAllOfPetTypeValueConverter.ToJsonValue(childCatAllOfPetType.Value).ToString() : "null"); + if (childCatAllOfPetType.HasValue) + writer.WriteStringValue(ChildCatAllOfPetTypeValueConverter.ToJsonValue(childCatAllOfPetType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs index 9760b9efadd6..dbb402dc4ac8 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs @@ -134,6 +134,9 @@ public class CopyActivityAllOfSchemaNullableJsonConverter : JsonConverter public override CopyActivityAllOfSchema? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); CopyActivityAllOfSchema? result = rawValue == null @@ -154,7 +157,10 @@ public class CopyActivityAllOfSchemaNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, CopyActivityAllOfSchema? copyActivityAllOfSchema, JsonSerializerOptions options) { - writer.WriteStringValue(copyActivityAllOfSchema.HasValue ? CopyActivityAllOfSchemaValueConverter.ToJsonValue(copyActivityAllOfSchema.Value).ToString() : "null"); + if (copyActivityAllOfSchema.HasValue) + writer.WriteStringValue(CopyActivityAllOfSchemaValueConverter.ToJsonValue(copyActivityAllOfSchema.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs index 2ceb96620d05..3d3db1add77a 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs @@ -148,6 +148,9 @@ public class EnumArraysArrayEnumInnerNullableJsonConverter : JsonConverter public override EnumArraysArrayEnumInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumArraysArrayEnumInner? result = rawValue == null @@ -168,7 +171,10 @@ public class EnumArraysArrayEnumInnerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumArraysArrayEnumInner? enumArraysArrayEnumInner, JsonSerializerOptions options) { - writer.WriteStringValue(enumArraysArrayEnumInner.HasValue ? EnumArraysArrayEnumInnerValueConverter.ToJsonValue(enumArraysArrayEnumInner.Value).ToString() : "null"); + if (enumArraysArrayEnumInner.HasValue) + writer.WriteStringValue(EnumArraysArrayEnumInnerValueConverter.ToJsonValue(enumArraysArrayEnumInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs index 8400d5cd4273..67a8cfe66128 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs @@ -148,6 +148,9 @@ public class EnumArraysJustSymbolNullableJsonConverter : JsonConverter public override EnumArraysJustSymbol? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumArraysJustSymbol? result = rawValue == null @@ -168,7 +171,10 @@ public class EnumArraysJustSymbolNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumArraysJustSymbol? enumArraysJustSymbol, JsonSerializerOptions options) { - writer.WriteStringValue(enumArraysJustSymbol.HasValue ? EnumArraysJustSymbolValueConverter.ToJsonValue(enumArraysJustSymbol.Value).ToString() : "null"); + if (enumArraysJustSymbol.HasValue) + writer.WriteStringValue(EnumArraysJustSymbolValueConverter.ToJsonValue(enumArraysJustSymbol.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs index cefbf28588fb..b6fbaaf487cf 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs @@ -162,6 +162,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -182,7 +185,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs index 19178ecba280..5ea93c467d62 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs @@ -104,15 +104,10 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumInteger? result = rawValue == null - ? null - : EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToC /// public override void Write(Utf8JsonWriter writer, EnumTestEnumInteger enumTestEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger).ToString()); + writer.WriteNumberValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger)); } } @@ -142,15 +137,13 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override EnumTestEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumInteger? result = rawValue == null - ? null - : EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumInteger? enumTestEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumInteger.HasValue ? EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger.Value).ToString() : "null"); + if (enumTestEnumInteger.HasValue) + writer.WriteNumberValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs index 6a999c69d575..dab24618fddd 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumIntegerOnly? result = rawValue == null - ? null - : EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typ /// public override void Write(Utf8JsonWriter writer, EnumTestEnumIntegerOnly enumTestEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly).ToString()); + writer.WriteNumberValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumIntegerOnly? result = rawValue == null - ? null - : EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumIntegerOnly? enumTestEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumIntegerOnly.HasValue ? EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly.Value).ToString() : "null"); + if (enumTestEnumIntegerOnly.HasValue) + writer.WriteNumberValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs index 4d02eeaec018..6afc370e3ca5 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs @@ -232,6 +232,9 @@ public class EnumTestEnumStringNullableJsonConverter : JsonConverter public override EnumTestEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumTestEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class EnumTestEnumStringNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumString? enumTestEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumString.HasValue ? EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString.Value).ToString() : "null"); + if (enumTestEnumString.HasValue) + writer.WriteStringValue(EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs index e7f98f931cc9..d1ac7f8dd36b 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs @@ -162,6 +162,9 @@ public class FindPetsByStatusStatusParameterInnerNullableJsonConverter : JsonCon /// public override FindPetsByStatusStatusParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); FindPetsByStatusStatusParameterInner? result = rawValue == null @@ -182,7 +185,10 @@ public class FindPetsByStatusStatusParameterInnerNullableJsonConverter : JsonCon /// public override void Write(Utf8JsonWriter writer, FindPetsByStatusStatusParameterInner? findPetsByStatusStatusParameterInner, JsonSerializerOptions options) { - writer.WriteStringValue(findPetsByStatusStatusParameterInner.HasValue ? FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner.Value).ToString() : "null"); + if (findPetsByStatusStatusParameterInner.HasValue) + writer.WriteStringValue(FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs index 3c7331f80f28..0f34a3ceea08 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs @@ -148,6 +148,9 @@ public class MapTestMapOfEnumStringValueNullableJsonConverter : JsonConverter public override MapTestMapOfEnumStringValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); MapTestMapOfEnumStringValue? result = rawValue == null @@ -168,7 +171,10 @@ public class MapTestMapOfEnumStringValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, MapTestMapOfEnumStringValue? mapTestMapOfEnumStringValue, JsonSerializerOptions options) { - writer.WriteStringValue(mapTestMapOfEnumStringValue.HasValue ? MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue.Value).ToString() : "null"); + if (mapTestMapOfEnumStringValue.HasValue) + writer.WriteStringValue(MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs index cd0ff06ce52e..e193de19a3ea 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs @@ -163,6 +163,9 @@ public class OrderStatusNullableJsonConverter : JsonConverter /// public override OrderStatus? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OrderStatus? result = rawValue == null @@ -183,7 +186,10 @@ public class OrderStatusNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OrderStatus? orderStatus, JsonSerializerOptions options) { - writer.WriteStringValue(orderStatus.HasValue ? OrderStatusValueConverter.ToJsonValue(orderStatus.Value).ToString() : "null"); + if (orderStatus.HasValue) + writer.WriteStringValue(OrderStatusValueConverter.ToJsonValue(orderStatus.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs index e72ea52b0876..8b433c5033b8 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -162,6 +162,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index e2c52f962f32..2d1b5d668e16 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -162,6 +162,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..180eef18894e 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 296151997b01..ad1af6012860 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b4c4e25a9bb2..b4a71547cc1e 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -232,6 +232,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -252,7 +255,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs index 52de1419c804..1a60f1c7856c 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs @@ -163,6 +163,9 @@ public class PetStatusNullableJsonConverter : JsonConverter /// public override PetStatus? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); PetStatus? result = rawValue == null @@ -183,7 +186,10 @@ public class PetStatusNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, PetStatus? petStatus, JsonSerializerOptions options) { - writer.WriteStringValue(petStatus.HasValue ? PetStatusValueConverter.ToJsonValue(petStatus.Value).ToString() : "null"); + if (petStatus.HasValue) + writer.WriteStringValue(PetStatusValueConverter.ToJsonValue(petStatus.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs index fcdc55074811..28b19513d368 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonRea /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumInteger requiredClassRequiredNotnullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : /// public override RequiredClassRequiredNotnullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumInteger? requiredClassRequiredNotnullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumInteger.HasValue ? RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumInteger.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs index 1d33399c6331..7b5b97f0f8c6 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8Jso /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumIntegerOnly requiredClassRequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte /// public override RequiredClassRequiredNotnullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumIntegerOnly? requiredClassRequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumIntegerOnly.HasValue ? RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumIntegerOnly.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs index 1e251fee921b..7e1af535ae83 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs @@ -232,6 +232,9 @@ public class RequiredClassRequiredNotnullableEnumStringNullableJsonConverter : J /// public override RequiredClassRequiredNotnullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); RequiredClassRequiredNotnullableEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class RequiredClassRequiredNotnullableEnumStringNullableJsonConverter : J /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumString? requiredClassRequiredNotnullableEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumString.HasValue ? RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumString.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumString.HasValue) + writer.WriteStringValue(RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs index 97db2037f953..5ede755b11d4 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumInteger requiredClassRequiredNullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso /// public override RequiredClassRequiredNullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumInteger? requiredClassRequiredNullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumInteger.HasValue ? RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumInteger.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs index 2f53261cd6ff..c59223bbfff6 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonRe /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumIntegerOnly requiredClassRequiredNullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : /// public override RequiredClassRequiredNullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumIntegerOnly? requiredClassRequiredNullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumIntegerOnly.HasValue ? RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumIntegerOnly.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs index 7efe892e9246..bf6c28314256 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs @@ -232,6 +232,9 @@ public class RequiredClassRequiredNullableEnumStringNullableJsonConverter : Json /// public override RequiredClassRequiredNullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); RequiredClassRequiredNullableEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class RequiredClassRequiredNullableEnumStringNullableJsonConverter : Json /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumString? requiredClassRequiredNullableEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumString.HasValue ? RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumString.HasValue) + writer.WriteStringValue(RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs index 0c0c757cc59b..fc932e79b93f 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs @@ -148,6 +148,9 @@ public class TestDescendantsObjectTypeNullableJsonConverter : JsonConverter public override TestDescendantsObjectType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestDescendantsObjectType? result = rawValue == null @@ -168,7 +171,10 @@ public class TestDescendantsObjectTypeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestDescendantsObjectType? testDescendantsObjectType, JsonSerializerOptions options) { - writer.WriteStringValue(testDescendantsObjectType.HasValue ? TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType.Value).ToString() : "null"); + if (testDescendantsObjectType.HasValue) + writer.WriteStringValue(TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs index 4fe8d2deb709..6b34ecb05787 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs @@ -162,6 +162,9 @@ public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : /// public override TestEnumParametersEnumHeaderStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersEnumHeaderStringParameter? result = rawValue == null @@ -182,7 +185,10 @@ public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter? testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumHeaderStringParameter.HasValue ? TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString() : "null"); + if (testEnumParametersEnumHeaderStringParameter.HasValue) + writer.WriteStringValue(TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs index d4d97e76043f..e76d34f002f6 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs @@ -85,7 +85,13 @@ public static TestEnumParametersEnumQueryDoubleParameter FromString(string value /// public static double ToJsonValue(TestEnumParametersEnumQueryDoubleParameter value) { - return (double) value; + if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_1_DOT_1) + return 1.1d; + + if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_MINUS_1_DOT_2) + return -1.2d; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); } } @@ -104,15 +110,10 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryDoubleParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetDouble().ToString(); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +125,7 @@ public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonRead /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter, JsonSerializerOptions options) { - writer.WriteStringValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString()); + writer.WriteNumberValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter)); } } @@ -142,15 +143,13 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J /// public override TestEnumParametersEnumQueryDoubleParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryDoubleParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetDouble().ToString(); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +161,10 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryDoubleParameter? testEnumParametersEnumQueryDoubleParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumQueryDoubleParameter.HasValue ? TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter.Value).ToString() : "null"); + if (testEnumParametersEnumQueryDoubleParameter.HasValue) + writer.WriteNumberValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs index 85149c3f5eb9..cf70b0624f9b 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs @@ -104,15 +104,10 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryIntegerParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonRea /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter, JsonSerializerOptions options) { - writer.WriteStringValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter).ToString()); + writer.WriteNumberValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter)); } } @@ -142,15 +137,13 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : /// public override TestEnumParametersEnumQueryIntegerParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryIntegerParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryIntegerParameter? testEnumParametersEnumQueryIntegerParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumQueryIntegerParameter.HasValue ? TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter.Value).ToString() : "null"); + if (testEnumParametersEnumQueryIntegerParameter.HasValue) + writer.WriteNumberValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs index 2e81a11c33b2..564a3fc67e09 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs @@ -163,6 +163,9 @@ public class TestEnumParametersRequestEnumFormStringNullableJsonConverter : Json /// public override TestEnumParametersRequestEnumFormString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersRequestEnumFormString? result = rawValue == null @@ -183,7 +186,10 @@ public class TestEnumParametersRequestEnumFormStringNullableJsonConverter : Json /// public override void Write(Utf8JsonWriter writer, TestEnumParametersRequestEnumFormString? testEnumParametersRequestEnumFormString, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersRequestEnumFormString.HasValue ? TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString.Value).ToString() : "null"); + if (testEnumParametersRequestEnumFormString.HasValue) + writer.WriteStringValue(TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs index 5c00030c30a4..41a116adffd4 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs @@ -148,6 +148,9 @@ public class TestEnumParametersRequestEnumFormStringArrayInnerNullableJsonConver /// public override TestEnumParametersRequestEnumFormStringArrayInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersRequestEnumFormStringArrayInner? result = rawValue == null @@ -168,7 +171,10 @@ public class TestEnumParametersRequestEnumFormStringArrayInnerNullableJsonConver /// public override void Write(Utf8JsonWriter writer, TestEnumParametersRequestEnumFormStringArrayInner? testEnumParametersRequestEnumFormStringArrayInner, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersRequestEnumFormStringArrayInner.HasValue ? TestEnumParametersRequestEnumFormStringArrayInnerValueConverter.ToJsonValue(testEnumParametersRequestEnumFormStringArrayInner.Value).ToString() : "null"); + if (testEnumParametersRequestEnumFormStringArrayInner.HasValue) + writer.WriteStringValue(TestEnumParametersRequestEnumFormStringArrayInnerValueConverter.ToJsonValue(testEnumParametersRequestEnumFormStringArrayInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs index 280c9b82cfab..0c6a6e1fb987 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -149,6 +149,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -169,7 +172,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs index 5eb8d6bac71e..f5ef7a380fe4 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs @@ -162,6 +162,9 @@ public class ZebraTypeNullableJsonConverter : JsonConverter /// public override ZebraType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZebraType? result = rawValue == null @@ -182,7 +185,10 @@ public class ZebraTypeNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZebraType? zebraType, JsonSerializerOptions options) { - writer.WriteStringValue(zebraType.HasValue ? ZebraTypeValueConverter.ToJsonValue(zebraType.Value).ToString() : "null"); + if (zebraType.HasValue) + writer.WriteStringValue(ZebraTypeValueConverter.ToJsonValue(zebraType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index b82155f7800c..8e6cdad42d28 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs index cb6f10e40b3a..39709c18f566 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter : JsonConverte /// public override ZeroBasedEnumClassZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnumClassZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter : JsonConverte /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnumClassZeroBasedEnum? zeroBasedEnumClassZeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnumClassZeroBasedEnum.HasValue ? ZeroBasedEnumClassZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnumClassZeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnumClassZeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumClassZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnumClassZeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs index 592f6a59c31a..daf0b57af01b 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs @@ -164,6 +164,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -184,7 +187,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs index 0476c873cd87..1497d9eca8cd 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -164,6 +164,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -184,7 +187,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index 68faa3cd5de2..7cdb4970271b 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -164,6 +164,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -184,7 +187,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 6ba997e06eb1..7a9b57b3ddd0 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -117,15 +117,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -137,7 +132,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -155,15 +150,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -175,7 +168,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index d8d27e54ee34..b5acfb593af1 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -117,15 +117,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -137,7 +132,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -155,15 +150,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -175,7 +168,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs index 5a1f2a6e439e..b7de72535a4f 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -234,6 +234,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -254,7 +257,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs index f53e8d34214c..418868cd36f7 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -151,6 +151,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -171,7 +174,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index 5434f2b84ea5..d6b37f71c918 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -150,6 +150,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -170,7 +173,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs index cefbf28588fb..b6fbaaf487cf 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs @@ -162,6 +162,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -182,7 +185,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs index e72ea52b0876..8b433c5033b8 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -162,6 +162,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index e2c52f962f32..2d1b5d668e16 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -162,6 +162,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..180eef18894e 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 296151997b01..ad1af6012860 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b4c4e25a9bb2..b4a71547cc1e 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -232,6 +232,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -252,7 +255,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs index 280c9b82cfab..0c6a6e1fb987 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -149,6 +149,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -169,7 +172,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index b82155f7800c..8e6cdad42d28 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs index 6192d15c9f5f..fee0d4a8f728 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs @@ -165,6 +165,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -185,7 +188,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs index c2b58fa0eba1..71f82a74a6fb 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -165,6 +165,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -185,7 +188,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index fa6acccc08e7..3afb38ee60c4 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -165,6 +165,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -185,7 +188,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 362553f662a9..a442934bb5b8 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -118,15 +118,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -138,7 +133,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -156,15 +151,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -176,7 +169,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index fba1de8e6f39..a4c6123fc064 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -118,15 +118,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -138,7 +133,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -156,15 +151,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -176,7 +169,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b8716ad2b25f..a412be9cef62 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -235,6 +235,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -255,7 +258,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs index 029a66af5180..a18f3d7d0f72 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -152,6 +152,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -172,7 +175,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index c553e7d9ef54..95c7d5fa7df6 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -151,6 +151,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -171,7 +174,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs index 252a51260bcf..1bed600a55f5 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs @@ -134,6 +134,9 @@ public class ChildCatAllOfPetTypeNullableJsonConverter : JsonConverter public override ChildCatAllOfPetType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ChildCatAllOfPetType? result = rawValue == null @@ -154,7 +157,10 @@ public class ChildCatAllOfPetTypeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, ChildCatAllOfPetType? childCatAllOfPetType, JsonSerializerOptions options) { - writer.WriteStringValue(childCatAllOfPetType.HasValue ? ChildCatAllOfPetTypeValueConverter.ToJsonValue(childCatAllOfPetType.Value).ToString() : "null"); + if (childCatAllOfPetType.HasValue) + writer.WriteStringValue(ChildCatAllOfPetTypeValueConverter.ToJsonValue(childCatAllOfPetType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs index 9760b9efadd6..dbb402dc4ac8 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs @@ -134,6 +134,9 @@ public class CopyActivityAllOfSchemaNullableJsonConverter : JsonConverter public override CopyActivityAllOfSchema? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); CopyActivityAllOfSchema? result = rawValue == null @@ -154,7 +157,10 @@ public class CopyActivityAllOfSchemaNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, CopyActivityAllOfSchema? copyActivityAllOfSchema, JsonSerializerOptions options) { - writer.WriteStringValue(copyActivityAllOfSchema.HasValue ? CopyActivityAllOfSchemaValueConverter.ToJsonValue(copyActivityAllOfSchema.Value).ToString() : "null"); + if (copyActivityAllOfSchema.HasValue) + writer.WriteStringValue(CopyActivityAllOfSchemaValueConverter.ToJsonValue(copyActivityAllOfSchema.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs index 2ceb96620d05..3d3db1add77a 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs @@ -148,6 +148,9 @@ public class EnumArraysArrayEnumInnerNullableJsonConverter : JsonConverter public override EnumArraysArrayEnumInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumArraysArrayEnumInner? result = rawValue == null @@ -168,7 +171,10 @@ public class EnumArraysArrayEnumInnerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumArraysArrayEnumInner? enumArraysArrayEnumInner, JsonSerializerOptions options) { - writer.WriteStringValue(enumArraysArrayEnumInner.HasValue ? EnumArraysArrayEnumInnerValueConverter.ToJsonValue(enumArraysArrayEnumInner.Value).ToString() : "null"); + if (enumArraysArrayEnumInner.HasValue) + writer.WriteStringValue(EnumArraysArrayEnumInnerValueConverter.ToJsonValue(enumArraysArrayEnumInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs index 8400d5cd4273..67a8cfe66128 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs @@ -148,6 +148,9 @@ public class EnumArraysJustSymbolNullableJsonConverter : JsonConverter public override EnumArraysJustSymbol? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumArraysJustSymbol? result = rawValue == null @@ -168,7 +171,10 @@ public class EnumArraysJustSymbolNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumArraysJustSymbol? enumArraysJustSymbol, JsonSerializerOptions options) { - writer.WriteStringValue(enumArraysJustSymbol.HasValue ? EnumArraysJustSymbolValueConverter.ToJsonValue(enumArraysJustSymbol.Value).ToString() : "null"); + if (enumArraysJustSymbol.HasValue) + writer.WriteStringValue(EnumArraysJustSymbolValueConverter.ToJsonValue(enumArraysJustSymbol.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs index cefbf28588fb..b6fbaaf487cf 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs @@ -162,6 +162,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -182,7 +185,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs index 19178ecba280..5ea93c467d62 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs @@ -104,15 +104,10 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumInteger? result = rawValue == null - ? null - : EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToC /// public override void Write(Utf8JsonWriter writer, EnumTestEnumInteger enumTestEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger).ToString()); + writer.WriteNumberValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger)); } } @@ -142,15 +137,13 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override EnumTestEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumInteger? result = rawValue == null - ? null - : EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumInteger? enumTestEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumInteger.HasValue ? EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger.Value).ToString() : "null"); + if (enumTestEnumInteger.HasValue) + writer.WriteNumberValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs index 6a999c69d575..dab24618fddd 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumIntegerOnly? result = rawValue == null - ? null - : EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typ /// public override void Write(Utf8JsonWriter writer, EnumTestEnumIntegerOnly enumTestEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly).ToString()); + writer.WriteNumberValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumIntegerOnly? result = rawValue == null - ? null - : EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumIntegerOnly? enumTestEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumIntegerOnly.HasValue ? EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly.Value).ToString() : "null"); + if (enumTestEnumIntegerOnly.HasValue) + writer.WriteNumberValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs index 4d02eeaec018..6afc370e3ca5 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs @@ -232,6 +232,9 @@ public class EnumTestEnumStringNullableJsonConverter : JsonConverter public override EnumTestEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumTestEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class EnumTestEnumStringNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumString? enumTestEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumString.HasValue ? EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString.Value).ToString() : "null"); + if (enumTestEnumString.HasValue) + writer.WriteStringValue(EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs index e7f98f931cc9..d1ac7f8dd36b 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs @@ -162,6 +162,9 @@ public class FindPetsByStatusStatusParameterInnerNullableJsonConverter : JsonCon /// public override FindPetsByStatusStatusParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); FindPetsByStatusStatusParameterInner? result = rawValue == null @@ -182,7 +185,10 @@ public class FindPetsByStatusStatusParameterInnerNullableJsonConverter : JsonCon /// public override void Write(Utf8JsonWriter writer, FindPetsByStatusStatusParameterInner? findPetsByStatusStatusParameterInner, JsonSerializerOptions options) { - writer.WriteStringValue(findPetsByStatusStatusParameterInner.HasValue ? FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner.Value).ToString() : "null"); + if (findPetsByStatusStatusParameterInner.HasValue) + writer.WriteStringValue(FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs index 3c7331f80f28..0f34a3ceea08 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs @@ -148,6 +148,9 @@ public class MapTestMapOfEnumStringValueNullableJsonConverter : JsonConverter public override MapTestMapOfEnumStringValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); MapTestMapOfEnumStringValue? result = rawValue == null @@ -168,7 +171,10 @@ public class MapTestMapOfEnumStringValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, MapTestMapOfEnumStringValue? mapTestMapOfEnumStringValue, JsonSerializerOptions options) { - writer.WriteStringValue(mapTestMapOfEnumStringValue.HasValue ? MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue.Value).ToString() : "null"); + if (mapTestMapOfEnumStringValue.HasValue) + writer.WriteStringValue(MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs index cd0ff06ce52e..e193de19a3ea 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs @@ -163,6 +163,9 @@ public class OrderStatusNullableJsonConverter : JsonConverter /// public override OrderStatus? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OrderStatus? result = rawValue == null @@ -183,7 +186,10 @@ public class OrderStatusNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OrderStatus? orderStatus, JsonSerializerOptions options) { - writer.WriteStringValue(orderStatus.HasValue ? OrderStatusValueConverter.ToJsonValue(orderStatus.Value).ToString() : "null"); + if (orderStatus.HasValue) + writer.WriteStringValue(OrderStatusValueConverter.ToJsonValue(orderStatus.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs index e72ea52b0876..8b433c5033b8 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -162,6 +162,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index e2c52f962f32..2d1b5d668e16 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -162,6 +162,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..180eef18894e 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 296151997b01..ad1af6012860 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b4c4e25a9bb2..b4a71547cc1e 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -232,6 +232,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -252,7 +255,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs index 52de1419c804..1a60f1c7856c 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs @@ -163,6 +163,9 @@ public class PetStatusNullableJsonConverter : JsonConverter /// public override PetStatus? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); PetStatus? result = rawValue == null @@ -183,7 +186,10 @@ public class PetStatusNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, PetStatus? petStatus, JsonSerializerOptions options) { - writer.WriteStringValue(petStatus.HasValue ? PetStatusValueConverter.ToJsonValue(petStatus.Value).ToString() : "null"); + if (petStatus.HasValue) + writer.WriteStringValue(PetStatusValueConverter.ToJsonValue(petStatus.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs index fcdc55074811..28b19513d368 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonRea /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumInteger requiredClassRequiredNotnullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : /// public override RequiredClassRequiredNotnullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumInteger? requiredClassRequiredNotnullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumInteger.HasValue ? RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumInteger.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs index 1d33399c6331..7b5b97f0f8c6 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8Jso /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumIntegerOnly requiredClassRequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte /// public override RequiredClassRequiredNotnullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumIntegerOnly? requiredClassRequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumIntegerOnly.HasValue ? RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumIntegerOnly.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs index 1e251fee921b..7e1af535ae83 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs @@ -232,6 +232,9 @@ public class RequiredClassRequiredNotnullableEnumStringNullableJsonConverter : J /// public override RequiredClassRequiredNotnullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); RequiredClassRequiredNotnullableEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class RequiredClassRequiredNotnullableEnumStringNullableJsonConverter : J /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumString? requiredClassRequiredNotnullableEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumString.HasValue ? RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumString.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumString.HasValue) + writer.WriteStringValue(RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs index 97db2037f953..5ede755b11d4 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumInteger requiredClassRequiredNullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso /// public override RequiredClassRequiredNullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumInteger? requiredClassRequiredNullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumInteger.HasValue ? RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumInteger.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs index 2f53261cd6ff..c59223bbfff6 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonRe /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumIntegerOnly requiredClassRequiredNullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : /// public override RequiredClassRequiredNullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumIntegerOnly? requiredClassRequiredNullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumIntegerOnly.HasValue ? RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumIntegerOnly.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs index 7efe892e9246..bf6c28314256 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs @@ -232,6 +232,9 @@ public class RequiredClassRequiredNullableEnumStringNullableJsonConverter : Json /// public override RequiredClassRequiredNullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); RequiredClassRequiredNullableEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class RequiredClassRequiredNullableEnumStringNullableJsonConverter : Json /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumString? requiredClassRequiredNullableEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumString.HasValue ? RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumString.HasValue) + writer.WriteStringValue(RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs index 0c0c757cc59b..fc932e79b93f 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs @@ -148,6 +148,9 @@ public class TestDescendantsObjectTypeNullableJsonConverter : JsonConverter public override TestDescendantsObjectType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestDescendantsObjectType? result = rawValue == null @@ -168,7 +171,10 @@ public class TestDescendantsObjectTypeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestDescendantsObjectType? testDescendantsObjectType, JsonSerializerOptions options) { - writer.WriteStringValue(testDescendantsObjectType.HasValue ? TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType.Value).ToString() : "null"); + if (testDescendantsObjectType.HasValue) + writer.WriteStringValue(TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs index 4fe8d2deb709..6b34ecb05787 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs @@ -162,6 +162,9 @@ public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : /// public override TestEnumParametersEnumHeaderStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersEnumHeaderStringParameter? result = rawValue == null @@ -182,7 +185,10 @@ public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter? testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumHeaderStringParameter.HasValue ? TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString() : "null"); + if (testEnumParametersEnumHeaderStringParameter.HasValue) + writer.WriteStringValue(TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs index d4d97e76043f..e76d34f002f6 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs @@ -85,7 +85,13 @@ public static TestEnumParametersEnumQueryDoubleParameter FromString(string value /// public static double ToJsonValue(TestEnumParametersEnumQueryDoubleParameter value) { - return (double) value; + if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_1_DOT_1) + return 1.1d; + + if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_MINUS_1_DOT_2) + return -1.2d; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); } } @@ -104,15 +110,10 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryDoubleParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetDouble().ToString(); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +125,7 @@ public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonRead /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter, JsonSerializerOptions options) { - writer.WriteStringValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString()); + writer.WriteNumberValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter)); } } @@ -142,15 +143,13 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J /// public override TestEnumParametersEnumQueryDoubleParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryDoubleParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetDouble().ToString(); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +161,10 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryDoubleParameter? testEnumParametersEnumQueryDoubleParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumQueryDoubleParameter.HasValue ? TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter.Value).ToString() : "null"); + if (testEnumParametersEnumQueryDoubleParameter.HasValue) + writer.WriteNumberValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs index 85149c3f5eb9..cf70b0624f9b 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs @@ -104,15 +104,10 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryIntegerParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonRea /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter, JsonSerializerOptions options) { - writer.WriteStringValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter).ToString()); + writer.WriteNumberValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter)); } } @@ -142,15 +137,13 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : /// public override TestEnumParametersEnumQueryIntegerParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryIntegerParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryIntegerParameter? testEnumParametersEnumQueryIntegerParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumQueryIntegerParameter.HasValue ? TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter.Value).ToString() : "null"); + if (testEnumParametersEnumQueryIntegerParameter.HasValue) + writer.WriteNumberValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs index 2e81a11c33b2..564a3fc67e09 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs @@ -163,6 +163,9 @@ public class TestEnumParametersRequestEnumFormStringNullableJsonConverter : Json /// public override TestEnumParametersRequestEnumFormString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersRequestEnumFormString? result = rawValue == null @@ -183,7 +186,10 @@ public class TestEnumParametersRequestEnumFormStringNullableJsonConverter : Json /// public override void Write(Utf8JsonWriter writer, TestEnumParametersRequestEnumFormString? testEnumParametersRequestEnumFormString, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersRequestEnumFormString.HasValue ? TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString.Value).ToString() : "null"); + if (testEnumParametersRequestEnumFormString.HasValue) + writer.WriteStringValue(TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs index 5c00030c30a4..41a116adffd4 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs @@ -148,6 +148,9 @@ public class TestEnumParametersRequestEnumFormStringArrayInnerNullableJsonConver /// public override TestEnumParametersRequestEnumFormStringArrayInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersRequestEnumFormStringArrayInner? result = rawValue == null @@ -168,7 +171,10 @@ public class TestEnumParametersRequestEnumFormStringArrayInnerNullableJsonConver /// public override void Write(Utf8JsonWriter writer, TestEnumParametersRequestEnumFormStringArrayInner? testEnumParametersRequestEnumFormStringArrayInner, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersRequestEnumFormStringArrayInner.HasValue ? TestEnumParametersRequestEnumFormStringArrayInnerValueConverter.ToJsonValue(testEnumParametersRequestEnumFormStringArrayInner.Value).ToString() : "null"); + if (testEnumParametersRequestEnumFormStringArrayInner.HasValue) + writer.WriteStringValue(TestEnumParametersRequestEnumFormStringArrayInnerValueConverter.ToJsonValue(testEnumParametersRequestEnumFormStringArrayInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs index 280c9b82cfab..0c6a6e1fb987 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -149,6 +149,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -169,7 +172,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs index 5eb8d6bac71e..f5ef7a380fe4 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs @@ -162,6 +162,9 @@ public class ZebraTypeNullableJsonConverter : JsonConverter /// public override ZebraType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZebraType? result = rawValue == null @@ -182,7 +185,10 @@ public class ZebraTypeNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZebraType? zebraType, JsonSerializerOptions options) { - writer.WriteStringValue(zebraType.HasValue ? ZebraTypeValueConverter.ToJsonValue(zebraType.Value).ToString() : "null"); + if (zebraType.HasValue) + writer.WriteStringValue(ZebraTypeValueConverter.ToJsonValue(zebraType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index b82155f7800c..8e6cdad42d28 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs index cb6f10e40b3a..39709c18f566 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter : JsonConverte /// public override ZeroBasedEnumClassZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnumClassZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter : JsonConverte /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnumClassZeroBasedEnum? zeroBasedEnumClassZeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnumClassZeroBasedEnum.HasValue ? ZeroBasedEnumClassZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnumClassZeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnumClassZeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumClassZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnumClassZeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs index cefbf28588fb..b6fbaaf487cf 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs @@ -162,6 +162,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -182,7 +185,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs index e72ea52b0876..8b433c5033b8 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -162,6 +162,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index e2c52f962f32..2d1b5d668e16 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -162,6 +162,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..180eef18894e 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 296151997b01..ad1af6012860 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b4c4e25a9bb2..b4a71547cc1e 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -232,6 +232,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -252,7 +255,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs index 280c9b82cfab..0c6a6e1fb987 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -149,6 +149,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -169,7 +172,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index b82155f7800c..8e6cdad42d28 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs index 252a51260bcf..1bed600a55f5 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs @@ -134,6 +134,9 @@ public class ChildCatAllOfPetTypeNullableJsonConverter : JsonConverter public override ChildCatAllOfPetType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ChildCatAllOfPetType? result = rawValue == null @@ -154,7 +157,10 @@ public class ChildCatAllOfPetTypeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, ChildCatAllOfPetType? childCatAllOfPetType, JsonSerializerOptions options) { - writer.WriteStringValue(childCatAllOfPetType.HasValue ? ChildCatAllOfPetTypeValueConverter.ToJsonValue(childCatAllOfPetType.Value).ToString() : "null"); + if (childCatAllOfPetType.HasValue) + writer.WriteStringValue(ChildCatAllOfPetTypeValueConverter.ToJsonValue(childCatAllOfPetType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs index 9760b9efadd6..dbb402dc4ac8 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs @@ -134,6 +134,9 @@ public class CopyActivityAllOfSchemaNullableJsonConverter : JsonConverter public override CopyActivityAllOfSchema? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); CopyActivityAllOfSchema? result = rawValue == null @@ -154,7 +157,10 @@ public class CopyActivityAllOfSchemaNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, CopyActivityAllOfSchema? copyActivityAllOfSchema, JsonSerializerOptions options) { - writer.WriteStringValue(copyActivityAllOfSchema.HasValue ? CopyActivityAllOfSchemaValueConverter.ToJsonValue(copyActivityAllOfSchema.Value).ToString() : "null"); + if (copyActivityAllOfSchema.HasValue) + writer.WriteStringValue(CopyActivityAllOfSchemaValueConverter.ToJsonValue(copyActivityAllOfSchema.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs index 2ceb96620d05..3d3db1add77a 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs @@ -148,6 +148,9 @@ public class EnumArraysArrayEnumInnerNullableJsonConverter : JsonConverter public override EnumArraysArrayEnumInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumArraysArrayEnumInner? result = rawValue == null @@ -168,7 +171,10 @@ public class EnumArraysArrayEnumInnerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumArraysArrayEnumInner? enumArraysArrayEnumInner, JsonSerializerOptions options) { - writer.WriteStringValue(enumArraysArrayEnumInner.HasValue ? EnumArraysArrayEnumInnerValueConverter.ToJsonValue(enumArraysArrayEnumInner.Value).ToString() : "null"); + if (enumArraysArrayEnumInner.HasValue) + writer.WriteStringValue(EnumArraysArrayEnumInnerValueConverter.ToJsonValue(enumArraysArrayEnumInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs index 8400d5cd4273..67a8cfe66128 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs @@ -148,6 +148,9 @@ public class EnumArraysJustSymbolNullableJsonConverter : JsonConverter public override EnumArraysJustSymbol? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumArraysJustSymbol? result = rawValue == null @@ -168,7 +171,10 @@ public class EnumArraysJustSymbolNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumArraysJustSymbol? enumArraysJustSymbol, JsonSerializerOptions options) { - writer.WriteStringValue(enumArraysJustSymbol.HasValue ? EnumArraysJustSymbolValueConverter.ToJsonValue(enumArraysJustSymbol.Value).ToString() : "null"); + if (enumArraysJustSymbol.HasValue) + writer.WriteStringValue(EnumArraysJustSymbolValueConverter.ToJsonValue(enumArraysJustSymbol.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs index cefbf28588fb..b6fbaaf487cf 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs @@ -162,6 +162,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -182,7 +185,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs index 19178ecba280..5ea93c467d62 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs @@ -104,15 +104,10 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumInteger? result = rawValue == null - ? null - : EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToC /// public override void Write(Utf8JsonWriter writer, EnumTestEnumInteger enumTestEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger).ToString()); + writer.WriteNumberValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger)); } } @@ -142,15 +137,13 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override EnumTestEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumInteger? result = rawValue == null - ? null - : EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumInteger? enumTestEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumInteger.HasValue ? EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger.Value).ToString() : "null"); + if (enumTestEnumInteger.HasValue) + writer.WriteNumberValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs index 6a999c69d575..dab24618fddd 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumIntegerOnly? result = rawValue == null - ? null - : EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typ /// public override void Write(Utf8JsonWriter writer, EnumTestEnumIntegerOnly enumTestEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly).ToString()); + writer.WriteNumberValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumIntegerOnly? result = rawValue == null - ? null - : EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumIntegerOnly? enumTestEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumIntegerOnly.HasValue ? EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly.Value).ToString() : "null"); + if (enumTestEnumIntegerOnly.HasValue) + writer.WriteNumberValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs index 4d02eeaec018..6afc370e3ca5 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs @@ -232,6 +232,9 @@ public class EnumTestEnumStringNullableJsonConverter : JsonConverter public override EnumTestEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumTestEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class EnumTestEnumStringNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumString? enumTestEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumString.HasValue ? EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString.Value).ToString() : "null"); + if (enumTestEnumString.HasValue) + writer.WriteStringValue(EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs index e7f98f931cc9..d1ac7f8dd36b 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs @@ -162,6 +162,9 @@ public class FindPetsByStatusStatusParameterInnerNullableJsonConverter : JsonCon /// public override FindPetsByStatusStatusParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); FindPetsByStatusStatusParameterInner? result = rawValue == null @@ -182,7 +185,10 @@ public class FindPetsByStatusStatusParameterInnerNullableJsonConverter : JsonCon /// public override void Write(Utf8JsonWriter writer, FindPetsByStatusStatusParameterInner? findPetsByStatusStatusParameterInner, JsonSerializerOptions options) { - writer.WriteStringValue(findPetsByStatusStatusParameterInner.HasValue ? FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner.Value).ToString() : "null"); + if (findPetsByStatusStatusParameterInner.HasValue) + writer.WriteStringValue(FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs index 3c7331f80f28..0f34a3ceea08 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs @@ -148,6 +148,9 @@ public class MapTestMapOfEnumStringValueNullableJsonConverter : JsonConverter public override MapTestMapOfEnumStringValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); MapTestMapOfEnumStringValue? result = rawValue == null @@ -168,7 +171,10 @@ public class MapTestMapOfEnumStringValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, MapTestMapOfEnumStringValue? mapTestMapOfEnumStringValue, JsonSerializerOptions options) { - writer.WriteStringValue(mapTestMapOfEnumStringValue.HasValue ? MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue.Value).ToString() : "null"); + if (mapTestMapOfEnumStringValue.HasValue) + writer.WriteStringValue(MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs index cd0ff06ce52e..e193de19a3ea 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs @@ -163,6 +163,9 @@ public class OrderStatusNullableJsonConverter : JsonConverter /// public override OrderStatus? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OrderStatus? result = rawValue == null @@ -183,7 +186,10 @@ public class OrderStatusNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OrderStatus? orderStatus, JsonSerializerOptions options) { - writer.WriteStringValue(orderStatus.HasValue ? OrderStatusValueConverter.ToJsonValue(orderStatus.Value).ToString() : "null"); + if (orderStatus.HasValue) + writer.WriteStringValue(OrderStatusValueConverter.ToJsonValue(orderStatus.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs index e72ea52b0876..8b433c5033b8 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -162,6 +162,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index e2c52f962f32..2d1b5d668e16 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -162,6 +162,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..180eef18894e 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 296151997b01..ad1af6012860 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b4c4e25a9bb2..b4a71547cc1e 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -232,6 +232,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -252,7 +255,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs index 52de1419c804..1a60f1c7856c 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs @@ -163,6 +163,9 @@ public class PetStatusNullableJsonConverter : JsonConverter /// public override PetStatus? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); PetStatus? result = rawValue == null @@ -183,7 +186,10 @@ public class PetStatusNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, PetStatus? petStatus, JsonSerializerOptions options) { - writer.WriteStringValue(petStatus.HasValue ? PetStatusValueConverter.ToJsonValue(petStatus.Value).ToString() : "null"); + if (petStatus.HasValue) + writer.WriteStringValue(PetStatusValueConverter.ToJsonValue(petStatus.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs index fcdc55074811..28b19513d368 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonRea /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumInteger requiredClassRequiredNotnullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : /// public override RequiredClassRequiredNotnullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumInteger? requiredClassRequiredNotnullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumInteger.HasValue ? RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumInteger.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs index 1d33399c6331..7b5b97f0f8c6 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8Jso /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumIntegerOnly requiredClassRequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte /// public override RequiredClassRequiredNotnullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumIntegerOnly? requiredClassRequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumIntegerOnly.HasValue ? RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumIntegerOnly.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs index 1e251fee921b..7e1af535ae83 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs @@ -232,6 +232,9 @@ public class RequiredClassRequiredNotnullableEnumStringNullableJsonConverter : J /// public override RequiredClassRequiredNotnullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); RequiredClassRequiredNotnullableEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class RequiredClassRequiredNotnullableEnumStringNullableJsonConverter : J /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumString? requiredClassRequiredNotnullableEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumString.HasValue ? RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumString.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumString.HasValue) + writer.WriteStringValue(RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs index 97db2037f953..5ede755b11d4 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumInteger requiredClassRequiredNullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso /// public override RequiredClassRequiredNullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumInteger? requiredClassRequiredNullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumInteger.HasValue ? RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumInteger.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs index 2f53261cd6ff..c59223bbfff6 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonRe /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumIntegerOnly requiredClassRequiredNullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : /// public override RequiredClassRequiredNullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumIntegerOnly? requiredClassRequiredNullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumIntegerOnly.HasValue ? RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumIntegerOnly.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs index 7efe892e9246..bf6c28314256 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs @@ -232,6 +232,9 @@ public class RequiredClassRequiredNullableEnumStringNullableJsonConverter : Json /// public override RequiredClassRequiredNullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); RequiredClassRequiredNullableEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class RequiredClassRequiredNullableEnumStringNullableJsonConverter : Json /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumString? requiredClassRequiredNullableEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumString.HasValue ? RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumString.HasValue) + writer.WriteStringValue(RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs index 0c0c757cc59b..fc932e79b93f 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs @@ -148,6 +148,9 @@ public class TestDescendantsObjectTypeNullableJsonConverter : JsonConverter public override TestDescendantsObjectType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestDescendantsObjectType? result = rawValue == null @@ -168,7 +171,10 @@ public class TestDescendantsObjectTypeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestDescendantsObjectType? testDescendantsObjectType, JsonSerializerOptions options) { - writer.WriteStringValue(testDescendantsObjectType.HasValue ? TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType.Value).ToString() : "null"); + if (testDescendantsObjectType.HasValue) + writer.WriteStringValue(TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs index 4fe8d2deb709..6b34ecb05787 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs @@ -162,6 +162,9 @@ public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : /// public override TestEnumParametersEnumHeaderStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersEnumHeaderStringParameter? result = rawValue == null @@ -182,7 +185,10 @@ public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter? testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumHeaderStringParameter.HasValue ? TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString() : "null"); + if (testEnumParametersEnumHeaderStringParameter.HasValue) + writer.WriteStringValue(TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs index d4d97e76043f..e76d34f002f6 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs @@ -85,7 +85,13 @@ public static TestEnumParametersEnumQueryDoubleParameter FromString(string value /// public static double ToJsonValue(TestEnumParametersEnumQueryDoubleParameter value) { - return (double) value; + if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_1_DOT_1) + return 1.1d; + + if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_MINUS_1_DOT_2) + return -1.2d; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); } } @@ -104,15 +110,10 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryDoubleParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetDouble().ToString(); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +125,7 @@ public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonRead /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter, JsonSerializerOptions options) { - writer.WriteStringValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString()); + writer.WriteNumberValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter)); } } @@ -142,15 +143,13 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J /// public override TestEnumParametersEnumQueryDoubleParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryDoubleParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetDouble().ToString(); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +161,10 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryDoubleParameter? testEnumParametersEnumQueryDoubleParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumQueryDoubleParameter.HasValue ? TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter.Value).ToString() : "null"); + if (testEnumParametersEnumQueryDoubleParameter.HasValue) + writer.WriteNumberValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs index 85149c3f5eb9..cf70b0624f9b 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs @@ -104,15 +104,10 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryIntegerParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonRea /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter, JsonSerializerOptions options) { - writer.WriteStringValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter).ToString()); + writer.WriteNumberValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter)); } } @@ -142,15 +137,13 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : /// public override TestEnumParametersEnumQueryIntegerParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryIntegerParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryIntegerParameter? testEnumParametersEnumQueryIntegerParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumQueryIntegerParameter.HasValue ? TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter.Value).ToString() : "null"); + if (testEnumParametersEnumQueryIntegerParameter.HasValue) + writer.WriteNumberValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs index 2e81a11c33b2..564a3fc67e09 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs @@ -163,6 +163,9 @@ public class TestEnumParametersRequestEnumFormStringNullableJsonConverter : Json /// public override TestEnumParametersRequestEnumFormString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersRequestEnumFormString? result = rawValue == null @@ -183,7 +186,10 @@ public class TestEnumParametersRequestEnumFormStringNullableJsonConverter : Json /// public override void Write(Utf8JsonWriter writer, TestEnumParametersRequestEnumFormString? testEnumParametersRequestEnumFormString, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersRequestEnumFormString.HasValue ? TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString.Value).ToString() : "null"); + if (testEnumParametersRequestEnumFormString.HasValue) + writer.WriteStringValue(TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs index 5c00030c30a4..41a116adffd4 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs @@ -148,6 +148,9 @@ public class TestEnumParametersRequestEnumFormStringArrayInnerNullableJsonConver /// public override TestEnumParametersRequestEnumFormStringArrayInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersRequestEnumFormStringArrayInner? result = rawValue == null @@ -168,7 +171,10 @@ public class TestEnumParametersRequestEnumFormStringArrayInnerNullableJsonConver /// public override void Write(Utf8JsonWriter writer, TestEnumParametersRequestEnumFormStringArrayInner? testEnumParametersRequestEnumFormStringArrayInner, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersRequestEnumFormStringArrayInner.HasValue ? TestEnumParametersRequestEnumFormStringArrayInnerValueConverter.ToJsonValue(testEnumParametersRequestEnumFormStringArrayInner.Value).ToString() : "null"); + if (testEnumParametersRequestEnumFormStringArrayInner.HasValue) + writer.WriteStringValue(TestEnumParametersRequestEnumFormStringArrayInnerValueConverter.ToJsonValue(testEnumParametersRequestEnumFormStringArrayInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs index 280c9b82cfab..0c6a6e1fb987 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -149,6 +149,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -169,7 +172,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs index 5eb8d6bac71e..f5ef7a380fe4 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs @@ -162,6 +162,9 @@ public class ZebraTypeNullableJsonConverter : JsonConverter /// public override ZebraType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZebraType? result = rawValue == null @@ -182,7 +185,10 @@ public class ZebraTypeNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZebraType? zebraType, JsonSerializerOptions options) { - writer.WriteStringValue(zebraType.HasValue ? ZebraTypeValueConverter.ToJsonValue(zebraType.Value).ToString() : "null"); + if (zebraType.HasValue) + writer.WriteStringValue(ZebraTypeValueConverter.ToJsonValue(zebraType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index b82155f7800c..8e6cdad42d28 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs index cb6f10e40b3a..39709c18f566 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter : JsonConverte /// public override ZeroBasedEnumClassZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnumClassZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter : JsonConverte /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnumClassZeroBasedEnum? zeroBasedEnumClassZeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnumClassZeroBasedEnum.HasValue ? ZeroBasedEnumClassZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnumClassZeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnumClassZeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumClassZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnumClassZeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs index cefbf28588fb..b6fbaaf487cf 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs @@ -162,6 +162,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -182,7 +185,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs index e72ea52b0876..8b433c5033b8 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -162,6 +162,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index e2c52f962f32..2d1b5d668e16 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -162,6 +162,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..180eef18894e 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 296151997b01..ad1af6012860 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b4c4e25a9bb2..b4a71547cc1e 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -232,6 +232,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -252,7 +255,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs index 280c9b82cfab..0c6a6e1fb987 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -149,6 +149,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -169,7 +172,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index b82155f7800c..8e6cdad42d28 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs index 252a51260bcf..1bed600a55f5 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs @@ -134,6 +134,9 @@ public class ChildCatAllOfPetTypeNullableJsonConverter : JsonConverter public override ChildCatAllOfPetType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ChildCatAllOfPetType? result = rawValue == null @@ -154,7 +157,10 @@ public class ChildCatAllOfPetTypeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, ChildCatAllOfPetType? childCatAllOfPetType, JsonSerializerOptions options) { - writer.WriteStringValue(childCatAllOfPetType.HasValue ? ChildCatAllOfPetTypeValueConverter.ToJsonValue(childCatAllOfPetType.Value).ToString() : "null"); + if (childCatAllOfPetType.HasValue) + writer.WriteStringValue(ChildCatAllOfPetTypeValueConverter.ToJsonValue(childCatAllOfPetType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs index 9760b9efadd6..dbb402dc4ac8 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs @@ -134,6 +134,9 @@ public class CopyActivityAllOfSchemaNullableJsonConverter : JsonConverter public override CopyActivityAllOfSchema? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); CopyActivityAllOfSchema? result = rawValue == null @@ -154,7 +157,10 @@ public class CopyActivityAllOfSchemaNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, CopyActivityAllOfSchema? copyActivityAllOfSchema, JsonSerializerOptions options) { - writer.WriteStringValue(copyActivityAllOfSchema.HasValue ? CopyActivityAllOfSchemaValueConverter.ToJsonValue(copyActivityAllOfSchema.Value).ToString() : "null"); + if (copyActivityAllOfSchema.HasValue) + writer.WriteStringValue(CopyActivityAllOfSchemaValueConverter.ToJsonValue(copyActivityAllOfSchema.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs index 2ceb96620d05..3d3db1add77a 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs @@ -148,6 +148,9 @@ public class EnumArraysArrayEnumInnerNullableJsonConverter : JsonConverter public override EnumArraysArrayEnumInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumArraysArrayEnumInner? result = rawValue == null @@ -168,7 +171,10 @@ public class EnumArraysArrayEnumInnerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumArraysArrayEnumInner? enumArraysArrayEnumInner, JsonSerializerOptions options) { - writer.WriteStringValue(enumArraysArrayEnumInner.HasValue ? EnumArraysArrayEnumInnerValueConverter.ToJsonValue(enumArraysArrayEnumInner.Value).ToString() : "null"); + if (enumArraysArrayEnumInner.HasValue) + writer.WriteStringValue(EnumArraysArrayEnumInnerValueConverter.ToJsonValue(enumArraysArrayEnumInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs index 8400d5cd4273..67a8cfe66128 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs @@ -148,6 +148,9 @@ public class EnumArraysJustSymbolNullableJsonConverter : JsonConverter public override EnumArraysJustSymbol? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumArraysJustSymbol? result = rawValue == null @@ -168,7 +171,10 @@ public class EnumArraysJustSymbolNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumArraysJustSymbol? enumArraysJustSymbol, JsonSerializerOptions options) { - writer.WriteStringValue(enumArraysJustSymbol.HasValue ? EnumArraysJustSymbolValueConverter.ToJsonValue(enumArraysJustSymbol.Value).ToString() : "null"); + if (enumArraysJustSymbol.HasValue) + writer.WriteStringValue(EnumArraysJustSymbolValueConverter.ToJsonValue(enumArraysJustSymbol.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs index cefbf28588fb..b6fbaaf487cf 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs @@ -162,6 +162,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -182,7 +185,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs index 19178ecba280..5ea93c467d62 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs @@ -104,15 +104,10 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumInteger? result = rawValue == null - ? null - : EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToC /// public override void Write(Utf8JsonWriter writer, EnumTestEnumInteger enumTestEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger).ToString()); + writer.WriteNumberValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger)); } } @@ -142,15 +137,13 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override EnumTestEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumInteger? result = rawValue == null - ? null - : EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumInteger? enumTestEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumInteger.HasValue ? EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger.Value).ToString() : "null"); + if (enumTestEnumInteger.HasValue) + writer.WriteNumberValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs index 6a999c69d575..dab24618fddd 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumIntegerOnly? result = rawValue == null - ? null - : EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typ /// public override void Write(Utf8JsonWriter writer, EnumTestEnumIntegerOnly enumTestEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly).ToString()); + writer.WriteNumberValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumIntegerOnly? result = rawValue == null - ? null - : EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumIntegerOnly? enumTestEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumIntegerOnly.HasValue ? EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly.Value).ToString() : "null"); + if (enumTestEnumIntegerOnly.HasValue) + writer.WriteNumberValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs index 4d02eeaec018..6afc370e3ca5 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs @@ -232,6 +232,9 @@ public class EnumTestEnumStringNullableJsonConverter : JsonConverter public override EnumTestEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumTestEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class EnumTestEnumStringNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumString? enumTestEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumString.HasValue ? EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString.Value).ToString() : "null"); + if (enumTestEnumString.HasValue) + writer.WriteStringValue(EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs index e7f98f931cc9..d1ac7f8dd36b 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs @@ -162,6 +162,9 @@ public class FindPetsByStatusStatusParameterInnerNullableJsonConverter : JsonCon /// public override FindPetsByStatusStatusParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); FindPetsByStatusStatusParameterInner? result = rawValue == null @@ -182,7 +185,10 @@ public class FindPetsByStatusStatusParameterInnerNullableJsonConverter : JsonCon /// public override void Write(Utf8JsonWriter writer, FindPetsByStatusStatusParameterInner? findPetsByStatusStatusParameterInner, JsonSerializerOptions options) { - writer.WriteStringValue(findPetsByStatusStatusParameterInner.HasValue ? FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner.Value).ToString() : "null"); + if (findPetsByStatusStatusParameterInner.HasValue) + writer.WriteStringValue(FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs index 3c7331f80f28..0f34a3ceea08 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs @@ -148,6 +148,9 @@ public class MapTestMapOfEnumStringValueNullableJsonConverter : JsonConverter public override MapTestMapOfEnumStringValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); MapTestMapOfEnumStringValue? result = rawValue == null @@ -168,7 +171,10 @@ public class MapTestMapOfEnumStringValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, MapTestMapOfEnumStringValue? mapTestMapOfEnumStringValue, JsonSerializerOptions options) { - writer.WriteStringValue(mapTestMapOfEnumStringValue.HasValue ? MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue.Value).ToString() : "null"); + if (mapTestMapOfEnumStringValue.HasValue) + writer.WriteStringValue(MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs index cd0ff06ce52e..e193de19a3ea 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs @@ -163,6 +163,9 @@ public class OrderStatusNullableJsonConverter : JsonConverter /// public override OrderStatus? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OrderStatus? result = rawValue == null @@ -183,7 +186,10 @@ public class OrderStatusNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OrderStatus? orderStatus, JsonSerializerOptions options) { - writer.WriteStringValue(orderStatus.HasValue ? OrderStatusValueConverter.ToJsonValue(orderStatus.Value).ToString() : "null"); + if (orderStatus.HasValue) + writer.WriteStringValue(OrderStatusValueConverter.ToJsonValue(orderStatus.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs index e72ea52b0876..8b433c5033b8 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -162,6 +162,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index e2c52f962f32..2d1b5d668e16 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -162,6 +162,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..180eef18894e 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 296151997b01..ad1af6012860 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b4c4e25a9bb2..b4a71547cc1e 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -232,6 +232,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -252,7 +255,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs index 52de1419c804..1a60f1c7856c 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs @@ -163,6 +163,9 @@ public class PetStatusNullableJsonConverter : JsonConverter /// public override PetStatus? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); PetStatus? result = rawValue == null @@ -183,7 +186,10 @@ public class PetStatusNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, PetStatus? petStatus, JsonSerializerOptions options) { - writer.WriteStringValue(petStatus.HasValue ? PetStatusValueConverter.ToJsonValue(petStatus.Value).ToString() : "null"); + if (petStatus.HasValue) + writer.WriteStringValue(PetStatusValueConverter.ToJsonValue(petStatus.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs index fcdc55074811..28b19513d368 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonRea /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumInteger requiredClassRequiredNotnullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : /// public override RequiredClassRequiredNotnullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumInteger? requiredClassRequiredNotnullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumInteger.HasValue ? RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumInteger.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs index 1d33399c6331..7b5b97f0f8c6 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8Jso /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumIntegerOnly requiredClassRequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte /// public override RequiredClassRequiredNotnullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumIntegerOnly? requiredClassRequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumIntegerOnly.HasValue ? RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumIntegerOnly.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs index 1e251fee921b..7e1af535ae83 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs @@ -232,6 +232,9 @@ public class RequiredClassRequiredNotnullableEnumStringNullableJsonConverter : J /// public override RequiredClassRequiredNotnullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); RequiredClassRequiredNotnullableEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class RequiredClassRequiredNotnullableEnumStringNullableJsonConverter : J /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumString? requiredClassRequiredNotnullableEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumString.HasValue ? RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumString.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumString.HasValue) + writer.WriteStringValue(RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs index 97db2037f953..5ede755b11d4 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumInteger requiredClassRequiredNullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso /// public override RequiredClassRequiredNullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumInteger? requiredClassRequiredNullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumInteger.HasValue ? RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumInteger.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs index 2f53261cd6ff..c59223bbfff6 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonRe /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumIntegerOnly requiredClassRequiredNullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : /// public override RequiredClassRequiredNullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumIntegerOnly? requiredClassRequiredNullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumIntegerOnly.HasValue ? RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumIntegerOnly.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs index 7efe892e9246..bf6c28314256 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs @@ -232,6 +232,9 @@ public class RequiredClassRequiredNullableEnumStringNullableJsonConverter : Json /// public override RequiredClassRequiredNullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); RequiredClassRequiredNullableEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class RequiredClassRequiredNullableEnumStringNullableJsonConverter : Json /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumString? requiredClassRequiredNullableEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumString.HasValue ? RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumString.HasValue) + writer.WriteStringValue(RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs index 0c0c757cc59b..fc932e79b93f 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs @@ -148,6 +148,9 @@ public class TestDescendantsObjectTypeNullableJsonConverter : JsonConverter public override TestDescendantsObjectType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestDescendantsObjectType? result = rawValue == null @@ -168,7 +171,10 @@ public class TestDescendantsObjectTypeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestDescendantsObjectType? testDescendantsObjectType, JsonSerializerOptions options) { - writer.WriteStringValue(testDescendantsObjectType.HasValue ? TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType.Value).ToString() : "null"); + if (testDescendantsObjectType.HasValue) + writer.WriteStringValue(TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs index 4fe8d2deb709..6b34ecb05787 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs @@ -162,6 +162,9 @@ public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : /// public override TestEnumParametersEnumHeaderStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersEnumHeaderStringParameter? result = rawValue == null @@ -182,7 +185,10 @@ public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter? testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumHeaderStringParameter.HasValue ? TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString() : "null"); + if (testEnumParametersEnumHeaderStringParameter.HasValue) + writer.WriteStringValue(TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs index d4d97e76043f..e76d34f002f6 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs @@ -85,7 +85,13 @@ public static TestEnumParametersEnumQueryDoubleParameter FromString(string value /// public static double ToJsonValue(TestEnumParametersEnumQueryDoubleParameter value) { - return (double) value; + if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_1_DOT_1) + return 1.1d; + + if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_MINUS_1_DOT_2) + return -1.2d; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); } } @@ -104,15 +110,10 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryDoubleParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetDouble().ToString(); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +125,7 @@ public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonRead /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter, JsonSerializerOptions options) { - writer.WriteStringValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString()); + writer.WriteNumberValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter)); } } @@ -142,15 +143,13 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J /// public override TestEnumParametersEnumQueryDoubleParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryDoubleParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetDouble().ToString(); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +161,10 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryDoubleParameter? testEnumParametersEnumQueryDoubleParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumQueryDoubleParameter.HasValue ? TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter.Value).ToString() : "null"); + if (testEnumParametersEnumQueryDoubleParameter.HasValue) + writer.WriteNumberValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs index 85149c3f5eb9..cf70b0624f9b 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs @@ -104,15 +104,10 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryIntegerParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonRea /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter, JsonSerializerOptions options) { - writer.WriteStringValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter).ToString()); + writer.WriteNumberValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter)); } } @@ -142,15 +137,13 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : /// public override TestEnumParametersEnumQueryIntegerParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryIntegerParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryIntegerParameter? testEnumParametersEnumQueryIntegerParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumQueryIntegerParameter.HasValue ? TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter.Value).ToString() : "null"); + if (testEnumParametersEnumQueryIntegerParameter.HasValue) + writer.WriteNumberValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs index 2e81a11c33b2..564a3fc67e09 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs @@ -163,6 +163,9 @@ public class TestEnumParametersRequestEnumFormStringNullableJsonConverter : Json /// public override TestEnumParametersRequestEnumFormString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersRequestEnumFormString? result = rawValue == null @@ -183,7 +186,10 @@ public class TestEnumParametersRequestEnumFormStringNullableJsonConverter : Json /// public override void Write(Utf8JsonWriter writer, TestEnumParametersRequestEnumFormString? testEnumParametersRequestEnumFormString, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersRequestEnumFormString.HasValue ? TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString.Value).ToString() : "null"); + if (testEnumParametersRequestEnumFormString.HasValue) + writer.WriteStringValue(TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs index 5c00030c30a4..41a116adffd4 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs @@ -148,6 +148,9 @@ public class TestEnumParametersRequestEnumFormStringArrayInnerNullableJsonConver /// public override TestEnumParametersRequestEnumFormStringArrayInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersRequestEnumFormStringArrayInner? result = rawValue == null @@ -168,7 +171,10 @@ public class TestEnumParametersRequestEnumFormStringArrayInnerNullableJsonConver /// public override void Write(Utf8JsonWriter writer, TestEnumParametersRequestEnumFormStringArrayInner? testEnumParametersRequestEnumFormStringArrayInner, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersRequestEnumFormStringArrayInner.HasValue ? TestEnumParametersRequestEnumFormStringArrayInnerValueConverter.ToJsonValue(testEnumParametersRequestEnumFormStringArrayInner.Value).ToString() : "null"); + if (testEnumParametersRequestEnumFormStringArrayInner.HasValue) + writer.WriteStringValue(TestEnumParametersRequestEnumFormStringArrayInnerValueConverter.ToJsonValue(testEnumParametersRequestEnumFormStringArrayInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs index 280c9b82cfab..0c6a6e1fb987 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -149,6 +149,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -169,7 +172,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs index 5eb8d6bac71e..f5ef7a380fe4 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs @@ -162,6 +162,9 @@ public class ZebraTypeNullableJsonConverter : JsonConverter /// public override ZebraType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZebraType? result = rawValue == null @@ -182,7 +185,10 @@ public class ZebraTypeNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZebraType? zebraType, JsonSerializerOptions options) { - writer.WriteStringValue(zebraType.HasValue ? ZebraTypeValueConverter.ToJsonValue(zebraType.Value).ToString() : "null"); + if (zebraType.HasValue) + writer.WriteStringValue(ZebraTypeValueConverter.ToJsonValue(zebraType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index b82155f7800c..8e6cdad42d28 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs index cb6f10e40b3a..39709c18f566 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter : JsonConverte /// public override ZeroBasedEnumClassZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnumClassZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter : JsonConverte /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnumClassZeroBasedEnum? zeroBasedEnumClassZeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnumClassZeroBasedEnum.HasValue ? ZeroBasedEnumClassZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnumClassZeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnumClassZeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumClassZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnumClassZeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs index 592f6a59c31a..daf0b57af01b 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs @@ -164,6 +164,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -184,7 +187,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs index 0476c873cd87..1497d9eca8cd 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -164,6 +164,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -184,7 +187,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index 68faa3cd5de2..7cdb4970271b 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -164,6 +164,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -184,7 +187,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 6ba997e06eb1..7a9b57b3ddd0 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -117,15 +117,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -137,7 +132,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -155,15 +150,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -175,7 +168,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index d8d27e54ee34..b5acfb593af1 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -117,15 +117,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -137,7 +132,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -155,15 +150,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -175,7 +168,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs index 5a1f2a6e439e..b7de72535a4f 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -234,6 +234,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -254,7 +257,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs index f53e8d34214c..418868cd36f7 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -151,6 +151,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -171,7 +174,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index 5434f2b84ea5..d6b37f71c918 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -150,6 +150,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -170,7 +173,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs index cefbf28588fb..b6fbaaf487cf 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs @@ -162,6 +162,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -182,7 +185,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs index e72ea52b0876..8b433c5033b8 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -162,6 +162,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index e2c52f962f32..2d1b5d668e16 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -162,6 +162,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..180eef18894e 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 296151997b01..ad1af6012860 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b4c4e25a9bb2..b4a71547cc1e 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -232,6 +232,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -252,7 +255,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs index 280c9b82cfab..0c6a6e1fb987 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -149,6 +149,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -169,7 +172,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index b82155f7800c..8e6cdad42d28 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs index 6192d15c9f5f..fee0d4a8f728 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs @@ -165,6 +165,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -185,7 +188,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs index c2b58fa0eba1..71f82a74a6fb 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -165,6 +165,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -185,7 +188,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index fa6acccc08e7..3afb38ee60c4 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -165,6 +165,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -185,7 +188,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 362553f662a9..a442934bb5b8 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -118,15 +118,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -138,7 +133,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -156,15 +151,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -176,7 +169,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index fba1de8e6f39..a4c6123fc064 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -118,15 +118,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -138,7 +133,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -156,15 +151,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -176,7 +169,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b8716ad2b25f..a412be9cef62 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -235,6 +235,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -255,7 +258,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs index 029a66af5180..a18f3d7d0f72 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -152,6 +152,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -172,7 +175,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index c553e7d9ef54..95c7d5fa7df6 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -151,6 +151,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -171,7 +174,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs index 252a51260bcf..1bed600a55f5 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs @@ -134,6 +134,9 @@ public class ChildCatAllOfPetTypeNullableJsonConverter : JsonConverter public override ChildCatAllOfPetType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ChildCatAllOfPetType? result = rawValue == null @@ -154,7 +157,10 @@ public class ChildCatAllOfPetTypeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, ChildCatAllOfPetType? childCatAllOfPetType, JsonSerializerOptions options) { - writer.WriteStringValue(childCatAllOfPetType.HasValue ? ChildCatAllOfPetTypeValueConverter.ToJsonValue(childCatAllOfPetType.Value).ToString() : "null"); + if (childCatAllOfPetType.HasValue) + writer.WriteStringValue(ChildCatAllOfPetTypeValueConverter.ToJsonValue(childCatAllOfPetType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs index 9760b9efadd6..dbb402dc4ac8 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs @@ -134,6 +134,9 @@ public class CopyActivityAllOfSchemaNullableJsonConverter : JsonConverter public override CopyActivityAllOfSchema? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); CopyActivityAllOfSchema? result = rawValue == null @@ -154,7 +157,10 @@ public class CopyActivityAllOfSchemaNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, CopyActivityAllOfSchema? copyActivityAllOfSchema, JsonSerializerOptions options) { - writer.WriteStringValue(copyActivityAllOfSchema.HasValue ? CopyActivityAllOfSchemaValueConverter.ToJsonValue(copyActivityAllOfSchema.Value).ToString() : "null"); + if (copyActivityAllOfSchema.HasValue) + writer.WriteStringValue(CopyActivityAllOfSchemaValueConverter.ToJsonValue(copyActivityAllOfSchema.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs index 2ceb96620d05..3d3db1add77a 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs @@ -148,6 +148,9 @@ public class EnumArraysArrayEnumInnerNullableJsonConverter : JsonConverter public override EnumArraysArrayEnumInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumArraysArrayEnumInner? result = rawValue == null @@ -168,7 +171,10 @@ public class EnumArraysArrayEnumInnerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumArraysArrayEnumInner? enumArraysArrayEnumInner, JsonSerializerOptions options) { - writer.WriteStringValue(enumArraysArrayEnumInner.HasValue ? EnumArraysArrayEnumInnerValueConverter.ToJsonValue(enumArraysArrayEnumInner.Value).ToString() : "null"); + if (enumArraysArrayEnumInner.HasValue) + writer.WriteStringValue(EnumArraysArrayEnumInnerValueConverter.ToJsonValue(enumArraysArrayEnumInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs index 8400d5cd4273..67a8cfe66128 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs @@ -148,6 +148,9 @@ public class EnumArraysJustSymbolNullableJsonConverter : JsonConverter public override EnumArraysJustSymbol? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumArraysJustSymbol? result = rawValue == null @@ -168,7 +171,10 @@ public class EnumArraysJustSymbolNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumArraysJustSymbol? enumArraysJustSymbol, JsonSerializerOptions options) { - writer.WriteStringValue(enumArraysJustSymbol.HasValue ? EnumArraysJustSymbolValueConverter.ToJsonValue(enumArraysJustSymbol.Value).ToString() : "null"); + if (enumArraysJustSymbol.HasValue) + writer.WriteStringValue(EnumArraysJustSymbolValueConverter.ToJsonValue(enumArraysJustSymbol.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs index cefbf28588fb..b6fbaaf487cf 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumClass.cs @@ -162,6 +162,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -182,7 +185,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs index 19178ecba280..5ea93c467d62 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs @@ -104,15 +104,10 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumInteger? result = rawValue == null - ? null - : EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToC /// public override void Write(Utf8JsonWriter writer, EnumTestEnumInteger enumTestEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger).ToString()); + writer.WriteNumberValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger)); } } @@ -142,15 +137,13 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override EnumTestEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumInteger? result = rawValue == null - ? null - : EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumInteger? enumTestEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumInteger.HasValue ? EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger.Value).ToString() : "null"); + if (enumTestEnumInteger.HasValue) + writer.WriteNumberValue(EnumTestEnumIntegerValueConverter.ToJsonValue(enumTestEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs index 6a999c69d575..dab24618fddd 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumIntegerOnly? result = rawValue == null - ? null - : EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typ /// public override void Write(Utf8JsonWriter writer, EnumTestEnumIntegerOnly enumTestEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly).ToString()); + writer.WriteNumberValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - EnumTestEnumIntegerOnly? result = rawValue == null - ? null - : EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumIntegerOnly? enumTestEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumIntegerOnly.HasValue ? EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly.Value).ToString() : "null"); + if (enumTestEnumIntegerOnly.HasValue) + writer.WriteNumberValue(EnumTestEnumIntegerOnlyValueConverter.ToJsonValue(enumTestEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs index 4d02eeaec018..6afc370e3ca5 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumString.cs @@ -232,6 +232,9 @@ public class EnumTestEnumStringNullableJsonConverter : JsonConverter public override EnumTestEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumTestEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class EnumTestEnumStringNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, EnumTestEnumString? enumTestEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(enumTestEnumString.HasValue ? EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString.Value).ToString() : "null"); + if (enumTestEnumString.HasValue) + writer.WriteStringValue(EnumTestEnumStringValueConverter.ToJsonValue(enumTestEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs index e7f98f931cc9..d1ac7f8dd36b 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/FindPetsByStatusStatusParameterInner.cs @@ -162,6 +162,9 @@ public class FindPetsByStatusStatusParameterInnerNullableJsonConverter : JsonCon /// public override FindPetsByStatusStatusParameterInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); FindPetsByStatusStatusParameterInner? result = rawValue == null @@ -182,7 +185,10 @@ public class FindPetsByStatusStatusParameterInnerNullableJsonConverter : JsonCon /// public override void Write(Utf8JsonWriter writer, FindPetsByStatusStatusParameterInner? findPetsByStatusStatusParameterInner, JsonSerializerOptions options) { - writer.WriteStringValue(findPetsByStatusStatusParameterInner.HasValue ? FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner.Value).ToString() : "null"); + if (findPetsByStatusStatusParameterInner.HasValue) + writer.WriteStringValue(FindPetsByStatusStatusParameterInnerValueConverter.ToJsonValue(findPetsByStatusStatusParameterInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs index 3c7331f80f28..0f34a3ceea08 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/MapTestMapOfEnumStringValue.cs @@ -148,6 +148,9 @@ public class MapTestMapOfEnumStringValueNullableJsonConverter : JsonConverter public override MapTestMapOfEnumStringValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); MapTestMapOfEnumStringValue? result = rawValue == null @@ -168,7 +171,10 @@ public class MapTestMapOfEnumStringValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, MapTestMapOfEnumStringValue? mapTestMapOfEnumStringValue, JsonSerializerOptions options) { - writer.WriteStringValue(mapTestMapOfEnumStringValue.HasValue ? MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue.Value).ToString() : "null"); + if (mapTestMapOfEnumStringValue.HasValue) + writer.WriteStringValue(MapTestMapOfEnumStringValueValueConverter.ToJsonValue(mapTestMapOfEnumStringValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs index cd0ff06ce52e..e193de19a3ea 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OrderStatus.cs @@ -163,6 +163,9 @@ public class OrderStatusNullableJsonConverter : JsonConverter /// public override OrderStatus? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OrderStatus? result = rawValue == null @@ -183,7 +186,10 @@ public class OrderStatusNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OrderStatus? orderStatus, JsonSerializerOptions options) { - writer.WriteStringValue(orderStatus.HasValue ? OrderStatusValueConverter.ToJsonValue(orderStatus.Value).ToString() : "null"); + if (orderStatus.HasValue) + writer.WriteStringValue(OrderStatusValueConverter.ToJsonValue(orderStatus.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs index e72ea52b0876..8b433c5033b8 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -162,6 +162,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index e2c52f962f32..2d1b5d668e16 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -162,6 +162,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..180eef18894e 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 296151997b01..ad1af6012860 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b4c4e25a9bb2..b4a71547cc1e 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -232,6 +232,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -252,7 +255,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs index 52de1419c804..1a60f1c7856c 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/PetStatus.cs @@ -163,6 +163,9 @@ public class PetStatusNullableJsonConverter : JsonConverter /// public override PetStatus? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); PetStatus? result = rawValue == null @@ -183,7 +186,10 @@ public class PetStatusNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, PetStatus? petStatus, JsonSerializerOptions options) { - writer.WriteStringValue(petStatus.HasValue ? PetStatusValueConverter.ToJsonValue(petStatus.Value).ToString() : "null"); + if (petStatus.HasValue) + writer.WriteStringValue(PetStatusValueConverter.ToJsonValue(petStatus.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs index fcdc55074811..28b19513d368 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonRea /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumInteger requiredClassRequiredNotnullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : /// public override RequiredClassRequiredNotnullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumInteger? requiredClassRequiredNotnullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumInteger.HasValue ? RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumInteger.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs index 1d33399c6331..7b5b97f0f8c6 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8Jso /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumIntegerOnly requiredClassRequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte /// public override RequiredClassRequiredNotnullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNotnullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumIntegerOnly? requiredClassRequiredNotnullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumIntegerOnly.HasValue ? RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumIntegerOnly.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs index 1e251fee921b..7e1af535ae83 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumString.cs @@ -232,6 +232,9 @@ public class RequiredClassRequiredNotnullableEnumStringNullableJsonConverter : J /// public override RequiredClassRequiredNotnullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); RequiredClassRequiredNotnullableEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class RequiredClassRequiredNotnullableEnumStringNullableJsonConverter : J /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNotnullableEnumString? requiredClassRequiredNotnullableEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNotnullableEnumString.HasValue ? RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumString.Value).ToString() : "null"); + if (requiredClassRequiredNotnullableEnumString.HasValue) + writer.WriteStringValue(RequiredClassRequiredNotnullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNotnullableEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs index 97db2037f953..5ede755b11d4 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumInteger requiredClassRequiredNullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso /// public override RequiredClassRequiredNullableEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumInteger? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumInteger? requiredClassRequiredNullableEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumInteger.HasValue ? RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumInteger.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerValueConverter.ToJsonValue(requiredClassRequiredNullableEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs index 2f53261cd6ff..c59223bbfff6 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumIntegerOnly.cs @@ -104,15 +104,10 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonRe /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumIntegerOnly requiredClassRequiredNullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly).ToString()); + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly)); } } @@ -142,15 +137,13 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : /// public override RequiredClassRequiredNullableEnumIntegerOnly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - RequiredClassRequiredNullableEnumIntegerOnly? result = rawValue == null - ? null - : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumIntegerOnly? requiredClassRequiredNullableEnumIntegerOnly, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumIntegerOnly.HasValue ? RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumIntegerOnly.HasValue) + writer.WriteNumberValue(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.ToJsonValue(requiredClassRequiredNullableEnumIntegerOnly.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs index 7efe892e9246..bf6c28314256 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumString.cs @@ -232,6 +232,9 @@ public class RequiredClassRequiredNullableEnumStringNullableJsonConverter : Json /// public override RequiredClassRequiredNullableEnumString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); RequiredClassRequiredNullableEnumString? result = rawValue == null @@ -252,7 +255,10 @@ public class RequiredClassRequiredNullableEnumStringNullableJsonConverter : Json /// public override void Write(Utf8JsonWriter writer, RequiredClassRequiredNullableEnumString? requiredClassRequiredNullableEnumString, JsonSerializerOptions options) { - writer.WriteStringValue(requiredClassRequiredNullableEnumString.HasValue ? RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString.Value).ToString() : "null"); + if (requiredClassRequiredNullableEnumString.HasValue) + writer.WriteStringValue(RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs index 0c0c757cc59b..fc932e79b93f 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs @@ -148,6 +148,9 @@ public class TestDescendantsObjectTypeNullableJsonConverter : JsonConverter public override TestDescendantsObjectType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestDescendantsObjectType? result = rawValue == null @@ -168,7 +171,10 @@ public class TestDescendantsObjectTypeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestDescendantsObjectType? testDescendantsObjectType, JsonSerializerOptions options) { - writer.WriteStringValue(testDescendantsObjectType.HasValue ? TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType.Value).ToString() : "null"); + if (testDescendantsObjectType.HasValue) + writer.WriteStringValue(TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs index 4fe8d2deb709..6b34ecb05787 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs @@ -162,6 +162,9 @@ public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : /// public override TestEnumParametersEnumHeaderStringParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersEnumHeaderStringParameter? result = rawValue == null @@ -182,7 +185,10 @@ public class TestEnumParametersEnumHeaderStringParameterNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumHeaderStringParameter? testEnumParametersEnumHeaderStringParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumHeaderStringParameter.HasValue ? TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString() : "null"); + if (testEnumParametersEnumHeaderStringParameter.HasValue) + writer.WriteStringValue(TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs index d4d97e76043f..e76d34f002f6 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs @@ -85,7 +85,13 @@ public static TestEnumParametersEnumQueryDoubleParameter FromString(string value /// public static double ToJsonValue(TestEnumParametersEnumQueryDoubleParameter value) { - return (double) value; + if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_1_DOT_1) + return 1.1d; + + if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_MINUS_1_DOT_2) + return -1.2d; + + throw new NotImplementedException($"Value could not be handled: '{value}'"); } } @@ -104,15 +110,10 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryDoubleParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetDouble().ToString(); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +125,7 @@ public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonRead /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter, JsonSerializerOptions options) { - writer.WriteStringValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString()); + writer.WriteNumberValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter)); } } @@ -142,15 +143,13 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J /// public override TestEnumParametersEnumQueryDoubleParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryDoubleParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetDouble().ToString(); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +161,10 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryDoubleParameter? testEnumParametersEnumQueryDoubleParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumQueryDoubleParameter.HasValue ? TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter.Value).ToString() : "null"); + if (testEnumParametersEnumQueryDoubleParameter.HasValue) + writer.WriteNumberValue(TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs index 85149c3f5eb9..cf70b0624f9b 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs @@ -104,15 +104,10 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryIntegerParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -124,7 +119,7 @@ public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonRea /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter, JsonSerializerOptions options) { - writer.WriteStringValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter).ToString()); + writer.WriteNumberValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter)); } } @@ -142,15 +137,13 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : /// public override TestEnumParametersEnumQueryIntegerParameter? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - TestEnumParametersEnumQueryIntegerParameter? result = rawValue == null - ? null - : TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -162,7 +155,10 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : /// public override void Write(Utf8JsonWriter writer, TestEnumParametersEnumQueryIntegerParameter? testEnumParametersEnumQueryIntegerParameter, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersEnumQueryIntegerParameter.HasValue ? TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter.Value).ToString() : "null"); + if (testEnumParametersEnumQueryIntegerParameter.HasValue) + writer.WriteNumberValue(TestEnumParametersEnumQueryIntegerParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryIntegerParameter.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs index 2e81a11c33b2..564a3fc67e09 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs @@ -163,6 +163,9 @@ public class TestEnumParametersRequestEnumFormStringNullableJsonConverter : Json /// public override TestEnumParametersRequestEnumFormString? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersRequestEnumFormString? result = rawValue == null @@ -183,7 +186,10 @@ public class TestEnumParametersRequestEnumFormStringNullableJsonConverter : Json /// public override void Write(Utf8JsonWriter writer, TestEnumParametersRequestEnumFormString? testEnumParametersRequestEnumFormString, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersRequestEnumFormString.HasValue ? TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString.Value).ToString() : "null"); + if (testEnumParametersRequestEnumFormString.HasValue) + writer.WriteStringValue(TestEnumParametersRequestEnumFormStringValueConverter.ToJsonValue(testEnumParametersRequestEnumFormString.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs index 5c00030c30a4..41a116adffd4 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormStringArrayInner.cs @@ -148,6 +148,9 @@ public class TestEnumParametersRequestEnumFormStringArrayInnerNullableJsonConver /// public override TestEnumParametersRequestEnumFormStringArrayInner? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestEnumParametersRequestEnumFormStringArrayInner? result = rawValue == null @@ -168,7 +171,10 @@ public class TestEnumParametersRequestEnumFormStringArrayInnerNullableJsonConver /// public override void Write(Utf8JsonWriter writer, TestEnumParametersRequestEnumFormStringArrayInner? testEnumParametersRequestEnumFormStringArrayInner, JsonSerializerOptions options) { - writer.WriteStringValue(testEnumParametersRequestEnumFormStringArrayInner.HasValue ? TestEnumParametersRequestEnumFormStringArrayInnerValueConverter.ToJsonValue(testEnumParametersRequestEnumFormStringArrayInner.Value).ToString() : "null"); + if (testEnumParametersRequestEnumFormStringArrayInner.HasValue) + writer.WriteStringValue(TestEnumParametersRequestEnumFormStringArrayInnerValueConverter.ToJsonValue(testEnumParametersRequestEnumFormStringArrayInner.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs index 280c9b82cfab..0c6a6e1fb987 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -149,6 +149,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -169,7 +172,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs index 5eb8d6bac71e..f5ef7a380fe4 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZebraType.cs @@ -162,6 +162,9 @@ public class ZebraTypeNullableJsonConverter : JsonConverter /// public override ZebraType? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZebraType? result = rawValue == null @@ -182,7 +185,10 @@ public class ZebraTypeNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZebraType? zebraType, JsonSerializerOptions options) { - writer.WriteStringValue(zebraType.HasValue ? ZebraTypeValueConverter.ToJsonValue(zebraType.Value).ToString() : "null"); + if (zebraType.HasValue) + writer.WriteStringValue(ZebraTypeValueConverter.ToJsonValue(zebraType.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index b82155f7800c..8e6cdad42d28 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs index cb6f10e40b3a..39709c18f566 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/ZeroBasedEnumClassZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter : JsonConverte /// public override ZeroBasedEnumClassZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnumClassZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter : JsonConverte /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnumClassZeroBasedEnum? zeroBasedEnumClassZeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnumClassZeroBasedEnum.HasValue ? ZeroBasedEnumClassZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnumClassZeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnumClassZeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumClassZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnumClassZeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs index 592f6a59c31a..daf0b57af01b 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumClass.cs @@ -164,6 +164,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -184,7 +187,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs index 0476c873cd87..1497d9eca8cd 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -164,6 +164,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -184,7 +187,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index 68faa3cd5de2..7cdb4970271b 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -164,6 +164,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -184,7 +187,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 6ba997e06eb1..7a9b57b3ddd0 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -117,15 +117,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -137,7 +132,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -155,15 +150,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -175,7 +168,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index d8d27e54ee34..b5acfb593af1 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -117,15 +117,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -137,7 +132,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -155,15 +150,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -175,7 +168,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs index 5a1f2a6e439e..b7de72535a4f 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -234,6 +234,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -254,7 +257,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs index f53e8d34214c..418868cd36f7 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -151,6 +151,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -171,7 +174,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index 5434f2b84ea5..d6b37f71c918 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -150,6 +150,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -170,7 +173,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs index cefbf28588fb..b6fbaaf487cf 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs @@ -162,6 +162,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -182,7 +185,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs index e72ea52b0876..8b433c5033b8 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -162,6 +162,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index e2c52f962f32..2d1b5d668e16 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -162,6 +162,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..180eef18894e 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 296151997b01..ad1af6012860 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b4c4e25a9bb2..b4a71547cc1e 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -232,6 +232,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -252,7 +255,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs index 280c9b82cfab..0c6a6e1fb987 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -149,6 +149,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -169,7 +172,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index b82155f7800c..8e6cdad42d28 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs index 6192d15c9f5f..fee0d4a8f728 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumClass.cs @@ -165,6 +165,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -185,7 +188,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs index c2b58fa0eba1..71f82a74a6fb 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -165,6 +165,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -185,7 +188,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index fa6acccc08e7..3afb38ee60c4 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -165,6 +165,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -185,7 +188,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 362553f662a9..a442934bb5b8 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -118,15 +118,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -138,7 +133,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -156,15 +151,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -176,7 +169,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index fba1de8e6f39..a4c6123fc064 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -118,15 +118,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -138,7 +133,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -156,15 +151,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string? rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -176,7 +169,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b8716ad2b25f..a412be9cef62 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -235,6 +235,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -255,7 +258,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs index 029a66af5180..a18f3d7d0f72 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -152,6 +152,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -172,7 +175,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index c553e7d9ef54..95c7d5fa7df6 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -151,6 +151,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string? rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -171,7 +174,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs index cefbf28588fb..b6fbaaf487cf 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumClass.cs @@ -162,6 +162,9 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override EnumClass? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); EnumClass? result = rawValue == null @@ -182,7 +185,10 @@ public class EnumClassNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSerializerOptions options) { - writer.WriteStringValue(enumClass.HasValue ? EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString() : "null"); + if (enumClass.HasValue) + writer.WriteStringValue(EnumClassValueConverter.ToJsonValue(enumClass.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs index e72ea52b0876..8b433c5033b8 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -162,6 +162,9 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override OuterEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnum? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnum.HasValue ? OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString() : "null"); + if (outerEnum.HasValue) + writer.WriteStringValue(OuterEnumValueConverter.ToJsonValue(outerEnum.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs index e2c52f962f32..2d1b5d668e16 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs @@ -162,6 +162,9 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumDefaultValue? result = rawValue == null @@ -182,7 +185,10 @@ public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEnumDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumDefaultValue.HasValue ? OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString() : "null"); + if (outerEnumDefaultValue.HasValue) + writer.WriteStringValue(OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..180eef18894e 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConv /// public override void Write(Utf8JsonWriter writer, OuterEnumInteger outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString()); + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumInteger? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumInteger? result = rawValue == null - ? null - : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInteger, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumInteger.HasValue ? OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value).ToString() : "null"); + if (outerEnumInteger.HasValue) + writer.WriteNumberValue(OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs index 296151997b01..ad1af6012860 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs @@ -115,15 +115,10 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); - + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -135,7 +130,7 @@ public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Typ /// public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString()); + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue)); } } @@ -153,15 +148,13 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetString(); - - OuterEnumIntegerDefaultValue? result = rawValue == null - ? null - : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetInt32().ToString(); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; - throw new JsonException(); } @@ -173,7 +166,10 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue? outerEnumIntegerDefaultValue, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumIntegerDefaultValue.HasValue ? OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value).ToString() : "null"); + if (outerEnumIntegerDefaultValue.HasValue) + writer.WriteNumberValue(OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue.Value)); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs index b4c4e25a9bb2..b4a71547cc1e 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumTest.cs @@ -232,6 +232,9 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override OuterEnumTest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); OuterEnumTest? result = rawValue == null @@ -252,7 +255,10 @@ public class OuterEnumTestNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest, JsonSerializerOptions options) { - writer.WriteStringValue(outerEnumTest.HasValue ? OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString() : "null"); + if (outerEnumTest.HasValue) + writer.WriteStringValue(OuterEnumTestValueConverter.ToJsonValue(outerEnumTest.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs index 280c9b82cfab..0c6a6e1fb987 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestResultCode.cs @@ -149,6 +149,9 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override TestResultCode? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); TestResultCode? result = rawValue == null @@ -169,7 +172,10 @@ public class TestResultCodeNullableJsonConverter : JsonConverter public override void Write(Utf8JsonWriter writer, TestResultCode? testResultCode, JsonSerializerOptions options) { - writer.WriteStringValue(testResultCode.HasValue ? TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString() : "null"); + if (testResultCode.HasValue) + writer.WriteStringValue(TestResultCodeValueConverter.ToJsonValue(testResultCode.Value).ToString()); + else + writer.WriteNullValue(); } } } diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs index b82155f7800c..8e6cdad42d28 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs @@ -148,6 +148,9 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override ZeroBasedEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + if (reader.TokenType == JsonTokenType.Null) + return null; + string rawValue = reader.GetString(); ZeroBasedEnum? result = rawValue == null @@ -168,7 +171,10 @@ public class ZeroBasedEnumNullableJsonConverter : JsonConverter /// public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum, JsonSerializerOptions options) { - writer.WriteStringValue(zeroBasedEnum.HasValue ? ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString() : "null"); + if (zeroBasedEnum.HasValue) + writer.WriteStringValue(ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum.Value).ToString()); + else + writer.WriteNullValue(); } } }