From 29ce4b66660676ab592d93fd8a033524b95f2a31 Mon Sep 17 00:00:00 2001 From: Alex Martossy Date: Sat, 7 Feb 2026 11:12:33 +0100 Subject: [PATCH 1/9] fix(csharp): use numeric JSON operations for integer enum converters in C# generichost Integer enums now correctly use reader.GetInt32()/GetInt64() and writer.WriteNumberValue() instead of reader.GetString() and writer.WriteStringValue() in the generated JsonConverter classes. This fixes System.InvalidOperationException when deserializing integer enum values from JSON numbers. Co-authored-by: copilot-swe-agent[bot] <198982749+copilot@users.noreply.github.com> --- .../generichost/EnumJsonReaderMethod.mustache | 1 + .../main/resources/csharp/modelEnum.mustache | 30 +++++++++++ .../CSharpClientCodegenTest.java | 50 +++++++++++++++++++ .../resources/3_0/csharp/integer-enum.yaml | 37 ++++++++++++++ .../Model/EnumTestEnumInteger.cs | 34 +++++-------- .../Model/EnumTestEnumIntegerOnly.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- ...iredClassRequiredNotnullableEnumInteger.cs | 34 +++++-------- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 34 +++++-------- ...equiredClassRequiredNullableEnumInteger.cs | 34 +++++-------- ...redClassRequiredNullableEnumIntegerOnly.cs | 34 +++++-------- ...tEnumParametersEnumQueryDoubleParameter.cs | 34 +++++-------- ...EnumParametersEnumQueryIntegerParameter.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- .../Model/EnumTestEnumInteger.cs | 34 +++++-------- .../Model/EnumTestEnumIntegerOnly.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- ...iredClassRequiredNotnullableEnumInteger.cs | 34 +++++-------- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 34 +++++-------- ...equiredClassRequiredNullableEnumInteger.cs | 34 +++++-------- ...redClassRequiredNullableEnumIntegerOnly.cs | 34 +++++-------- ...tEnumParametersEnumQueryDoubleParameter.cs | 34 +++++-------- ...EnumParametersEnumQueryIntegerParameter.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- .../Model/EnumTestEnumInteger.cs | 34 +++++-------- .../Model/EnumTestEnumIntegerOnly.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- ...iredClassRequiredNotnullableEnumInteger.cs | 34 +++++-------- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 34 +++++-------- ...equiredClassRequiredNullableEnumInteger.cs | 34 +++++-------- ...redClassRequiredNullableEnumIntegerOnly.cs | 34 +++++-------- ...tEnumParametersEnumQueryDoubleParameter.cs | 34 +++++-------- ...EnumParametersEnumQueryIntegerParameter.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- .../Model/EnumTestEnumInteger.cs | 34 +++++-------- .../Model/EnumTestEnumIntegerOnly.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- ...iredClassRequiredNotnullableEnumInteger.cs | 34 +++++-------- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 34 +++++-------- ...equiredClassRequiredNullableEnumInteger.cs | 34 +++++-------- ...redClassRequiredNullableEnumIntegerOnly.cs | 34 +++++-------- ...tEnumParametersEnumQueryDoubleParameter.cs | 34 +++++-------- ...EnumParametersEnumQueryIntegerParameter.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- .../Model/EnumTestEnumInteger.cs | 34 +++++-------- .../Model/EnumTestEnumIntegerOnly.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- ...iredClassRequiredNotnullableEnumInteger.cs | 34 +++++-------- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 34 +++++-------- ...equiredClassRequiredNullableEnumInteger.cs | 34 +++++-------- ...redClassRequiredNullableEnumIntegerOnly.cs | 34 +++++-------- ...tEnumParametersEnumQueryDoubleParameter.cs | 34 +++++-------- ...EnumParametersEnumQueryIntegerParameter.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- .../Model/OuterEnumInteger.cs | 34 +++++-------- .../Model/OuterEnumIntegerDefaultValue.cs | 34 +++++-------- 78 files changed, 1080 insertions(+), 1554 deletions(-) create mode 100644 modules/openapi-generator/src/main/resources/csharp/libraries/generichost/EnumJsonReaderMethod.mustache create mode 100644 modules/openapi-generator/src/test/resources/3_0/csharp/integer-enum.yaml 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..914b35194a52 100644 --- a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache @@ -121,6 +121,12 @@ /// public override {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + {{^isString}} + {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; + return result; + {{/isString}} + {{#isString}} string{{nrt?}} rawValue = reader.GetString(); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = rawValue == null @@ -131,6 +137,7 @@ return result.Value; throw new JsonException(); + {{/isString}} } /// @@ -141,7 +148,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 +171,15 @@ /// public override {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + {{^isString}} + if (reader.TokenType == JsonTokenType.Null) + return null; + + {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; + return result; + {{/isString}} + {{#isString}} string{{nrt?}} rawValue = reader.GetString(); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = rawValue == null @@ -169,6 +190,7 @@ return result.Value; throw new JsonException(); + {{/isString}} } /// @@ -179,7 +201,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) { + {{^isString}} + if ({{#lambda.camelcase_sanitize_param}}{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{/lambda.camelcase_sanitize_param}}.HasValue) + writer.WriteNumberValue({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.ToJsonValue({{#lambda.camelcase_sanitize_param}}{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{/lambda.camelcase_sanitize_param}}.Value)); + else + writer.WriteNullValue(); + {{/isString}} + {{#isString}} 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"); + {{/isString}} } } {{/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..b980021c48b1 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,54 @@ 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/writer + 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()", + "writer.WriteNumberValue(", + "public static int ToJsonValue(IntegerEnum value)" + ); + assertFileNotContains(intEnumFile.toPath(), + "reader.GetString()", + "writer.WriteStringValue(" + ); + + // Verify long enum uses int64 reader + 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(), + "reader.GetInt64()", + "writer.WriteNumberValue(", + "public static long ToJsonValue(LongEnum value)" + ); + assertFileNotContains(longEnumFile.toPath(), + "reader.GetString()", + "writer.WriteStringValue(" + ); + } } 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..8d860dee82ea --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/csharp/integer-enum.yaml @@ -0,0 +1,37 @@ +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: + - 0 + - 1 + type: integer + format: int64 + x-enum-varnames: + - None + - Some 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..457362a583d8 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..9a23fb65ef12 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..4f7ff2fd6d5e 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -173,7 +162,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..b1dcaf71af0d 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -173,7 +162,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/RequiredClassRequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs index fcdc55074811..d05a1c60d703 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..7f4c46d3ff76 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/RequiredClassRequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs index 97db2037f953..54ce6eeca957 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..a5fb83a44d75 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/TestEnumParametersEnumQueryDoubleParameter.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs index d4d97e76043f..81935c827ca8 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 @@ -104,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + double rawValue = reader.GetDouble(); + TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + double rawValue = reader.GetDouble(); + TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; + return result; } /// @@ -162,7 +151,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..cd3a5371fe68 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; + return result; } /// @@ -162,7 +151,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/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 6ba997e06eb1..5f76847ab04e 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,16 +117,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -137,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)); } } @@ -155,16 +148,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -175,7 +164,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..b2e724486330 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,16 +117,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -137,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)); } } @@ -155,16 +148,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -175,7 +164,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..4f7ff2fd6d5e 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -173,7 +162,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..b1dcaf71af0d 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -173,7 +162,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 362553f662a9..2500ed1682f7 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,16 +118,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -138,7 +131,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,16 +149,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -176,7 +165,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..e15e8abb9246 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,16 +118,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -138,7 +131,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,16 +149,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -176,7 +165,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/EnumTestEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs index 19178ecba280..457362a583d8 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..9a23fb65ef12 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..4f7ff2fd6d5e 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -173,7 +162,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..b1dcaf71af0d 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -173,7 +162,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/RequiredClassRequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs index fcdc55074811..d05a1c60d703 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..7f4c46d3ff76 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/RequiredClassRequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs index 97db2037f953..54ce6eeca957 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..a5fb83a44d75 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/TestEnumParametersEnumQueryDoubleParameter.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs index d4d97e76043f..81935c827ca8 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 @@ -104,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + double rawValue = reader.GetDouble(); + TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + double rawValue = reader.GetDouble(); + TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; + return result; } /// @@ -162,7 +151,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..cd3a5371fe68 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; + return result; } /// @@ -162,7 +151,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/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..4f7ff2fd6d5e 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -173,7 +162,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..b1dcaf71af0d 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -173,7 +162,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/EnumTestEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs index 19178ecba280..457362a583d8 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..9a23fb65ef12 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..4f7ff2fd6d5e 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -173,7 +162,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..b1dcaf71af0d 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -173,7 +162,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/RequiredClassRequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs index fcdc55074811..d05a1c60d703 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..7f4c46d3ff76 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/RequiredClassRequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs index 97db2037f953..54ce6eeca957 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..a5fb83a44d75 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/TestEnumParametersEnumQueryDoubleParameter.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs index d4d97e76043f..81935c827ca8 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 @@ -104,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + double rawValue = reader.GetDouble(); + TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + double rawValue = reader.GetDouble(); + TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; + return result; } /// @@ -162,7 +151,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..cd3a5371fe68 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; + return result; } /// @@ -162,7 +151,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/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..4f7ff2fd6d5e 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -173,7 +162,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..b1dcaf71af0d 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -173,7 +162,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/EnumTestEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs index 19178ecba280..457362a583d8 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..9a23fb65ef12 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..4f7ff2fd6d5e 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -173,7 +162,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..b1dcaf71af0d 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -173,7 +162,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/RequiredClassRequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs index fcdc55074811..d05a1c60d703 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..7f4c46d3ff76 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/RequiredClassRequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs index 97db2037f953..54ce6eeca957 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..a5fb83a44d75 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/TestEnumParametersEnumQueryDoubleParameter.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs index d4d97e76043f..81935c827ca8 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 @@ -104,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + double rawValue = reader.GetDouble(); + TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + double rawValue = reader.GetDouble(); + TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; + return result; } /// @@ -162,7 +151,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..cd3a5371fe68 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; + return result; } /// @@ -162,7 +151,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/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 6ba997e06eb1..5f76847ab04e 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,16 +117,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -137,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)); } } @@ -155,16 +148,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -175,7 +164,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..b2e724486330 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,16 +117,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -137,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)); } } @@ -155,16 +148,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -175,7 +164,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..4f7ff2fd6d5e 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -173,7 +162,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..b1dcaf71af0d 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -173,7 +162,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 362553f662a9..2500ed1682f7 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,16 +118,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -138,7 +131,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,16 +149,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -176,7 +165,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..e15e8abb9246 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,16 +118,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -138,7 +131,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,16 +149,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -176,7 +165,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/EnumTestEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTestEnumInteger.cs index 19178ecba280..457362a583d8 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..9a23fb65ef12 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..4f7ff2fd6d5e 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -173,7 +162,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..b1dcaf71af0d 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -173,7 +162,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/RequiredClassRequiredNotnullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNotnullableEnumInteger.cs index fcdc55074811..d05a1c60d703 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..7f4c46d3ff76 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/RequiredClassRequiredNullableEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClassRequiredNullableEnumInteger.cs index 97db2037f953..54ce6eeca957 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; + return result; } /// @@ -162,7 +151,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..a5fb83a44d75 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; + return result; } /// @@ -162,7 +151,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/TestEnumParametersEnumQueryDoubleParameter.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs index d4d97e76043f..81935c827ca8 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 @@ -104,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + double rawValue = reader.GetDouble(); + TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + double rawValue = reader.GetDouble(); + TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; + return result; } /// @@ -162,7 +151,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..cd3a5371fe68 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,16 +104,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; + return result; } /// @@ -124,7 +117,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,16 +135,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; + return result; } /// @@ -162,7 +151,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/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 6ba997e06eb1..5f76847ab04e 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,16 +117,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -137,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)); } } @@ -155,16 +148,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -175,7 +164,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..b2e724486330 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,16 +117,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -137,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)); } } @@ -155,16 +148,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -175,7 +164,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..4f7ff2fd6d5e 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -173,7 +162,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..b1dcaf71af0d 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -173,7 +162,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index 362553f662a9..2500ed1682f7 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,16 +118,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -138,7 +131,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,16 +149,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -176,7 +165,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..e15e8abb9246 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,16 +118,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -138,7 +131,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,16 +149,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -176,7 +165,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/OuterEnumInteger.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs index e3812cb31983..4f7ff2fd6d5e 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumInteger result = (OuterEnumInteger)rawValue; + return result; } /// @@ -173,7 +162,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..b1dcaf71af0d 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,16 +115,9 @@ 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); - - if (result != null) - return result.Value; - - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -135,7 +128,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,16 +146,12 @@ 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 (result != null) - return result.Value; + if (reader.TokenType == JsonTokenType.Null) + return null; - throw new JsonException(); + int rawValue = reader.GetInt32(); + OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; + return result; } /// @@ -173,7 +162,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(); } } } From 45f833b3bb8c311a70de144e5ccdbfa9f37bf66c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Feb 2026 10:44:28 +0000 Subject: [PATCH 2/9] fix: handle double/float/decimal enums correctly in JSON converters For floating-point enums (double, float, decimal), C# enums can't have non-integral underlying types, so: - ToJsonValue now returns actual enum values via switch-case instead of casting (which gave wrong values like 2.0 instead of -1.2) - Read method uses reader.GetDouble() etc. and converts to string with InvariantCulture for matching via FromStringOrDefault - Write method uses WriteNumberValue with the corrected ToJsonValue Integer enums (int32, int64) still use direct cast as before. Co-authored-by: alexaka1 <22166651+alexaka1@users.noreply.github.com> --- .../main/resources/csharp/modelEnum.mustache | 78 +++++++++++++++++++ .../CSharpClientCodegenTest.java | 19 +++++ .../resources/3_0/csharp/integer-enum.yaml | 6 ++ .../Model/EnumTestEnumInteger.cs | 6 ++ .../Model/EnumTestEnumIntegerOnly.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ ...iredClassRequiredNotnullableEnumInteger.cs | 6 ++ ...ClassRequiredNotnullableEnumIntegerOnly.cs | 6 ++ ...equiredClassRequiredNullableEnumInteger.cs | 6 ++ ...redClassRequiredNullableEnumIntegerOnly.cs | 6 ++ ...tEnumParametersEnumQueryDoubleParameter.cs | 27 +++++-- ...EnumParametersEnumQueryIntegerParameter.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ .../Model/EnumTestEnumInteger.cs | 6 ++ .../Model/EnumTestEnumIntegerOnly.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ ...iredClassRequiredNotnullableEnumInteger.cs | 6 ++ ...ClassRequiredNotnullableEnumIntegerOnly.cs | 6 ++ ...equiredClassRequiredNullableEnumInteger.cs | 6 ++ ...redClassRequiredNullableEnumIntegerOnly.cs | 6 ++ ...tEnumParametersEnumQueryDoubleParameter.cs | 27 +++++-- ...EnumParametersEnumQueryIntegerParameter.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ .../Model/EnumTestEnumInteger.cs | 6 ++ .../Model/EnumTestEnumIntegerOnly.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ ...iredClassRequiredNotnullableEnumInteger.cs | 6 ++ ...ClassRequiredNotnullableEnumIntegerOnly.cs | 6 ++ ...equiredClassRequiredNullableEnumInteger.cs | 6 ++ ...redClassRequiredNullableEnumIntegerOnly.cs | 6 ++ ...tEnumParametersEnumQueryDoubleParameter.cs | 27 +++++-- ...EnumParametersEnumQueryIntegerParameter.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ .../Model/EnumTestEnumInteger.cs | 6 ++ .../Model/EnumTestEnumIntegerOnly.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ ...iredClassRequiredNotnullableEnumInteger.cs | 6 ++ ...ClassRequiredNotnullableEnumIntegerOnly.cs | 6 ++ ...equiredClassRequiredNullableEnumInteger.cs | 6 ++ ...redClassRequiredNullableEnumIntegerOnly.cs | 6 ++ ...tEnumParametersEnumQueryDoubleParameter.cs | 27 +++++-- ...EnumParametersEnumQueryIntegerParameter.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ .../Model/EnumTestEnumInteger.cs | 6 ++ .../Model/EnumTestEnumIntegerOnly.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ ...iredClassRequiredNotnullableEnumInteger.cs | 6 ++ ...ClassRequiredNotnullableEnumIntegerOnly.cs | 6 ++ ...equiredClassRequiredNullableEnumInteger.cs | 6 ++ ...redClassRequiredNullableEnumIntegerOnly.cs | 6 ++ ...tEnumParametersEnumQueryDoubleParameter.cs | 27 +++++-- ...EnumParametersEnumQueryIntegerParameter.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ .../Model/OuterEnumInteger.cs | 6 ++ .../Model/OuterEnumIntegerDefaultValue.cs | 6 ++ 77 files changed, 617 insertions(+), 35 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache index 914b35194a52..6a81c4819c01 100644 --- a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache @@ -91,7 +91,39 @@ {{>visibility}} static {{>EnumValueDataType}} ToJsonValue({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} value) { {{^isString}} + {{^isFloat}}{{^isDouble}}{{^isDecimal}} return ({{>EnumValueDataType}}) value; + {{/isDecimal}}{{/isDouble}}{{/isFloat}} + {{#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}} {{#isString}} {{#allowableValues}} @@ -122,9 +154,32 @@ public override {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { {{^isString}} + {{^isFloat}}{{^isDouble}}{{^isDecimal}} {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; return result; + {{/isDecimal}}{{/isDouble}}{{/isFloat}} + {{#isFloat}} + string rawValue = reader.GetSingle().ToString(System.Globalization.CultureInfo.InvariantCulture); + {{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(System.Globalization.CultureInfo.InvariantCulture); + {{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(System.Globalization.CultureInfo.InvariantCulture); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isDecimal}} {{/isString}} {{#isString}} string{{nrt?}} rawValue = reader.GetString(); @@ -175,9 +230,32 @@ if (reader.TokenType == JsonTokenType.Null) return null; + {{^isFloat}}{{^isDouble}}{{^isDecimal}} {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; return result; + {{/isDecimal}}{{/isDouble}}{{/isFloat}} + {{#isFloat}} + string rawValue = reader.GetSingle().ToString(System.Globalization.CultureInfo.InvariantCulture); + {{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(System.Globalization.CultureInfo.InvariantCulture); + {{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(System.Globalization.CultureInfo.InvariantCulture); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); + {{/isDecimal}} {{/isString}} {{#isString}} string{{nrt?}} rawValue = reader.GetString(); 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 b980021c48b1..975c98a31132 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 @@ -309,5 +309,24 @@ public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOExcepti "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(System.Globalization.CultureInfo.InvariantCulture)", + "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 index 8d860dee82ea..b00980ff2efa 100644 --- 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 @@ -35,3 +35,9 @@ components: x-enum-varnames: - None - Some + DoubleEnum: + enum: + - 1.1 + - -1.2 + type: number + format: double 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 457362a583d8..dddc07886e59 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 @@ -85,7 +85,9 @@ public static EnumTestEnumInteger FromString(string value) /// public static int ToJsonValue(EnumTestEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 9a23fb65ef12..ee9e7de78d6d 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 @@ -85,7 +85,9 @@ public static EnumTestEnumIntegerOnly FromString(string value) /// public static int ToJsonValue(EnumTestEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..e87b8dfcdc4a 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 @@ -96,7 +96,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..638dc86a211a 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 @@ -96,7 +96,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 d05a1c60d703..098627fa6856 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNotnullableEnumInteger FromString(string valu /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; + } /// 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 7f4c46d3ff76..ca60ad61fceb 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNotnullableEnumIntegerOnly FromString(string /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; + } /// 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 54ce6eeca957..485e24c984d9 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNullableEnumInteger FromString(string value) /// public static int ToJsonValue(RequiredClassRequiredNullableEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; + } /// 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 a5fb83a44d75..dd0bd78d52ec 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNullableEnumIntegerOnly FromString(string val /// public static int ToJsonValue(RequiredClassRequiredNullableEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; + } /// 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 81935c827ca8..f56126a81698 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,14 @@ 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,9 +111,12 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - double rawValue = reader.GetDouble(); - TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; - return result; + + string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +148,12 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - double rawValue = reader.GetDouble(); - TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; - return result; + + string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 cd3a5371fe68..5b4de380daa9 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 @@ -85,7 +85,9 @@ public static TestEnumParametersEnumQueryIntegerParameter FromString(string valu /// public static int ToJsonValue(TestEnumParametersEnumQueryIntegerParameter value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; + } /// 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 5f76847ab04e..7512951bcab8 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 @@ -98,7 +98,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -117,9 +119,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -151,9 +155,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b2e724486330..d3c016d5981b 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 @@ -98,7 +98,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -117,9 +119,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -151,9 +155,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..e87b8dfcdc4a 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 @@ -96,7 +96,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..638dc86a211a 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 @@ -96,7 +96,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 2500ed1682f7..122d339f9d48 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 @@ -99,7 +99,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -118,9 +120,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -152,9 +156,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 e15e8abb9246..46a6d0027e7c 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 @@ -99,7 +99,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -118,9 +120,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -152,9 +156,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 457362a583d8..dddc07886e59 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 @@ -85,7 +85,9 @@ public static EnumTestEnumInteger FromString(string value) /// public static int ToJsonValue(EnumTestEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 9a23fb65ef12..ee9e7de78d6d 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 @@ -85,7 +85,9 @@ public static EnumTestEnumIntegerOnly FromString(string value) /// public static int ToJsonValue(EnumTestEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..e87b8dfcdc4a 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 @@ -96,7 +96,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..638dc86a211a 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 @@ -96,7 +96,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 d05a1c60d703..098627fa6856 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNotnullableEnumInteger FromString(string valu /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; + } /// 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 7f4c46d3ff76..ca60ad61fceb 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNotnullableEnumIntegerOnly FromString(string /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; + } /// 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 54ce6eeca957..485e24c984d9 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNullableEnumInteger FromString(string value) /// public static int ToJsonValue(RequiredClassRequiredNullableEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; + } /// 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 a5fb83a44d75..dd0bd78d52ec 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNullableEnumIntegerOnly FromString(string val /// public static int ToJsonValue(RequiredClassRequiredNullableEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; + } /// 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 81935c827ca8..f56126a81698 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,14 @@ 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,9 +111,12 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - double rawValue = reader.GetDouble(); - TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; - return result; + + string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +148,12 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - double rawValue = reader.GetDouble(); - TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; - return result; + + string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 cd3a5371fe68..5b4de380daa9 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 @@ -85,7 +85,9 @@ public static TestEnumParametersEnumQueryIntegerParameter FromString(string valu /// public static int ToJsonValue(TestEnumParametersEnumQueryIntegerParameter value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; + } /// 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 4f7ff2fd6d5e..e87b8dfcdc4a 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 @@ -96,7 +96,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..638dc86a211a 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 @@ -96,7 +96,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 457362a583d8..dddc07886e59 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 @@ -85,7 +85,9 @@ public static EnumTestEnumInteger FromString(string value) /// public static int ToJsonValue(EnumTestEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 9a23fb65ef12..ee9e7de78d6d 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 @@ -85,7 +85,9 @@ public static EnumTestEnumIntegerOnly FromString(string value) /// public static int ToJsonValue(EnumTestEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..e87b8dfcdc4a 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 @@ -96,7 +96,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..638dc86a211a 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 @@ -96,7 +96,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 d05a1c60d703..098627fa6856 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNotnullableEnumInteger FromString(string valu /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; + } /// 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 7f4c46d3ff76..ca60ad61fceb 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNotnullableEnumIntegerOnly FromString(string /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; + } /// 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 54ce6eeca957..485e24c984d9 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNullableEnumInteger FromString(string value) /// public static int ToJsonValue(RequiredClassRequiredNullableEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; + } /// 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 a5fb83a44d75..dd0bd78d52ec 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNullableEnumIntegerOnly FromString(string val /// public static int ToJsonValue(RequiredClassRequiredNullableEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; + } /// 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 81935c827ca8..f56126a81698 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,14 @@ 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,9 +111,12 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - double rawValue = reader.GetDouble(); - TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; - return result; + + string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +148,12 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - double rawValue = reader.GetDouble(); - TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; - return result; + + string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 cd3a5371fe68..5b4de380daa9 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 @@ -85,7 +85,9 @@ public static TestEnumParametersEnumQueryIntegerParameter FromString(string valu /// public static int ToJsonValue(TestEnumParametersEnumQueryIntegerParameter value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; + } /// 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 4f7ff2fd6d5e..e87b8dfcdc4a 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 @@ -96,7 +96,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..638dc86a211a 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 @@ -96,7 +96,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 457362a583d8..dddc07886e59 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 @@ -85,7 +85,9 @@ public static EnumTestEnumInteger FromString(string value) /// public static int ToJsonValue(EnumTestEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 9a23fb65ef12..ee9e7de78d6d 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 @@ -85,7 +85,9 @@ public static EnumTestEnumIntegerOnly FromString(string value) /// public static int ToJsonValue(EnumTestEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..e87b8dfcdc4a 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 @@ -96,7 +96,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..638dc86a211a 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 @@ -96,7 +96,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 d05a1c60d703..098627fa6856 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNotnullableEnumInteger FromString(string valu /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; + } /// 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 7f4c46d3ff76..ca60ad61fceb 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNotnullableEnumIntegerOnly FromString(string /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; + } /// 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 54ce6eeca957..485e24c984d9 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNullableEnumInteger FromString(string value) /// public static int ToJsonValue(RequiredClassRequiredNullableEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; + } /// 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 a5fb83a44d75..dd0bd78d52ec 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNullableEnumIntegerOnly FromString(string val /// public static int ToJsonValue(RequiredClassRequiredNullableEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; + } /// 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 81935c827ca8..f56126a81698 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,14 @@ 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,9 +111,12 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - double rawValue = reader.GetDouble(); - TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; - return result; + + string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +148,12 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - double rawValue = reader.GetDouble(); - TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; - return result; + + string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 cd3a5371fe68..5b4de380daa9 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 @@ -85,7 +85,9 @@ public static TestEnumParametersEnumQueryIntegerParameter FromString(string valu /// public static int ToJsonValue(TestEnumParametersEnumQueryIntegerParameter value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; + } /// 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 5f76847ab04e..7512951bcab8 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 @@ -98,7 +98,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -117,9 +119,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -151,9 +155,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b2e724486330..d3c016d5981b 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 @@ -98,7 +98,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -117,9 +119,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -151,9 +155,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..e87b8dfcdc4a 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 @@ -96,7 +96,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..638dc86a211a 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 @@ -96,7 +96,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 2500ed1682f7..122d339f9d48 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 @@ -99,7 +99,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -118,9 +120,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -152,9 +156,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 e15e8abb9246..46a6d0027e7c 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 @@ -99,7 +99,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -118,9 +120,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -152,9 +156,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 457362a583d8..dddc07886e59 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 @@ -85,7 +85,9 @@ public static EnumTestEnumInteger FromString(string value) /// public static int ToJsonValue(EnumTestEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 9a23fb65ef12..ee9e7de78d6d 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 @@ -85,7 +85,9 @@ public static EnumTestEnumIntegerOnly FromString(string value) /// public static int ToJsonValue(EnumTestEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..e87b8dfcdc4a 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 @@ -96,7 +96,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..638dc86a211a 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 @@ -96,7 +96,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 d05a1c60d703..098627fa6856 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNotnullableEnumInteger FromString(string valu /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; + } /// 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 7f4c46d3ff76..ca60ad61fceb 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNotnullableEnumIntegerOnly FromString(string /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; + } /// 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 54ce6eeca957..485e24c984d9 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNullableEnumInteger FromString(string value) /// public static int ToJsonValue(RequiredClassRequiredNullableEnumInteger value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; + } /// 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 a5fb83a44d75..dd0bd78d52ec 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 @@ -85,7 +85,9 @@ public static RequiredClassRequiredNullableEnumIntegerOnly FromString(string val /// public static int ToJsonValue(RequiredClassRequiredNullableEnumIntegerOnly value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; + } /// 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 81935c827ca8..f56126a81698 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,14 @@ 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,9 +111,12 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - double rawValue = reader.GetDouble(); - TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; - return result; + + string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +148,12 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - double rawValue = reader.GetDouble(); - TestEnumParametersEnumQueryDoubleParameter result = (TestEnumParametersEnumQueryDoubleParameter)rawValue; - return result; + + string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 cd3a5371fe68..5b4de380daa9 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 @@ -85,7 +85,9 @@ public static TestEnumParametersEnumQueryIntegerParameter FromString(string valu /// public static int ToJsonValue(TestEnumParametersEnumQueryIntegerParameter value) { + return (int) value; + } } @@ -104,9 +106,11 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; + } /// @@ -138,9 +142,11 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; + int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; + } /// 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 5f76847ab04e..7512951bcab8 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 @@ -98,7 +98,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -117,9 +119,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -151,9 +155,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b2e724486330..d3c016d5981b 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 @@ -98,7 +98,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -117,9 +119,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -151,9 +155,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..e87b8dfcdc4a 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 @@ -96,7 +96,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..638dc86a211a 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 @@ -96,7 +96,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 2500ed1682f7..122d339f9d48 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 @@ -99,7 +99,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -118,9 +120,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -152,9 +156,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 e15e8abb9246..46a6d0027e7c 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 @@ -99,7 +99,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -118,9 +120,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -152,9 +156,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..e87b8dfcdc4a 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 @@ -96,7 +96,9 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..638dc86a211a 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 @@ -96,7 +96,9 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { + return (int) value; + } } @@ -115,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { + int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; + } /// @@ -149,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter From b672dfd148cb51866dd3a9cfedd9d980d1144993 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Feb 2026 11:08:52 +0000 Subject: [PATCH 3/9] test: use actual int64 values for LongEnum test spec Use 2147483648 (int32 max + 1) and 9223372036854775807 (int64 max) to ensure the int64 branch is properly exercised with values that exceed int32 range. Co-authored-by: alexaka1 <22166651+alexaka1@users.noreply.github.com> --- .../codegen/csharpnetcore/CSharpClientCodegenTest.java | 6 ++++-- .../src/test/resources/3_0/csharp/integer-enum.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) 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 975c98a31132..c75c9a885dab 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 @@ -294,7 +294,7 @@ public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOExcepti "writer.WriteStringValue(" ); - // Verify long enum uses int64 reader + // Verify long enum uses int64 reader with actual int64 values File longEnumFile = files.get(Paths .get(output.getAbsolutePath(), "src", "Org.OpenAPITools", "Model", "LongEnum.cs") .toString() @@ -303,7 +303,9 @@ public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOExcepti assertFileContains(longEnumFile.toPath(), "reader.GetInt64()", "writer.WriteNumberValue(", - "public static long ToJsonValue(LongEnum value)" + "public static long ToJsonValue(LongEnum value)", + "AboveInt32Max = 2147483648", + "Int64Max = 9223372036854775807" ); assertFileNotContains(longEnumFile.toPath(), "reader.GetString()", 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 index b00980ff2efa..5e494049f5bd 100644 --- 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 @@ -28,13 +28,13 @@ components: - Some LongEnum: enum: - - 0 - - 1 + - 2147483648 + - 9223372036854775807 type: integer format: int64 x-enum-varnames: - - None - - Some + - AboveInt32Max + - Int64Max DoubleEnum: enum: - 1.1 From 6932a2228d151ab42baaf737a3e96c4c21f79de6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Feb 2026 11:21:18 +0000 Subject: [PATCH 4/9] fix: eliminate extra blank lines in generated enum converters Replace triple-negation pattern ({{^isFloat}}{{^isDouble}}{{^isDecimal}}) with positive flags ({{#isInteger}}, {{#isLong}}) for integer enum branches. The triple-negation caused the Java Mustache engine to produce spurious blank lines and incorrect indentation in the generated C# code. Co-authored-by: alexaka1 <22166651+alexaka1@users.noreply.github.com> --- .../main/resources/csharp/modelEnum.mustache | 31 ++++++++++++------- .../Model/EnumTestEnumInteger.cs | 6 ---- .../Model/EnumTestEnumIntegerOnly.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- ...iredClassRequiredNotnullableEnumInteger.cs | 6 ---- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 6 ---- ...equiredClassRequiredNullableEnumInteger.cs | 6 ---- ...redClassRequiredNullableEnumIntegerOnly.cs | 6 ---- ...tEnumParametersEnumQueryDoubleParameter.cs | 3 -- ...EnumParametersEnumQueryIntegerParameter.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- .../Model/EnumTestEnumInteger.cs | 6 ---- .../Model/EnumTestEnumIntegerOnly.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- ...iredClassRequiredNotnullableEnumInteger.cs | 6 ---- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 6 ---- ...equiredClassRequiredNullableEnumInteger.cs | 6 ---- ...redClassRequiredNullableEnumIntegerOnly.cs | 6 ---- ...tEnumParametersEnumQueryDoubleParameter.cs | 3 -- ...EnumParametersEnumQueryIntegerParameter.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- .../Model/EnumTestEnumInteger.cs | 6 ---- .../Model/EnumTestEnumIntegerOnly.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- ...iredClassRequiredNotnullableEnumInteger.cs | 6 ---- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 6 ---- ...equiredClassRequiredNullableEnumInteger.cs | 6 ---- ...redClassRequiredNullableEnumIntegerOnly.cs | 6 ---- ...tEnumParametersEnumQueryDoubleParameter.cs | 3 -- ...EnumParametersEnumQueryIntegerParameter.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- .../Model/EnumTestEnumInteger.cs | 6 ---- .../Model/EnumTestEnumIntegerOnly.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- ...iredClassRequiredNotnullableEnumInteger.cs | 6 ---- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 6 ---- ...equiredClassRequiredNullableEnumInteger.cs | 6 ---- ...redClassRequiredNullableEnumIntegerOnly.cs | 6 ---- ...tEnumParametersEnumQueryDoubleParameter.cs | 3 -- ...EnumParametersEnumQueryIntegerParameter.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- .../Model/EnumTestEnumInteger.cs | 6 ---- .../Model/EnumTestEnumIntegerOnly.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- ...iredClassRequiredNotnullableEnumInteger.cs | 6 ---- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 6 ---- ...equiredClassRequiredNullableEnumInteger.cs | 6 ---- ...redClassRequiredNullableEnumIntegerOnly.cs | 6 ---- ...tEnumParametersEnumQueryDoubleParameter.cs | 3 -- ...EnumParametersEnumQueryIntegerParameter.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- .../Model/OuterEnumInteger.cs | 6 ---- .../Model/OuterEnumIntegerDefaultValue.cs | 6 ---- 75 files changed, 20 insertions(+), 440 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache index 6a81c4819c01..759a37b1425a 100644 --- a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache @@ -90,10 +90,12 @@ /// {{>visibility}} static {{>EnumValueDataType}} ToJsonValue({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} value) { - {{^isString}} - {{^isFloat}}{{^isDouble}}{{^isDecimal}} + {{#isInteger}} + return ({{>EnumValueDataType}}) value; + {{/isInteger}} + {{#isLong}} return ({{>EnumValueDataType}}) value; - {{/isDecimal}}{{/isDouble}}{{/isFloat}} + {{/isLong}} {{#isFloat}} {{#allowableValues}} {{#enumVars}} @@ -124,7 +126,6 @@ {{/allowableValues}} throw new NotImplementedException($"Value could not be handled: '{value}'"); {{/isDecimal}} - {{/isString}} {{#isString}} {{#allowableValues}} {{#enumVars}} @@ -153,12 +154,16 @@ /// public override {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - {{^isString}} - {{^isFloat}}{{^isDouble}}{{^isDecimal}} + {{#isInteger}} + {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; + return result; + {{/isInteger}} + {{#isLong}} {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; return result; - {{/isDecimal}}{{/isDouble}}{{/isFloat}} + {{/isLong}} {{#isFloat}} string rawValue = reader.GetSingle().ToString(System.Globalization.CultureInfo.InvariantCulture); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); @@ -180,7 +185,6 @@ return result.Value; throw new JsonException(); {{/isDecimal}} - {{/isString}} {{#isString}} string{{nrt?}} rawValue = reader.GetString(); @@ -230,11 +234,17 @@ if (reader.TokenType == JsonTokenType.Null) return null; - {{^isFloat}}{{^isDouble}}{{^isDecimal}} + {{/isString}} + {{#isInteger}} + {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; + return result; + {{/isInteger}} + {{#isLong}} {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; return result; - {{/isDecimal}}{{/isDouble}}{{/isFloat}} + {{/isLong}} {{#isFloat}} string rawValue = reader.GetSingle().ToString(System.Globalization.CultureInfo.InvariantCulture); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); @@ -256,7 +266,6 @@ return result.Value; throw new JsonException(); {{/isDecimal}} - {{/isString}} {{#isString}} string{{nrt?}} rawValue = reader.GetString(); 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 dddc07886e59..457362a583d8 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 @@ -85,9 +85,7 @@ public static EnumTestEnumInteger FromString(string value) /// public static int ToJsonValue(EnumTestEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 ee9e7de78d6d..9a23fb65ef12 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 @@ -85,9 +85,7 @@ public static EnumTestEnumIntegerOnly FromString(string value) /// public static int ToJsonValue(EnumTestEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 e87b8dfcdc4a..4f7ff2fd6d5e 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 @@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 638dc86a211a..b1dcaf71af0d 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 @@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 098627fa6856..d05a1c60d703 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumInteger FromString(string valu /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; - } /// 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 ca60ad61fceb..7f4c46d3ff76 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumIntegerOnly FromString(string /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; - } /// 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 485e24c984d9..54ce6eeca957 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumInteger FromString(string value) /// public static int ToJsonValue(RequiredClassRequiredNullableEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; - } /// 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 dd0bd78d52ec..a5fb83a44d75 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumIntegerOnly FromString(string val /// public static int ToJsonValue(RequiredClassRequiredNullableEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; - } /// 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 f56126a81698..e653ebbb9a96 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,6 @@ public static TestEnumParametersEnumQueryDoubleParameter FromString(string value /// public static double ToJsonValue(TestEnumParametersEnumQueryDoubleParameter value) { - if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_1_DOT_1) return 1.1d; @@ -111,7 +110,6 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) @@ -148,7 +146,6 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) 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 5b4de380daa9..cd3a5371fe68 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 @@ -85,9 +85,7 @@ public static TestEnumParametersEnumQueryIntegerParameter FromString(string valu /// public static int ToJsonValue(TestEnumParametersEnumQueryIntegerParameter value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; - } /// 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 7512951bcab8..5f76847ab04e 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 @@ -98,9 +98,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -119,11 +117,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -155,11 +151,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 d3c016d5981b..b2e724486330 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 @@ -98,9 +98,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -119,11 +117,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -155,11 +151,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 e87b8dfcdc4a..4f7ff2fd6d5e 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 @@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 638dc86a211a..b1dcaf71af0d 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 @@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 122d339f9d48..2500ed1682f7 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 @@ -99,9 +99,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -120,11 +118,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -156,11 +152,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 46a6d0027e7c..e15e8abb9246 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 @@ -99,9 +99,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -120,11 +118,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -156,11 +152,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 dddc07886e59..457362a583d8 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 @@ -85,9 +85,7 @@ public static EnumTestEnumInteger FromString(string value) /// public static int ToJsonValue(EnumTestEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 ee9e7de78d6d..9a23fb65ef12 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 @@ -85,9 +85,7 @@ public static EnumTestEnumIntegerOnly FromString(string value) /// public static int ToJsonValue(EnumTestEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 e87b8dfcdc4a..4f7ff2fd6d5e 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 @@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 638dc86a211a..b1dcaf71af0d 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 @@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 098627fa6856..d05a1c60d703 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumInteger FromString(string valu /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; - } /// 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 ca60ad61fceb..7f4c46d3ff76 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumIntegerOnly FromString(string /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; - } /// 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 485e24c984d9..54ce6eeca957 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumInteger FromString(string value) /// public static int ToJsonValue(RequiredClassRequiredNullableEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; - } /// 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 dd0bd78d52ec..a5fb83a44d75 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumIntegerOnly FromString(string val /// public static int ToJsonValue(RequiredClassRequiredNullableEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; - } /// 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 f56126a81698..e653ebbb9a96 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,6 @@ public static TestEnumParametersEnumQueryDoubleParameter FromString(string value /// public static double ToJsonValue(TestEnumParametersEnumQueryDoubleParameter value) { - if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_1_DOT_1) return 1.1d; @@ -111,7 +110,6 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) @@ -148,7 +146,6 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) 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 5b4de380daa9..cd3a5371fe68 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 @@ -85,9 +85,7 @@ public static TestEnumParametersEnumQueryIntegerParameter FromString(string valu /// public static int ToJsonValue(TestEnumParametersEnumQueryIntegerParameter value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; - } /// 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 e87b8dfcdc4a..4f7ff2fd6d5e 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 @@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 638dc86a211a..b1dcaf71af0d 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 @@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 dddc07886e59..457362a583d8 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 @@ -85,9 +85,7 @@ public static EnumTestEnumInteger FromString(string value) /// public static int ToJsonValue(EnumTestEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 ee9e7de78d6d..9a23fb65ef12 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 @@ -85,9 +85,7 @@ public static EnumTestEnumIntegerOnly FromString(string value) /// public static int ToJsonValue(EnumTestEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 e87b8dfcdc4a..4f7ff2fd6d5e 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 @@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 638dc86a211a..b1dcaf71af0d 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 @@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 098627fa6856..d05a1c60d703 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumInteger FromString(string valu /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; - } /// 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 ca60ad61fceb..7f4c46d3ff76 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumIntegerOnly FromString(string /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; - } /// 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 485e24c984d9..54ce6eeca957 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumInteger FromString(string value) /// public static int ToJsonValue(RequiredClassRequiredNullableEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; - } /// 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 dd0bd78d52ec..a5fb83a44d75 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumIntegerOnly FromString(string val /// public static int ToJsonValue(RequiredClassRequiredNullableEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; - } /// 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 f56126a81698..e653ebbb9a96 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,6 @@ public static TestEnumParametersEnumQueryDoubleParameter FromString(string value /// public static double ToJsonValue(TestEnumParametersEnumQueryDoubleParameter value) { - if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_1_DOT_1) return 1.1d; @@ -111,7 +110,6 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) @@ -148,7 +146,6 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) 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 5b4de380daa9..cd3a5371fe68 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 @@ -85,9 +85,7 @@ public static TestEnumParametersEnumQueryIntegerParameter FromString(string valu /// public static int ToJsonValue(TestEnumParametersEnumQueryIntegerParameter value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; - } /// 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 e87b8dfcdc4a..4f7ff2fd6d5e 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 @@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 638dc86a211a..b1dcaf71af0d 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 @@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 dddc07886e59..457362a583d8 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 @@ -85,9 +85,7 @@ public static EnumTestEnumInteger FromString(string value) /// public static int ToJsonValue(EnumTestEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 ee9e7de78d6d..9a23fb65ef12 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 @@ -85,9 +85,7 @@ public static EnumTestEnumIntegerOnly FromString(string value) /// public static int ToJsonValue(EnumTestEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 e87b8dfcdc4a..4f7ff2fd6d5e 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 @@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 638dc86a211a..b1dcaf71af0d 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 @@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 098627fa6856..d05a1c60d703 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumInteger FromString(string valu /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; - } /// 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 ca60ad61fceb..7f4c46d3ff76 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumIntegerOnly FromString(string /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; - } /// 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 485e24c984d9..54ce6eeca957 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumInteger FromString(string value) /// public static int ToJsonValue(RequiredClassRequiredNullableEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; - } /// 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 dd0bd78d52ec..a5fb83a44d75 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumIntegerOnly FromString(string val /// public static int ToJsonValue(RequiredClassRequiredNullableEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; - } /// 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 f56126a81698..e653ebbb9a96 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,6 @@ public static TestEnumParametersEnumQueryDoubleParameter FromString(string value /// public static double ToJsonValue(TestEnumParametersEnumQueryDoubleParameter value) { - if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_1_DOT_1) return 1.1d; @@ -111,7 +110,6 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) @@ -148,7 +146,6 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) 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 5b4de380daa9..cd3a5371fe68 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 @@ -85,9 +85,7 @@ public static TestEnumParametersEnumQueryIntegerParameter FromString(string valu /// public static int ToJsonValue(TestEnumParametersEnumQueryIntegerParameter value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; - } /// 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 7512951bcab8..5f76847ab04e 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 @@ -98,9 +98,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -119,11 +117,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -155,11 +151,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 d3c016d5981b..b2e724486330 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 @@ -98,9 +98,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -119,11 +117,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -155,11 +151,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 e87b8dfcdc4a..4f7ff2fd6d5e 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 @@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 638dc86a211a..b1dcaf71af0d 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 @@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 122d339f9d48..2500ed1682f7 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 @@ -99,9 +99,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -120,11 +118,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -156,11 +152,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 46a6d0027e7c..e15e8abb9246 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 @@ -99,9 +99,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -120,11 +118,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -156,11 +152,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 dddc07886e59..457362a583d8 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 @@ -85,9 +85,7 @@ public static EnumTestEnumInteger FromString(string value) /// public static int ToJsonValue(EnumTestEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 ee9e7de78d6d..9a23fb65ef12 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 @@ -85,9 +85,7 @@ public static EnumTestEnumIntegerOnly FromString(string value) /// public static int ToJsonValue(EnumTestEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 e87b8dfcdc4a..4f7ff2fd6d5e 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 @@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 638dc86a211a..b1dcaf71af0d 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 @@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 098627fa6856..d05a1c60d703 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumInteger FromString(string valu /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; return result; - } /// 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 ca60ad61fceb..7f4c46d3ff76 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNotnullableEnumIntegerOnly FromString(string /// public static int ToJsonValue(RequiredClassRequiredNotnullableEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; return result; - } /// 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 485e24c984d9..54ce6eeca957 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumInteger FromString(string value) /// public static int ToJsonValue(RequiredClassRequiredNullableEnumInteger value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; return result; - } /// 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 dd0bd78d52ec..a5fb83a44d75 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 @@ -85,9 +85,7 @@ public static RequiredClassRequiredNullableEnumIntegerOnly FromString(string val /// public static int ToJsonValue(RequiredClassRequiredNullableEnumIntegerOnly value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; return result; - } /// 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 f56126a81698..e653ebbb9a96 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,6 @@ public static TestEnumParametersEnumQueryDoubleParameter FromString(string value /// public static double ToJsonValue(TestEnumParametersEnumQueryDoubleParameter value) { - if (value == TestEnumParametersEnumQueryDoubleParameter.NUMBER_1_DOT_1) return 1.1d; @@ -111,7 +110,6 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) @@ -148,7 +146,6 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) 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 5b4de380daa9..cd3a5371fe68 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 @@ -85,9 +85,7 @@ public static TestEnumParametersEnumQueryIntegerParameter FromString(string valu /// public static int ToJsonValue(TestEnumParametersEnumQueryIntegerParameter value) { - return (int) value; - } } @@ -106,11 +104,9 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; - } /// @@ -142,11 +138,9 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; return result; - } /// 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 7512951bcab8..5f76847ab04e 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 @@ -98,9 +98,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -119,11 +117,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -155,11 +151,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 d3c016d5981b..b2e724486330 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 @@ -98,9 +98,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -119,11 +117,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -155,11 +151,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 e87b8dfcdc4a..4f7ff2fd6d5e 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 @@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 638dc86a211a..b1dcaf71af0d 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 @@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 122d339f9d48..2500ed1682f7 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 @@ -99,9 +99,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -120,11 +118,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -156,11 +152,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 46a6d0027e7c..e15e8abb9246 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 @@ -99,9 +99,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -120,11 +118,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -156,11 +152,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 e87b8dfcdc4a..4f7ff2fd6d5e 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 @@ -96,9 +96,7 @@ public static OuterEnumInteger FromString(string value) /// public static int ToJsonValue(OuterEnumInteger value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumInteger result = (OuterEnumInteger)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 638dc86a211a..b1dcaf71af0d 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 @@ -96,9 +96,7 @@ public static OuterEnumIntegerDefaultValue FromString(string value) /// public static int ToJsonValue(OuterEnumIntegerDefaultValue value) { - return (int) value; - } } @@ -117,11 +115,9 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; return result; - } /// @@ -153,11 +149,9 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter From 5233c7cb3446e0e6a033b9063c5464b4401a41e3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Feb 2026 13:04:11 +0000 Subject: [PATCH 5/9] fix: validate integer/long enum values during deserialization Use FromStringOrDefault for all numeric enum types (int, long, float, double, decimal), not just float/double/decimal. This ensures invalid values throw JsonException instead of being silently cast to the enum. Co-authored-by: alexaka1 <22166651+alexaka1@users.noreply.github.com> --- .../main/resources/csharp/modelEnum.mustache | 32 ++++++++++++------- .../CSharpClientCodegenTest.java | 12 ++++--- .../Model/EnumTestEnumInteger.cs | 16 ++++++---- .../Model/EnumTestEnumIntegerOnly.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- ...iredClassRequiredNotnullableEnumInteger.cs | 16 ++++++---- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 16 ++++++---- ...equiredClassRequiredNullableEnumInteger.cs | 16 ++++++---- ...redClassRequiredNullableEnumIntegerOnly.cs | 16 ++++++---- ...EnumParametersEnumQueryIntegerParameter.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- .../Model/EnumTestEnumInteger.cs | 16 ++++++---- .../Model/EnumTestEnumIntegerOnly.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- ...iredClassRequiredNotnullableEnumInteger.cs | 16 ++++++---- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 16 ++++++---- ...equiredClassRequiredNullableEnumInteger.cs | 16 ++++++---- ...redClassRequiredNullableEnumIntegerOnly.cs | 16 ++++++---- ...EnumParametersEnumQueryIntegerParameter.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- .../Model/EnumTestEnumInteger.cs | 16 ++++++---- .../Model/EnumTestEnumIntegerOnly.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- ...iredClassRequiredNotnullableEnumInteger.cs | 16 ++++++---- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 16 ++++++---- ...equiredClassRequiredNullableEnumInteger.cs | 16 ++++++---- ...redClassRequiredNullableEnumIntegerOnly.cs | 16 ++++++---- ...EnumParametersEnumQueryIntegerParameter.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- .../Model/EnumTestEnumInteger.cs | 16 ++++++---- .../Model/EnumTestEnumIntegerOnly.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- ...iredClassRequiredNotnullableEnumInteger.cs | 16 ++++++---- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 16 ++++++---- ...equiredClassRequiredNullableEnumInteger.cs | 16 ++++++---- ...redClassRequiredNullableEnumIntegerOnly.cs | 16 ++++++---- ...EnumParametersEnumQueryIntegerParameter.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- .../Model/EnumTestEnumInteger.cs | 16 ++++++---- .../Model/EnumTestEnumIntegerOnly.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- ...iredClassRequiredNotnullableEnumInteger.cs | 16 ++++++---- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 16 ++++++---- ...equiredClassRequiredNullableEnumInteger.cs | 16 ++++++---- ...redClassRequiredNullableEnumIntegerOnly.cs | 16 ++++++---- ...EnumParametersEnumQueryIntegerParameter.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- .../Model/OuterEnumInteger.cs | 16 ++++++---- .../Model/OuterEnumIntegerDefaultValue.cs | 16 ++++++---- 71 files changed, 718 insertions(+), 430 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache index 759a37b1425a..13596727ad3b 100644 --- a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache @@ -155,14 +155,18 @@ public override {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { {{#isInteger}} - {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); - {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; - return result; + string rawValue = reader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); {{/isInteger}} {{#isLong}} - {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); - {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; - return result; + string rawValue = reader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); + {{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(System.Globalization.CultureInfo.InvariantCulture); @@ -236,14 +240,18 @@ {{/isString}} {{#isInteger}} - {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); - {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; - return result; + string rawValue = reader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); + {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); {{/isInteger}} {{#isLong}} - {{>EnumValueDataType}} rawValue = reader.{{>EnumJsonReaderMethod}}(); - {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} result = ({{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}})rawValue; - return result; + string rawValue = reader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); + {{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(System.Globalization.CultureInfo.InvariantCulture); 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 c75c9a885dab..cef64cb11c59 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 @@ -278,14 +278,16 @@ public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOExcepti Map files = defaultGenerator.generate().stream() .collect(Collectors.toMap(File::getPath, Function.identity())); - // Verify integer enum uses numeric JSON reader/writer + // 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()", + "reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture)", + "FromStringOrDefault(rawValue)", + "throw new JsonException()", "writer.WriteNumberValue(", "public static int ToJsonValue(IntegerEnum value)" ); @@ -294,14 +296,16 @@ public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOExcepti "writer.WriteStringValue(" ); - // Verify long enum uses int64 reader with actual int64 values + // 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(), - "reader.GetInt64()", + "reader.GetInt64().ToString(System.Globalization.CultureInfo.InvariantCulture)", + "FromStringOrDefault(rawValue)", + "throw new JsonException()", "writer.WriteNumberValue(", "public static long ToJsonValue(LongEnum value)", "AboveInt32Max = 2147483648", 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 457362a583d8..abca77faf22c 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,9 +104,11 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 9a23fb65ef12..6ee4b0f76901 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,9 +104,11 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..d053ca4aa498 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,9 +115,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..f34dfc63fcb4 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,9 +115,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 d05a1c60d703..c009b72994c6 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,9 +104,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 7f4c46d3ff76..17aacbd808db 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,9 +104,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 54ce6eeca957..c12e580bf6d7 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,9 +104,11 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 a5fb83a44d75..b8499f859780 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,9 +104,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 cd3a5371fe68..adcffcd89b33 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,9 +104,11 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 5f76847ab04e..54253625d551 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,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -151,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b2e724486330..03468ea7ef07 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,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -151,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..d053ca4aa498 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,9 +115,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..f34dfc63fcb4 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,9 +115,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 2500ed1682f7..0f7f2ab262a2 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,9 +118,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -152,9 +154,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 e15e8abb9246..f6850d5bcdf8 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,9 +118,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -152,9 +154,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 457362a583d8..abca77faf22c 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,9 +104,11 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 9a23fb65ef12..6ee4b0f76901 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,9 +104,11 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..d053ca4aa498 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,9 +115,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..f34dfc63fcb4 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,9 +115,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 d05a1c60d703..c009b72994c6 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,9 +104,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 7f4c46d3ff76..17aacbd808db 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,9 +104,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 54ce6eeca957..c12e580bf6d7 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,9 +104,11 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 a5fb83a44d75..b8499f859780 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,9 +104,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 cd3a5371fe68..adcffcd89b33 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,9 +104,11 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 4f7ff2fd6d5e..d053ca4aa498 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,9 +115,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..f34dfc63fcb4 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,9 +115,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 457362a583d8..abca77faf22c 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,9 +104,11 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 9a23fb65ef12..6ee4b0f76901 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,9 +104,11 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..d053ca4aa498 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,9 +115,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..f34dfc63fcb4 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,9 +115,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 d05a1c60d703..c009b72994c6 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,9 +104,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 7f4c46d3ff76..17aacbd808db 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,9 +104,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 54ce6eeca957..c12e580bf6d7 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,9 +104,11 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 a5fb83a44d75..b8499f859780 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,9 +104,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 cd3a5371fe68..adcffcd89b33 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,9 +104,11 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 4f7ff2fd6d5e..d053ca4aa498 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,9 +115,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..f34dfc63fcb4 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,9 +115,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 457362a583d8..abca77faf22c 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,9 +104,11 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 9a23fb65ef12..6ee4b0f76901 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,9 +104,11 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..d053ca4aa498 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,9 +115,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..f34dfc63fcb4 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,9 +115,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 d05a1c60d703..c009b72994c6 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,9 +104,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 7f4c46d3ff76..17aacbd808db 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,9 +104,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 54ce6eeca957..c12e580bf6d7 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,9 +104,11 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 a5fb83a44d75..b8499f859780 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,9 +104,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 cd3a5371fe68..adcffcd89b33 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,9 +104,11 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 5f76847ab04e..54253625d551 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,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -151,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b2e724486330..03468ea7ef07 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,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -151,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..d053ca4aa498 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,9 +115,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..f34dfc63fcb4 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,9 +115,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 2500ed1682f7..0f7f2ab262a2 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,9 +118,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -152,9 +154,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 e15e8abb9246..f6850d5bcdf8 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,9 +118,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -152,9 +154,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 457362a583d8..abca77faf22c 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,9 +104,11 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - EnumTestEnumInteger result = (EnumTestEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter 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 9a23fb65ef12..6ee4b0f76901 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,9 +104,11 @@ public class EnumTestEnumIntegerOnlyJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - EnumTestEnumIntegerOnly result = (EnumTestEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..d053ca4aa498 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,9 +115,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..f34dfc63fcb4 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,9 +115,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 d05a1c60d703..c009b72994c6 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,9 +104,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerJsonConverter : JsonConv /// public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumInteger result = (RequiredClassRequiredNotnullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 7f4c46d3ff76..17aacbd808db 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,9 +104,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNotnullableEnumIntegerOnly result = (RequiredClassRequiredNotnullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 54ce6eeca957..c12e580bf6d7 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,9 +104,11 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumInteger result = (RequiredClassRequiredNullableEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 a5fb83a44d75..b8499f859780 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,9 +104,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - RequiredClassRequiredNullableEnumIntegerOnly result = (RequiredClassRequiredNullableEnumIntegerOnly)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 cd3a5371fe68..adcffcd89b33 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,9 +104,11 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -138,9 +140,11 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - int rawValue = reader.GetInt32(); - TestEnumParametersEnumQueryIntegerParameter result = (TestEnumParametersEnumQueryIntegerParameter)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// 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 5f76847ab04e..54253625d551 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,9 +117,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -151,9 +153,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b2e724486330..03468ea7ef07 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,9 +117,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -151,9 +153,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..d053ca4aa498 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,9 +115,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..f34dfc63fcb4 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,9 +115,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 2500ed1682f7..0f7f2ab262a2 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,9 +118,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -152,9 +154,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 e15e8abb9246..f6850d5bcdf8 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,9 +118,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -152,9 +154,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter 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 4f7ff2fd6d5e..d053ca4aa498 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,9 +115,11 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumInteger result = (OuterEnumInteger)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter 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 b1dcaf71af0d..f34dfc63fcb4 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,9 +115,11 @@ public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - int rawValue = reader.GetInt32(); - OuterEnumIntegerDefaultValue result = (OuterEnumIntegerDefaultValue)rawValue; - return result; + string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); + if (result != null) + return result.Value; + throw new JsonException(); } /// @@ -149,9 +151,11 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter From d8ab8ee1e82c9da5bb2419b583c5ddc3563a0cf2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Feb 2026 17:00:03 +0000 Subject: [PATCH 6/9] fix: remove InvariantCulture from enum ToString calls in Read methods Remove System.Globalization.CultureInfo.InvariantCulture from all .ToString() calls in the enum JsonConverter Read methods. This ensures the culture used for ToString matches the culture used in FromStringOrDefault comparisons (both now use system default culture). Since the Write path outputs the numeric value directly, the JSON output is always correct regardless of culture. Co-authored-by: alexaka1 <22166651+alexaka1@users.noreply.github.com> --- .../main/resources/csharp/modelEnum.mustache | 20 +++++++++---------- .../CSharpClientCodegenTest.java | 6 +++--- .../Model/EnumTestEnumInteger.cs | 4 ++-- .../Model/EnumTestEnumIntegerOnly.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- ...iredClassRequiredNotnullableEnumInteger.cs | 4 ++-- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 4 ++-- ...equiredClassRequiredNullableEnumInteger.cs | 4 ++-- ...redClassRequiredNullableEnumIntegerOnly.cs | 4 ++-- ...tEnumParametersEnumQueryDoubleParameter.cs | 4 ++-- ...EnumParametersEnumQueryIntegerParameter.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- .../Model/EnumTestEnumInteger.cs | 4 ++-- .../Model/EnumTestEnumIntegerOnly.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- ...iredClassRequiredNotnullableEnumInteger.cs | 4 ++-- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 4 ++-- ...equiredClassRequiredNullableEnumInteger.cs | 4 ++-- ...redClassRequiredNullableEnumIntegerOnly.cs | 4 ++-- ...tEnumParametersEnumQueryDoubleParameter.cs | 4 ++-- ...EnumParametersEnumQueryIntegerParameter.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- .../Model/EnumTestEnumInteger.cs | 4 ++-- .../Model/EnumTestEnumIntegerOnly.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- ...iredClassRequiredNotnullableEnumInteger.cs | 4 ++-- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 4 ++-- ...equiredClassRequiredNullableEnumInteger.cs | 4 ++-- ...redClassRequiredNullableEnumIntegerOnly.cs | 4 ++-- ...tEnumParametersEnumQueryDoubleParameter.cs | 4 ++-- ...EnumParametersEnumQueryIntegerParameter.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- .../Model/EnumTestEnumInteger.cs | 4 ++-- .../Model/EnumTestEnumIntegerOnly.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- ...iredClassRequiredNotnullableEnumInteger.cs | 4 ++-- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 4 ++-- ...equiredClassRequiredNullableEnumInteger.cs | 4 ++-- ...redClassRequiredNullableEnumIntegerOnly.cs | 4 ++-- ...tEnumParametersEnumQueryDoubleParameter.cs | 4 ++-- ...EnumParametersEnumQueryIntegerParameter.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- .../Model/EnumTestEnumInteger.cs | 4 ++-- .../Model/EnumTestEnumIntegerOnly.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- ...iredClassRequiredNotnullableEnumInteger.cs | 4 ++-- ...ClassRequiredNotnullableEnumIntegerOnly.cs | 4 ++-- ...equiredClassRequiredNullableEnumInteger.cs | 4 ++-- ...redClassRequiredNullableEnumIntegerOnly.cs | 4 ++-- ...tEnumParametersEnumQueryDoubleParameter.cs | 4 ++-- ...EnumParametersEnumQueryIntegerParameter.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- .../Model/OuterEnumInteger.cs | 4 ++-- .../Model/OuterEnumIntegerDefaultValue.cs | 4 ++-- 76 files changed, 161 insertions(+), 161 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache index 13596727ad3b..1098c87bd767 100644 --- a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache @@ -155,35 +155,35 @@ public override {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { {{#isInteger}} - string rawValue = reader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); + 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(System.Globalization.CultureInfo.InvariantCulture); + 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(System.Globalization.CultureInfo.InvariantCulture); + 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(System.Globalization.CultureInfo.InvariantCulture); + 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(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDecimal().ToString(); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -240,35 +240,35 @@ {{/isString}} {{#isInteger}} - string rawValue = reader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); + 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(System.Globalization.CultureInfo.InvariantCulture); + 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(System.Globalization.CultureInfo.InvariantCulture); + 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(System.Globalization.CultureInfo.InvariantCulture); + 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(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDecimal().ToString(); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 cef64cb11c59..9eca27bb9287 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 @@ -285,7 +285,7 @@ public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOExcepti ); assertNotNull(intEnumFile, "Could not find file for model: IntegerEnum"); assertFileContains(intEnumFile.toPath(), - "reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture)", + "reader.GetInt32().ToString()", "FromStringOrDefault(rawValue)", "throw new JsonException()", "writer.WriteNumberValue(", @@ -303,7 +303,7 @@ public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOExcepti ); assertNotNull(longEnumFile, "Could not find file for model: LongEnum"); assertFileContains(longEnumFile.toPath(), - "reader.GetInt64().ToString(System.Globalization.CultureInfo.InvariantCulture)", + "reader.GetInt64().ToString()", "FromStringOrDefault(rawValue)", "throw new JsonException()", "writer.WriteNumberValue(", @@ -323,7 +323,7 @@ public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOExcepti ); assertNotNull(doubleEnumFile, "Could not find file for model: DoubleEnum"); assertFileContains(doubleEnumFile.toPath(), - "reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture)", + "reader.GetDouble().ToString()", "writer.WriteNumberValue(", "public static double ToJsonValue(DoubleEnum value)", "return 1.1d;", 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 abca77faf22c..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,7 +104,7 @@ public class EnumTestEnumIntegerJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 17aacbd808db..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,7 +104,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 c12e580bf6d7..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,7 +104,7 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 b8499f859780..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,7 +104,7 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 e653ebbb9a96..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 @@ -110,7 +110,7 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDouble().ToString(); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -146,7 +146,7 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDouble().ToString(); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 adcffcd89b33..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,7 +104,7 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 54253625d551..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,7 +117,7 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -153,7 +153,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -153,7 +153,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -154,7 +154,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -154,7 +154,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 17aacbd808db..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,7 +104,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 c12e580bf6d7..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,7 +104,7 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 b8499f859780..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,7 +104,7 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 e653ebbb9a96..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 @@ -110,7 +110,7 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDouble().ToString(); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -146,7 +146,7 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDouble().ToString(); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 adcffcd89b33..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,7 +104,7 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 d053ca4aa498..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,7 +115,7 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 17aacbd808db..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,7 +104,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 c12e580bf6d7..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,7 +104,7 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 b8499f859780..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,7 +104,7 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 e653ebbb9a96..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 @@ -110,7 +110,7 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDouble().ToString(); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -146,7 +146,7 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDouble().ToString(); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 adcffcd89b33..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,7 +104,7 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 d053ca4aa498..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,7 +115,7 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 17aacbd808db..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,7 +104,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 c12e580bf6d7..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,7 +104,7 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 b8499f859780..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,7 +104,7 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 e653ebbb9a96..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 @@ -110,7 +110,7 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDouble().ToString(); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -146,7 +146,7 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDouble().ToString(); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 adcffcd89b33..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,7 +104,7 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 54253625d551..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,7 +117,7 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -153,7 +153,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -153,7 +153,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -154,7 +154,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -154,7 +154,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override EnumTestEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); EnumTestEnumInteger? result = EnumTestEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class EnumTestEnumIntegerNullableJsonConverter : JsonConverter public override EnumTestEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); EnumTestEnumIntegerOnly? result = EnumTestEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class EnumTestEnumIntegerOnlyNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter public override RequiredClassRequiredNotnullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumInteger? result = RequiredClassRequiredNotnullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 17aacbd808db..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,7 +104,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyJsonConverter : Json /// public override RequiredClassRequiredNotnullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNotnullableEnumIntegerOnlyNullableJsonConverte if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNotnullableEnumIntegerOnly? result = RequiredClassRequiredNotnullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 c12e580bf6d7..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,7 +104,7 @@ public class RequiredClassRequiredNullableEnumIntegerJsonConverter : JsonConvert /// public override RequiredClassRequiredNullableEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNullableEnumIntegerNullableJsonConverter : Jso if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumInteger? result = RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 b8499f859780..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,7 +104,7 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyJsonConverter : JsonCon /// public override RequiredClassRequiredNullableEnumIntegerOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class RequiredClassRequiredNullableEnumIntegerOnlyNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); RequiredClassRequiredNullableEnumIntegerOnly? result = RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 e653ebbb9a96..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 @@ -110,7 +110,7 @@ public class TestEnumParametersEnumQueryDoubleParameterJsonConverter : JsonConve /// public override TestEnumParametersEnumQueryDoubleParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDouble().ToString(); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -146,7 +146,7 @@ public class TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter : J if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetDouble().ToString(); TestEnumParametersEnumQueryDoubleParameter? result = TestEnumParametersEnumQueryDoubleParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 adcffcd89b33..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,7 +104,7 @@ public class TestEnumParametersEnumQueryIntegerParameterJsonConverter : JsonConv /// public override TestEnumParametersEnumQueryIntegerParameter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -140,7 +140,7 @@ public class TestEnumParametersEnumQueryIntegerParameterNullableJsonConverter : if (reader.TokenType == JsonTokenType.Null) return null; - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); TestEnumParametersEnumQueryIntegerParameter? result = TestEnumParametersEnumQueryIntegerParameterValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; 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 54253625d551..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,7 +117,7 @@ public class OuterEnumIntegerJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -153,7 +153,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -153,7 +153,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -154,7 +154,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -154,7 +154,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter /// public override OuterEnumInteger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumInteger? result = OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerNullableJsonConverter : JsonConverter public override OuterEnumIntegerDefaultValue Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - string rawValue = reader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); + string rawValue = reader.GetInt32().ToString(); OuterEnumIntegerDefaultValue? result = OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue); if (result != null) return result.Value; @@ -151,7 +151,7 @@ public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter Date: Sat, 7 Feb 2026 17:19:28 +0000 Subject: [PATCH 7/9] fix: nullable enum converters - use WriteNullValue() and handle null token in Read Nullable string enum Write now calls WriteNullValue() when HasValue is false, instead of writing the string literal "null". Nullable enum Read (all types) now checks reader.TokenType == JsonTokenType.Null and returns null before attempting to read the value. Previously this check was only applied to non-string enum types. Co-authored-by: alexaka1 <22166651+alexaka1@users.noreply.github.com> --- .../src/main/resources/csharp/modelEnum.mustache | 10 ++++------ .../src/Org.OpenAPITools/Model/AreaCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/MarineAreaCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/StateTerritoryCode.cs | 8 +++++++- .../Org.OpenAPITools/Model/IconsSizeParameterAnyOf.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs | 8 +++++++- .../Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs | 8 +++++++- .../Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumTestEnumString.cs | 8 +++++++- .../Model/FindPetsByStatusStatusParameterInner.cs | 8 +++++++- .../Model/MapTestMapOfEnumStringValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OrderStatus.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/PetStatus.cs | 8 +++++++- .../RequiredClassRequiredNotnullableEnumString.cs | 8 +++++++- .../Model/RequiredClassRequiredNullableEnumString.cs | 8 +++++++- .../Model/TestDescendantsObjectType.cs | 8 +++++++- .../TestEnumParametersEnumHeaderStringParameter.cs | 8 +++++++- .../Model/TestEnumParametersRequestEnumFormString.cs | 8 +++++++- ...estEnumParametersRequestEnumFormStringArrayInner.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/ZebraType.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../Model/ZeroBasedEnumClassZeroBasedEnum.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs | 8 +++++++- .../Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs | 8 +++++++- .../Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumTestEnumString.cs | 8 +++++++- .../Model/FindPetsByStatusStatusParameterInner.cs | 8 +++++++- .../Model/MapTestMapOfEnumStringValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OrderStatus.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/PetStatus.cs | 8 +++++++- .../RequiredClassRequiredNotnullableEnumString.cs | 8 +++++++- .../Model/RequiredClassRequiredNullableEnumString.cs | 8 +++++++- .../Model/TestDescendantsObjectType.cs | 8 +++++++- .../TestEnumParametersEnumHeaderStringParameter.cs | 8 +++++++- .../Model/TestEnumParametersRequestEnumFormString.cs | 8 +++++++- ...estEnumParametersRequestEnumFormStringArrayInner.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/ZebraType.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../Model/ZeroBasedEnumClassZeroBasedEnum.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs | 8 +++++++- .../Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs | 8 +++++++- .../Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumTestEnumString.cs | 8 +++++++- .../Model/FindPetsByStatusStatusParameterInner.cs | 8 +++++++- .../Model/MapTestMapOfEnumStringValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OrderStatus.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/PetStatus.cs | 8 +++++++- .../RequiredClassRequiredNotnullableEnumString.cs | 8 +++++++- .../Model/RequiredClassRequiredNullableEnumString.cs | 8 +++++++- .../Model/TestDescendantsObjectType.cs | 8 +++++++- .../TestEnumParametersEnumHeaderStringParameter.cs | 8 +++++++- .../Model/TestEnumParametersRequestEnumFormString.cs | 8 +++++++- ...estEnumParametersRequestEnumFormStringArrayInner.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/ZebraType.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../Model/ZeroBasedEnumClassZeroBasedEnum.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs | 8 +++++++- .../Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs | 8 +++++++- .../Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumTestEnumString.cs | 8 +++++++- .../Model/FindPetsByStatusStatusParameterInner.cs | 8 +++++++- .../Model/MapTestMapOfEnumStringValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OrderStatus.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/PetStatus.cs | 8 +++++++- .../RequiredClassRequiredNotnullableEnumString.cs | 8 +++++++- .../Model/RequiredClassRequiredNullableEnumString.cs | 8 +++++++- .../Model/TestDescendantsObjectType.cs | 8 +++++++- .../TestEnumParametersEnumHeaderStringParameter.cs | 8 +++++++- .../Model/TestEnumParametersRequestEnumFormString.cs | 8 +++++++- ...estEnumParametersRequestEnumFormStringArrayInner.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/ZebraType.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../Model/ZeroBasedEnumClassZeroBasedEnum.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ChildCatAllOfPetType.cs | 8 +++++++- .../Org.OpenAPITools/Model/CopyActivityAllOfSchema.cs | 8 +++++++- .../Org.OpenAPITools/Model/EnumArraysArrayEnumInner.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumArraysJustSymbol.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumTestEnumString.cs | 8 +++++++- .../Model/FindPetsByStatusStatusParameterInner.cs | 8 +++++++- .../Model/MapTestMapOfEnumStringValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OrderStatus.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/PetStatus.cs | 8 +++++++- .../RequiredClassRequiredNotnullableEnumString.cs | 8 +++++++- .../Model/RequiredClassRequiredNullableEnumString.cs | 8 +++++++- .../Model/TestDescendantsObjectType.cs | 8 +++++++- .../TestEnumParametersEnumHeaderStringParameter.cs | 8 +++++++- .../Model/TestEnumParametersRequestEnumFormString.cs | 8 +++++++- ...estEnumParametersRequestEnumFormStringArrayInner.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../FormModels/src/Org.OpenAPITools/Model/ZebraType.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../Model/ZeroBasedEnumClassZeroBasedEnum.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/EnumClass.cs | 8 +++++++- .../Petstore/src/Org.OpenAPITools/Model/OuterEnum.cs | 8 +++++++- .../Org.OpenAPITools/Model/OuterEnumDefaultValue.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/OuterEnumTest.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/TestResultCode.cs | 8 +++++++- .../src/Org.OpenAPITools/Model/ZeroBasedEnum.cs | 8 +++++++- 192 files changed, 1341 insertions(+), 197 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache index 1098c87bd767..6a591134d1ba 100644 --- a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache @@ -234,11 +234,9 @@ /// public override {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - {{^isString}} if (reader.TokenType == JsonTokenType.Null) return null; - {{/isString}} {{#isInteger}} string rawValue = reader.{{>EnumJsonReaderMethod}}().ToString(); {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue); @@ -296,15 +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) { - {{^isString}} 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)); - else - writer.WriteNullValue(); {{/isString}} {{#isString}} - 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"); + 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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(); } } } From b0b28353b21781bb42d9670899e55f4cdb5e0063 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Feb 2026 17:28:29 +0000 Subject: [PATCH 8/9] fix: emit `: long` for int64 enum declarations and add test assertions The enum declaration template now checks `{{#isLong}}` to emit `: long` as the underlying type, preventing overflow for int64 enum values. Added test assertions verifying: - LongEnum has `: long` in its declaration - IntegerEnum does NOT have `: long` or `: byte` Co-authored-by: alexaka1 <22166651+alexaka1@users.noreply.github.com> --- .../src/main/resources/csharp/modelEnum.mustache | 2 +- .../codegen/csharpnetcore/CSharpClientCodegenTest.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache index 6a591134d1ba..4a0aa88cd98d 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}} 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 9eca27bb9287..02d527ba624e 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 @@ -293,7 +293,9 @@ public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOExcepti ); assertFileNotContains(intEnumFile.toPath(), "reader.GetString()", - "writer.WriteStringValue(" + "writer.WriteStringValue(", + ": long", + ": byte" ); // Verify long enum uses int64 reader with validation and actual int64 values @@ -303,6 +305,7 @@ public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOExcepti ); assertNotNull(longEnumFile, "Could not find file for model: LongEnum"); assertFileContains(longEnumFile.toPath(), + "enum LongEnum: long", "reader.GetInt64().ToString()", "FromStringOrDefault(rawValue)", "throw new JsonException()", From bd903e83ba6478bd93740634386d391ad303dce8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Feb 2026 17:30:45 +0000 Subject: [PATCH 9/9] fix: add space before colon in enum type declaration per C# convention Changes `enum Name: long` to `enum Name : long` (and same for `: byte`) to match standard C# formatting. Co-authored-by: alexaka1 <22166651+alexaka1@users.noreply.github.com> --- .../src/main/resources/csharp/modelEnum.mustache | 2 +- .../codegen/csharpnetcore/CSharpClientCodegenTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache index 4a0aa88cd98d..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}}{{#isLong}}: long{{/isLong}} + {{>visibility}} enum {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}{{#vendorExtensions.x-enum-byte}} : byte{{/vendorExtensions.x-enum-byte}}{{#isLong}} : long{{/isLong}} { {{#allowableValues}} {{#enumVars}} 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 02d527ba624e..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 @@ -305,7 +305,7 @@ public void testIntegerEnumJsonConverterUsesNumericOperations() throws IOExcepti ); assertNotNull(longEnumFile, "Could not find file for model: LongEnum"); assertFileContains(longEnumFile.toPath(), - "enum LongEnum: long", + "enum LongEnum : long", "reader.GetInt64().ToString()", "FromStringOrDefault(rawValue)", "throw new JsonException()",