From b0ecd310779b9adbc5bfba542e7858fd76281bd6 Mon Sep 17 00:00:00 2001 From: sakshichitnis27 Date: Thu, 23 Jul 2026 06:31:31 +0000 Subject: [PATCH 1/4] Fix numeric enum deserialization Signed-off-by: sakshichitnis27 --- .../generichost/JsonConverter.mustache | 16 ++++++++++---- .../CSharpClientCodegenTest.java | 21 +++++++++++++++++++ .../resources/3_0/csharp/integer-enum.yaml | 10 +++++++++ 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache index 95c288384d45..a95846e31f53 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache @@ -243,9 +243,13 @@ { string {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue = utf8JsonReader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); {{classname}}.{{{datatypeWithEnum}}}? {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value = {{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue); - if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value == null) - throw new JsonException(); + {{#isNullable}} {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); + {{/isNullable}} + {{^isNullable}} + if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value != null) + {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); + {{/isNullable}} } {{/vendorExtensions.x-enum-byte}} {{^vendorExtensions.x-enum-byte}} @@ -256,9 +260,13 @@ { string {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue = utf8JsonReader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); {{classname}}.{{{datatypeWithEnum}}}? {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value = {{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue); - if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value == null) - throw new JsonException(); + {{#isNullable}} {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); + {{/isNullable}} + {{^isNullable}} + if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value != null) + {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); + {{/isNullable}} } {{/isNumeric}} {{^isNumeric}} 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 4e4a294293a0..51b99bbcb84e 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 @@ -331,6 +331,27 @@ public void testNumericEnumJsonConverterUsesNumericOperations() throws IOExcepti ": byte" ); + File modelWithEnumPropertiesFile = files.get(Paths + .get(output.getAbsolutePath(), "src", "Org.OpenAPITools", "Model", "ModelWithEnumProperties.cs") + .toString() + ); + assertNotNull(modelWithEnumPropertiesFile, "Could not find file for model: ModelWithEnumProperties"); + String modelWithEnumProperties = Files.readString(modelWithEnumPropertiesFile.toPath()); + assertThat(modelWithEnumProperties).contains( + "ModelWithEnumProperties.NullableInlineIntEnumEnum? nullableInlineIntEnumValue = " + + "ModelWithEnumProperties.NullableInlineIntEnumEnumFromStringOrDefault(nullableInlineIntEnumRawValue);", + "nullableInlineIntEnum = new Option(" + + "nullableInlineIntEnumValue);" + ); + assertThat(modelWithEnumProperties).doesNotContain( + "if (nullableInlineIntEnumValue == null)\n throw new JsonException();", + "if (inlineIntEnumValue == null)\n throw new JsonException();" + ); + assertThat(modelWithEnumProperties).contains( + "if (inlineIntEnumValue != null)\n" + + " inlineIntEnum = new Option(inlineIntEnumValue);" + ); + // 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") 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 cf818e793736..29eea4559aae 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 @@ -94,6 +94,16 @@ components: x-enum-varnames: - None - Some + nullableInlineIntEnum: + type: integer + format: int32 + nullable: true + enum: + - 0 + - 1 + x-enum-varnames: + - None + - Some inlineLongEnum: type: integer format: int64 From f6f69bcd3e32264cfca22f257f8671b166eadf07 Mon Sep 17 00:00:00 2001 From: Sakshi Chitnis Date: Thu, 23 Jul 2026 16:58:47 +0530 Subject: [PATCH 2/4] refactor(csharp): share numeric inner enum parsing --- .../generichost/JsonConverter.mustache | 32 ++----------------- .../NumericInnerEnumJsonRead.mustache | 14 ++++++++ 2 files changed, 17 insertions(+), 29 deletions(-) create mode 100644 modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache index a95846e31f53..f21716f54b6f 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache @@ -237,37 +237,11 @@ {{^isMap}} {{#isInnerEnum}} {{#vendorExtensions.x-enum-byte}} - if (utf8JsonReader.TokenType == JsonTokenType.Null) - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}null); - else - { - string {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue = utf8JsonReader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); - {{classname}}.{{{datatypeWithEnum}}}? {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value = {{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue); - {{#isNullable}} - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); - {{/isNullable}} - {{^isNullable}} - if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value != null) - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); - {{/isNullable}} - } + {{>NumericInnerEnumJsonRead}} {{/vendorExtensions.x-enum-byte}} {{^vendorExtensions.x-enum-byte}} {{#isNumeric}} - if (utf8JsonReader.TokenType == JsonTokenType.Null) - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}null); - else - { - string {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue = utf8JsonReader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); - {{classname}}.{{{datatypeWithEnum}}}? {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value = {{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue); - {{#isNullable}} - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); - {{/isNullable}} - {{^isNullable}} - if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value != null) - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); - {{/isNullable}} - } + {{>NumericInnerEnumJsonRead}} {{/isNumeric}} {{^isNumeric}} string{{nrt?}} {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue = utf8JsonReader.GetString(); @@ -698,4 +672,4 @@ {{/lambda.trimLineBreaks}} {{/lambda.trimTrailingWithNewLine}} } - } \ No newline at end of file + } diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache new file mode 100644 index 000000000000..7a541e5817a4 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache @@ -0,0 +1,14 @@ +if (utf8JsonReader.TokenType == JsonTokenType.Null) + {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}null); +else +{ + string {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue = utf8JsonReader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); + {{classname}}.{{{datatypeWithEnum}}}? {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value = {{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue); + {{#isNullable}} + {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); + {{/isNullable}} + {{^isNullable}} + if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value != null) + {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); + {{/isNullable}} +} From ab54d9a97fea95314f919e63837e5d2d95ec90fc Mon Sep 17 00:00:00 2001 From: Sakshi Chitnis Date: Thu, 23 Jul 2026 17:23:32 +0530 Subject: [PATCH 3/4] fix(csharp): align numeric enum null handling --- .../generichost/JsonConverter.mustache | 2 +- .../NumericInnerEnumJsonRead.mustache | 15 +++---- .../CSharpClientCodegenTest.java | 10 ++++- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 27 ++++-------- .../Org.OpenAPITools/Model/RequiredClass.cs | 44 +++++-------------- 29 files changed, 289 insertions(+), 661 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache index f21716f54b6f..1f49a9f5e07c 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache @@ -672,4 +672,4 @@ {{/lambda.trimLineBreaks}} {{/lambda.trimTrailingWithNewLine}} } - } + } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache index 7a541e5817a4..8d0c946b02f6 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache @@ -1,14 +1,11 @@ -if (utf8JsonReader.TokenType == JsonTokenType.Null) +{{#isNullable}}if (utf8JsonReader.TokenType == JsonTokenType.Null) {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}null); else -{ +{{/isNullable}}{{^isNullable}}if (utf8JsonReader.TokenType != JsonTokenType.Null) +{{/isNullable}}{ string {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue = utf8JsonReader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); - {{classname}}.{{{datatypeWithEnum}}}? {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value = {{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue); - {{#isNullable}} - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); - {{/isNullable}} - {{^isNullable}} + {{classname}}.{{{datatypeWithEnum}}}? {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value = {{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue);{{#isNullable}} + {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value);{{/isNullable}}{{^isNullable}} if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value != null) - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); - {{/isNullable}} + {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value);{{/isNullable}} } 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 51b99bbcb84e..d7602dd02de4 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 @@ -343,9 +343,17 @@ public void testNumericEnumJsonConverterUsesNumericOperations() throws IOExcepti "nullableInlineIntEnum = new Option(" + "nullableInlineIntEnumValue);" ); + assertThat(modelWithEnumProperties) + .containsPattern( + "if \\(utf8JsonReader.TokenType == JsonTokenType.Null\\)\\s+" + + "nullableInlineIntEnum = new Option\\(null\\);") + .containsPattern( + "if \\(utf8JsonReader.TokenType != JsonTokenType.Null\\)\\s+\\{\\s+" + + "string inlineIntEnumRawValue"); assertThat(modelWithEnumProperties).doesNotContain( "if (nullableInlineIntEnumValue == null)\n throw new JsonException();", - "if (inlineIntEnumValue == null)\n throw new JsonException();" + "if (inlineIntEnumValue == null)\n throw new JsonException();", + "inlineIntEnum = new Option(null);" ); assertThat(modelWithEnumProperties).contains( "if (inlineIntEnumValue != null)\n" + diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumTest.cs index 11ba7d689fb0..385669d53fb0 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumTest.cs @@ -747,39 +747,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/RequiredClass.cs index ea3124881d54..6f848420a762 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1841,27 +1841,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1903,27 +1897,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1956,8 +1944,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1968,8 +1954,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2005,8 +1989,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2017,8 +1999,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs index 2755ad611c41..16a43b036eac 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs @@ -755,39 +755,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs index 21eb785aa506..c16e26e907ee 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1849,27 +1849,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1911,27 +1905,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1964,8 +1952,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1976,8 +1962,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2013,8 +1997,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2025,8 +2007,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index e052f8400ce3..167a3ca3ca08 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -753,39 +753,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index 8c062e9636be..c5ce0d81c94c 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1909,27 +1903,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1962,8 +1950,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1974,8 +1960,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2011,8 +1995,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2023,8 +2005,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs index 63841f7ebf6d..3e9942c78c35 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs @@ -756,39 +756,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs index 6aa8c1cdfb47..24e4762bb50b 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1850,27 +1850,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1912,27 +1906,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1965,8 +1953,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1977,8 +1963,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2014,8 +1998,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2026,8 +2008,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index b3f1ec37a7cd..7e4625c98db5 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -753,39 +753,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index f541eb38e6a7..99fc5d83a29a 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1909,27 +1903,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1962,8 +1950,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1974,8 +1960,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2011,8 +1995,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2023,8 +2005,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index b3f1ec37a7cd..7e4625c98db5 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -753,39 +753,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index f541eb38e6a7..99fc5d83a29a 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1909,27 +1903,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1962,8 +1950,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1974,8 +1960,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2011,8 +1995,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2023,8 +2005,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs index 2755ad611c41..16a43b036eac 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs @@ -755,39 +755,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs index 21eb785aa506..c16e26e907ee 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1849,27 +1849,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1911,27 +1905,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1964,8 +1952,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1976,8 +1962,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2013,8 +1997,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2025,8 +2007,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index e052f8400ce3..167a3ca3ca08 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -753,39 +753,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index 8c062e9636be..c5ce0d81c94c 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1909,27 +1903,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1962,8 +1950,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1974,8 +1960,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2011,8 +1995,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2023,8 +2005,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs index 63841f7ebf6d..3e9942c78c35 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs @@ -756,39 +756,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs index 6aa8c1cdfb47..24e4762bb50b 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1850,27 +1850,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1912,27 +1906,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1965,8 +1953,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1977,8 +1963,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2014,8 +1998,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2026,8 +2008,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs index 2755ad611c41..16a43b036eac 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs @@ -755,39 +755,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs index 21eb785aa506..c16e26e907ee 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1849,27 +1849,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1911,27 +1905,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1964,8 +1952,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1976,8 +1962,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2013,8 +1997,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2025,8 +2007,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index e052f8400ce3..167a3ca3ca08 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -753,39 +753,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index 8c062e9636be..c5ce0d81c94c 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1909,27 +1903,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1962,8 +1950,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1974,8 +1960,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2011,8 +1995,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2023,8 +2005,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs index 63841f7ebf6d..3e9942c78c35 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs @@ -756,39 +756,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs index 6aa8c1cdfb47..24e4762bb50b 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1850,27 +1850,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1912,27 +1906,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1965,8 +1953,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1977,8 +1963,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2014,8 +1998,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2026,8 +2008,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index b3f1ec37a7cd..7e4625c98db5 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -753,39 +753,30 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); break; case "enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue == null) - throw new JsonException(); - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue != null) + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue == null) - throw new JsonException(); - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue != null) + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - enumNumber = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue == null) - throw new JsonException(); - enumNumber = new Option(enumNumberValue); + if (enumNumberValue != null) + enumNumber = new Option(enumNumberValue); } break; case "enum_string": diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index f541eb38e6a7..99fc5d83a29a 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue != null) + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - requiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue != null) + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": @@ -1909,27 +1903,21 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumInteger = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue == null) - throw new JsonException(); - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue != null) + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType == JsonTokenType.Null) - notrequiredNotnullableEnumIntegerOnly = new Option(null); - else + if (utf8JsonReader.TokenType != JsonTokenType.Null) { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue == null) - throw new JsonException(); - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue != null) + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": @@ -1962,8 +1950,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); - if (notrequiredNullableEnumIntegerValue == null) - throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1974,8 +1960,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); - if (notrequiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; @@ -2011,8 +1995,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); - if (requiredNullableEnumIntegerValue == null) - throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2023,8 +2005,6 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); - if (requiredNullableEnumIntegerOnlyValue == null) - throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; From 8ddebe6a4d65ec37b320625764903b8fa8cc4a72 Mon Sep 17 00:00:00 2001 From: sakshichitnis27 Date: Fri, 24 Jul 2026 06:54:15 +0000 Subject: [PATCH 4/4] fix(csharp): align inner enum deserialization --- .../generichost/JsonConverter.mustache | 12 ++- .../NumericInnerEnumJsonRead.mustache | 13 ++- .../CSharpClientCodegenTest.java | 91 ++++++++++++++----- .../resources/3_0/csharp/integer-enum.yaml | 38 ++++++++ .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- .../src/Org.OpenAPITools/Model/ChildCat.cs | 7 +- .../Org.OpenAPITools/Model/CopyActivity.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant1.cs | 7 +- .../src/Org.OpenAPITools/Model/Descendant2.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumArrays.cs | 7 +- .../src/Org.OpenAPITools/Model/EnumTest.cs | 41 ++++++--- .../src/Org.OpenAPITools/Model/Order.cs | 7 +- .../src/Org.OpenAPITools/Model/Pet.cs | 7 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 78 ++++++++++++---- .../Org.OpenAPITools/Model/TestDescendants.cs | 7 +- .../src/Org.OpenAPITools/Model/Zebra.cs | 7 +- .../Model/ZeroBasedEnumClass.cs | 7 +- 160 files changed, 2097 insertions(+), 514 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache index 1f49a9f5e07c..7948f79dbf7c 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache @@ -245,14 +245,20 @@ {{/isNumeric}} {{^isNumeric}} string{{nrt?}} {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue = utf8JsonReader.GetString(); - {{! A nullable enum may be explicitly null in the payload; still mark the Option as set so a present-but-null value is not rejected as missing. }} {{#isNullable}} - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue == null ? null : {{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue)); + if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue == null) + {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}null); + else {{/isNullable}} {{^isNullable}} if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue != null) - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue)); {{/isNullable}} + { + {{classname}}.{{{datatypeWithEnum}}}? {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value = {{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue); + if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value == null) + throw new JsonException(); + {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value); + } {{/isNumeric}} {{/vendorExtensions.x-enum-byte}} {{/isInnerEnum}} diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache index 8d0c946b02f6..88a808defe83 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/NumericInnerEnumJsonRead.mustache @@ -1,11 +1,10 @@ -{{#isNullable}}if (utf8JsonReader.TokenType == JsonTokenType.Null) +if (utf8JsonReader.TokenType == JsonTokenType.Null) {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}null); else -{{/isNullable}}{{^isNullable}}if (utf8JsonReader.TokenType != JsonTokenType.Null) -{{/isNullable}}{ +{ string {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue = utf8JsonReader.{{>EnumJsonReaderMethod}}().ToString(System.Globalization.CultureInfo.InvariantCulture); - {{classname}}.{{{datatypeWithEnum}}}? {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value = {{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue);{{#isNullable}} - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value);{{/isNullable}}{{^isNullable}} - if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value != null) - {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value);{{/isNullable}} + {{classname}}.{{{datatypeWithEnum}}}? {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value = {{classname}}.{{{datatypeWithEnum}}}FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue); + if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}Value == null) + throw new JsonException(); + {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}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 d7602dd02de4..9d0bc857719d 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 @@ -41,11 +41,10 @@ public class CSharpClientCodegenTest { @Test - public void testGenericHostNullableEnumDeserializesPresentNull() throws IOException { - // For a required + nullable enum, the generated generichost JsonConverter must assign - // the backing Option even when the JSON value is null; otherwise the required-property - // check rejects a present-but-null value with "Property is required". Non-nullable enums - // keep the original non-null guard, so their generated output is unchanged. + public void testGenericHostInnerStringEnumUnknownHandlingPreservesNullBehavior() throws IOException { + // Unknown enum values must throw for both nullable and non-nullable properties. + // Preserve the existing null-token behavior: nullable properties record a present + // null, while non-nullable string properties retain their existing null guard. File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); output.deleteOnExit(); final OpenAPI openAPI = TestUtils.parseFlattenSpec( @@ -65,12 +64,23 @@ public void testGenericHostNullableEnumDeserializesPresentNull() throws IOExcept File requiredClass = files.get(Paths.get(output.getAbsolutePath(), "src", "Org.OpenAPITools", "Model", "RequiredClass.cs").toString()); assertNotNull(requiredClass); - // required + nullable enum: a null raw value still sets the Option (mapped to null) - assertFileContains(requiredClass.toPath(), - "requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null :"); - // required + non-nullable enum: keeps the original guard (unchanged behavior) - assertFileContains(requiredClass.toPath(), - "if (requiredNotnullableEnumStringRawValue != null)"); + String requiredClassContents = Files.readString(requiredClass.toPath()); + assertThat(requiredClassContents) + .containsPattern( + "if \\(requiredNullableEnumStringRawValue == null\\)\\s+" + + "requiredNullableEnumString = new Option\\(null\\);") + .containsPattern( + "if \\(requiredNotnullableEnumStringRawValue != null\\)\\s+\\{"); + assertThat(requiredClassContents).contains( + "if (requiredNullableEnumStringValue == null)\n" + + " throw new JsonException();", + "if (requiredNotnullableEnumStringValue == null)\n" + + " throw new JsonException();", + "if (!requiredNullableEnumString.IsSet)\n" + + " throw new ArgumentException(\"Property is required for class RequiredClass.\", nameof(requiredNullableEnumString));", + "if (!requiredNotnullableEnumString.IsSet)\n" + + " throw new ArgumentException(\"Property is required for class RequiredClass.\", nameof(requiredNotnullableEnumString));" + ); } @Test @@ -337,27 +347,59 @@ public void testNumericEnumJsonConverterUsesNumericOperations() throws IOExcepti ); assertNotNull(modelWithEnumPropertiesFile, "Could not find file for model: ModelWithEnumProperties"); String modelWithEnumProperties = Files.readString(modelWithEnumPropertiesFile.toPath()); + + // Unknown non-null enum values are rejected consistently for nullable and non-nullable + // string, numeric, and byte-backed inner enums. assertThat(modelWithEnumProperties).contains( + "if (inlineIntEnumValue == null)\n" + + " throw new JsonException();", + "if (nullableInlineIntEnumValue == null)\n" + + " throw new JsonException();", + "if (inlineStringEnumValue == null)\n" + + " throw new JsonException();", + "if (nullableInlineStringEnumValue == null)\n" + + " throw new JsonException();", + "if (inlineByteEnumValue == null)\n" + + " throw new JsonException();", + "if (nullableInlineByteEnumValue == null)\n" + + " throw new JsonException();", + "inlineIntEnum = new Option(inlineIntEnumValue);", "ModelWithEnumProperties.NullableInlineIntEnumEnum? nullableInlineIntEnumValue = " + "ModelWithEnumProperties.NullableInlineIntEnumEnumFromStringOrDefault(nullableInlineIntEnumRawValue);", "nullableInlineIntEnum = new Option(" + - "nullableInlineIntEnumValue);" + "nullableInlineIntEnumValue);", + "inlineStringEnum = new Option(inlineStringEnumValue);", + "nullableInlineStringEnum = new Option(" + + "nullableInlineStringEnumValue);" ); + + // Numeric and byte-backed enums record an explicit JSON null as present so existing + // nullability validation can distinguish it from a missing property. assertThat(modelWithEnumProperties) .containsPattern( - "if \\(utf8JsonReader.TokenType == JsonTokenType.Null\\)\\s+" + - "nullableInlineIntEnum = new Option\\(null\\);") + "if \\(utf8JsonReader.TokenType == JsonTokenType.Null\\)\\s+" + + "inlineIntEnum = new Option\\(null\\);") .containsPattern( - "if \\(utf8JsonReader.TokenType != JsonTokenType.Null\\)\\s+\\{\\s+" + - "string inlineIntEnumRawValue"); - assertThat(modelWithEnumProperties).doesNotContain( - "if (nullableInlineIntEnumValue == null)\n throw new JsonException();", - "if (inlineIntEnumValue == null)\n throw new JsonException();", - "inlineIntEnum = new Option(null);" - ); + "if \\(utf8JsonReader.TokenType == JsonTokenType.Null\\)\\s+" + + "nullableInlineIntEnum = new Option\\(null\\);") + .containsPattern( + "if \\(inlineStringEnumRawValue != null\\)\\s+\\{") + .containsPattern( + "if \\(nullableInlineStringEnumRawValue == null\\)\\s+" + + "nullableInlineStringEnum = new Option\\(null\\);") + .containsPattern( + "if \\(utf8JsonReader.TokenType == JsonTokenType.Null\\)\\s+" + + "inlineByteEnum = new Option\\(null\\);") + .containsPattern( + "if \\(utf8JsonReader.TokenType == JsonTokenType.Null\\)\\s+" + + "nullableInlineByteEnum = new Option\\(null\\);"); + + // Required numeric checks distinguish a missing property from a present null. assertThat(modelWithEnumProperties).contains( - "if (inlineIntEnumValue != null)\n" + - " inlineIntEnum = new Option(inlineIntEnumValue);" + "if (!requiredInlineIntEnum.IsSet)\n" + + " throw new ArgumentException(\"Property is required for class ModelWithEnumProperties.\", nameof(requiredInlineIntEnum));", + "if (requiredInlineIntEnum.IsSet && requiredInlineIntEnum.Value == null)\n" + + " throw new ArgumentNullException(nameof(requiredInlineIntEnum), \"Property is not nullable for class ModelWithEnumProperties.\");" ); // Verify long enum uses int64 reader with validation and actual int64 values @@ -455,6 +497,9 @@ public void testNumericEnumJsonConverterUsesNumericOperations() throws IOExcepti "inlineLongEnumRawValue = utf8JsonReader.GetInt64().ToString(System.Globalization.CultureInfo.InvariantCulture)", "inlineDoubleEnumRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture)", "inlineByteEnumRawValue = utf8JsonReader.GetByte().ToString(System.Globalization.CultureInfo.InvariantCulture)", + "nullableInlineByteEnumRawValue = utf8JsonReader.GetByte().ToString(System.Globalization.CultureInfo.InvariantCulture)", + "inlineStringEnumRawValue = utf8JsonReader.GetString()", + "nullableInlineStringEnumRawValue = utf8JsonReader.GetString()", "InlineLongEnumEnum : long", "InlineByteEnumEnum : byte", "return 1.1d;", 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 29eea4559aae..f6b49e933f3b 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 @@ -72,6 +72,8 @@ components: - Max ModelWithEnumProperties: type: object + required: + - requiredInlineIntEnum properties: intEnum: $ref: '#/components/schemas/IntegerEnum' @@ -104,6 +106,32 @@ components: x-enum-varnames: - None - Some + requiredInlineIntEnum: + type: integer + format: int32 + enum: + - 0 + - 1 + x-enum-varnames: + - None + - Some + inlineStringEnum: + type: string + enum: + - none + - some + x-enum-varnames: + - None + - Some + nullableInlineStringEnum: + type: string + nullable: true + enum: + - none + - some + x-enum-varnames: + - None + - Some inlineLongEnum: type: integer format: int64 @@ -131,3 +159,13 @@ components: x-enum-varnames: - Min - Max + nullableInlineByteEnum: + type: integer + format: byte + nullable: true + enum: + - 0 + - 255 + x-enum-varnames: + - Min + - Max diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ChildCat.cs index 70bde02d3a73..a5b6a1a361ae 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ChildCat.cs @@ -187,7 +187,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string? petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/CopyActivity.cs index 5aba080f149b..9b1c9ee1e369 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -180,7 +180,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string? schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Descendant1.cs index 82a15943616e..76c710dacb68 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Descendant1.cs @@ -125,7 +125,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Descendant2.cs index a60104315dcf..e8a0952a86b0 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Descendant2.cs @@ -125,7 +125,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumArrays.cs index 5367b72978f4..f1d4a0e2bfb4 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -284,7 +284,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string? justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumTest.cs index 385669d53fb0..03b929699774 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/EnumTest.cs @@ -744,39 +744,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string? enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string? enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Order.cs index 9d4fd82e54e8..d912397ce446 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Order.cs @@ -320,7 +320,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Pet.cs index 45b4860f140a..5a9db85b6482 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Pet.cs @@ -298,7 +298,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option?>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)!); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/RequiredClass.cs index 6f848420a762..2b605afe9f2f 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1841,27 +1841,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string? requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1897,27 +1908,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string? notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1944,6 +1966,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1954,12 +1978,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1989,6 +2023,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -1999,12 +2035,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/TestDescendants.cs index 66d7507a1141..d91d79f57fa7 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -221,7 +221,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Zebra.cs index 9e27108a6d5f..9562526e8238 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Zebra.cs @@ -232,7 +232,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string? typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index eb9113c52357..21a8e68af61f 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -198,7 +198,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string? zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs index 4149798cb872..d99184db6550 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs @@ -188,7 +188,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string? petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs index 9a5f9bca0f4b..77fc65981096 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -181,7 +181,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string? schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs index d6a7e6b5e127..b78ed38fc503 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs @@ -126,7 +126,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs index 773dcab9fbd1..d4c4e6c2273c 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs @@ -126,7 +126,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs index 4637c8c1961c..3bcb6d9b4888 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -292,7 +292,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string? justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs index 16a43b036eac..647002803b89 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs @@ -752,39 +752,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string? enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string? enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs index d27db96b8109..ac6f4585d259 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs @@ -328,7 +328,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs index b0ac59683061..6cd3a02b4296 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs @@ -306,7 +306,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option?>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)!); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs index c16e26e907ee..d1f6c6f40209 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1849,27 +1849,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string? requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1905,27 +1916,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string? notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1952,6 +1974,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1962,12 +1986,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1997,6 +2031,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2007,12 +2043,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs index 106ee25a45fa..c9e049a3db72 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -229,7 +229,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs index 27e6df1e3d03..a871ad34d76d 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs @@ -233,7 +233,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string? typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index 1577e65e4208..5e17279cd925 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -206,7 +206,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string? zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs index afa8ab506db3..aad251c4d9e7 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs @@ -186,7 +186,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs index abd542815ebb..73f65a894734 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -179,7 +179,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs index c06bc34c128a..8abf3f5844d0 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs @@ -124,7 +124,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs index 843b92bf292a..5484c2ec84ad 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs @@ -124,7 +124,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs index 6c5b747186a0..45da2f7dc94c 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -290,7 +290,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index 167a3ca3ca08..62d913a7c0d7 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -750,39 +750,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Order.cs index fdbd42761576..43827461cc02 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Order.cs @@ -326,7 +326,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Pet.cs index c41e8089199e..41de214278b4 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Pet.cs @@ -304,7 +304,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index c5ce0d81c94c..bda0936c7e46 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1903,27 +1914,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1950,6 +1972,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1960,12 +1984,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1995,6 +2029,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2005,12 +2041,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs index 6ec14fd96b47..3b7c69765ecd 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -227,7 +227,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Zebra.cs index aca440ae51e7..26ed2ec21c31 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/Zebra.cs @@ -231,7 +231,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index 9f3551b916ac..18dfbaafaf8c 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -204,7 +204,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs index 08fa208fa2de..61e9f0c189bc 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs @@ -189,7 +189,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string? petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs index 731ac014c46a..b5df3dc0625e 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -182,7 +182,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string? schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs index 72b95b7f9bc7..4547aa00e1c6 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs @@ -127,7 +127,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs index 4a54203ef920..5c2a73bce3fd 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs @@ -127,7 +127,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs index 6d423bea015c..ec67776ec0a4 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -293,7 +293,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string? justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs index 3e9942c78c35..534039c94588 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs @@ -753,39 +753,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string? enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string? enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs index 471448331e54..c4a7ebd764c5 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs @@ -329,7 +329,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs index 98816089236f..ad57645de2f5 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs @@ -307,7 +307,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option?>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)!); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs index 24e4762bb50b..41a2c79c34d6 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1850,27 +1850,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string? requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1906,27 +1917,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string? notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1953,6 +1975,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1963,12 +1987,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1998,6 +2032,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2008,12 +2044,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs index dc9d2973ebc0..6b0ee1bbe913 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -230,7 +230,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs index 81b4373f459a..3d814ffc0b00 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs @@ -234,7 +234,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string? typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index 9ac00ba18d77..98e4d7afdbfd 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -207,7 +207,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string? zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs index 0e3bb3c8db2d..711470ca3a83 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs @@ -186,7 +186,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs index abd542815ebb..73f65a894734 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -179,7 +179,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs index c06bc34c128a..8abf3f5844d0 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs @@ -124,7 +124,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs index 843b92bf292a..5484c2ec84ad 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs @@ -124,7 +124,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs index bfa3116c544d..e04f4f594f2b 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -290,7 +290,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index 7e4625c98db5..4f4100fc359e 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -750,39 +750,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Order.cs index 371ad4852ccc..76ffea5c5ab4 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Order.cs @@ -326,7 +326,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Pet.cs index 97760fedabd9..cab3ba9dbf6e 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Pet.cs @@ -304,7 +304,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index 99fc5d83a29a..01ceaaae2c51 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1903,27 +1914,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1950,6 +1972,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1960,12 +1984,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1995,6 +2029,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2005,12 +2041,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs index 6ec14fd96b47..3b7c69765ecd 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -227,7 +227,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Zebra.cs index b51c154c8fc4..bc1f99da6d94 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/Zebra.cs @@ -231,7 +231,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index d1421f858355..e8cf530a9235 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -204,7 +204,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs index 0e3bb3c8db2d..711470ca3a83 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs @@ -186,7 +186,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs index abd542815ebb..73f65a894734 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -179,7 +179,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs index c06bc34c128a..8abf3f5844d0 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs @@ -124,7 +124,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs index 843b92bf292a..5484c2ec84ad 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs @@ -124,7 +124,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs index bfa3116c544d..e04f4f594f2b 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -290,7 +290,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index 7e4625c98db5..4f4100fc359e 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -750,39 +750,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Order.cs index 371ad4852ccc..76ffea5c5ab4 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Order.cs @@ -326,7 +326,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Pet.cs index 97760fedabd9..cab3ba9dbf6e 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Pet.cs @@ -304,7 +304,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index 99fc5d83a29a..01ceaaae2c51 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1903,27 +1914,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1950,6 +1972,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1960,12 +1984,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1995,6 +2029,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2005,12 +2041,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs index 6ec14fd96b47..3b7c69765ecd 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -227,7 +227,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Zebra.cs index b51c154c8fc4..bc1f99da6d94 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/Zebra.cs @@ -231,7 +231,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index d1421f858355..e8cf530a9235 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -204,7 +204,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs index 4149798cb872..d99184db6550 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs @@ -188,7 +188,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string? petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs index 9a5f9bca0f4b..77fc65981096 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -181,7 +181,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string? schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs index d6a7e6b5e127..b78ed38fc503 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs @@ -126,7 +126,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs index 773dcab9fbd1..d4c4e6c2273c 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs @@ -126,7 +126,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs index 4637c8c1961c..3bcb6d9b4888 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -292,7 +292,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string? justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs index 16a43b036eac..647002803b89 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs @@ -752,39 +752,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string? enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string? enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs index d27db96b8109..ac6f4585d259 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs @@ -328,7 +328,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs index b0ac59683061..6cd3a02b4296 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs @@ -306,7 +306,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option?>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)!); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs index c16e26e907ee..d1f6c6f40209 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1849,27 +1849,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string? requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1905,27 +1916,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string? notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1952,6 +1974,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1962,12 +1986,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1997,6 +2031,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2007,12 +2043,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs index 106ee25a45fa..c9e049a3db72 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -229,7 +229,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs index 27e6df1e3d03..a871ad34d76d 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs @@ -233,7 +233,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string? typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index 1577e65e4208..5e17279cd925 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -206,7 +206,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string? zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs index afa8ab506db3..aad251c4d9e7 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs @@ -186,7 +186,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs index abd542815ebb..73f65a894734 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -179,7 +179,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs index c06bc34c128a..8abf3f5844d0 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs @@ -124,7 +124,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs index 843b92bf292a..5484c2ec84ad 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs @@ -124,7 +124,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs index 6c5b747186a0..45da2f7dc94c 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -290,7 +290,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index 167a3ca3ca08..62d913a7c0d7 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -750,39 +750,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Order.cs index fdbd42761576..43827461cc02 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Order.cs @@ -326,7 +326,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Pet.cs index c41e8089199e..41de214278b4 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Pet.cs @@ -304,7 +304,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index c5ce0d81c94c..bda0936c7e46 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1903,27 +1914,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1950,6 +1972,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1960,12 +1984,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1995,6 +2029,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2005,12 +2041,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs index 6ec14fd96b47..3b7c69765ecd 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -227,7 +227,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Zebra.cs index aca440ae51e7..26ed2ec21c31 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/Zebra.cs @@ -231,7 +231,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index 9f3551b916ac..18dfbaafaf8c 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -204,7 +204,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs index 08fa208fa2de..61e9f0c189bc 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs @@ -189,7 +189,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string? petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs index 731ac014c46a..b5df3dc0625e 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -182,7 +182,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string? schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs index 72b95b7f9bc7..4547aa00e1c6 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs @@ -127,7 +127,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs index 4a54203ef920..5c2a73bce3fd 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs @@ -127,7 +127,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs index 6d423bea015c..ec67776ec0a4 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -293,7 +293,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string? justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs index 3e9942c78c35..534039c94588 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs @@ -753,39 +753,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string? enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string? enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs index 471448331e54..c4a7ebd764c5 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs @@ -329,7 +329,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs index 98816089236f..ad57645de2f5 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs @@ -307,7 +307,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option?>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)!); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs index 24e4762bb50b..41a2c79c34d6 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1850,27 +1850,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string? requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1906,27 +1917,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string? notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1953,6 +1975,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1963,12 +1987,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1998,6 +2032,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2008,12 +2044,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs index dc9d2973ebc0..6b0ee1bbe913 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -230,7 +230,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs index 81b4373f459a..3d814ffc0b00 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs @@ -234,7 +234,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string? typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index 9ac00ba18d77..98e4d7afdbfd 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -207,7 +207,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string? zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs index 4149798cb872..d99184db6550 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ChildCat.cs @@ -188,7 +188,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string? petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs index 9a5f9bca0f4b..77fc65981096 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -181,7 +181,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string? schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs index d6a7e6b5e127..b78ed38fc503 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant1.cs @@ -126,7 +126,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs index 773dcab9fbd1..d4c4e6c2273c 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Descendant2.cs @@ -126,7 +126,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs index 4637c8c1961c..3bcb6d9b4888 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -292,7 +292,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string? justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs index 16a43b036eac..647002803b89 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/EnumTest.cs @@ -752,39 +752,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string? enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string? enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs index d27db96b8109..ac6f4585d259 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Order.cs @@ -328,7 +328,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs index b0ac59683061..6cd3a02b4296 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Pet.cs @@ -306,7 +306,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option?>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)!); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs index c16e26e907ee..d1f6c6f40209 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1849,27 +1849,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string? requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1905,27 +1916,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string? notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1952,6 +1974,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1962,12 +1986,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1997,6 +2031,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2007,12 +2043,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs index 106ee25a45fa..c9e049a3db72 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -229,7 +229,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs index 27e6df1e3d03..a871ad34d76d 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/Zebra.cs @@ -233,7 +233,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string? typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index 1577e65e4208..5e17279cd925 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -206,7 +206,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string? zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs index afa8ab506db3..aad251c4d9e7 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs @@ -186,7 +186,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs index abd542815ebb..73f65a894734 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -179,7 +179,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs index c06bc34c128a..8abf3f5844d0 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs @@ -124,7 +124,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs index 843b92bf292a..5484c2ec84ad 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs @@ -124,7 +124,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs index 6c5b747186a0..45da2f7dc94c 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -290,7 +290,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index 167a3ca3ca08..62d913a7c0d7 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -750,39 +750,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Order.cs index fdbd42761576..43827461cc02 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Order.cs @@ -326,7 +326,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Pet.cs index c41e8089199e..41de214278b4 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Pet.cs @@ -304,7 +304,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index c5ce0d81c94c..bda0936c7e46 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1903,27 +1914,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1950,6 +1972,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1960,12 +1984,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1995,6 +2029,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2005,12 +2041,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs index 6ec14fd96b47..3b7c69765ecd 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -227,7 +227,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Zebra.cs index aca440ae51e7..26ed2ec21c31 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/Zebra.cs @@ -231,7 +231,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index 9f3551b916ac..18dfbaafaf8c 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -204,7 +204,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs index 08fa208fa2de..61e9f0c189bc 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ChildCat.cs @@ -189,7 +189,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string? petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs index 731ac014c46a..b5df3dc0625e 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -182,7 +182,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string? schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs index 72b95b7f9bc7..4547aa00e1c6 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Descendant1.cs @@ -127,7 +127,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs index 4a54203ef920..5c2a73bce3fd 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Descendant2.cs @@ -127,7 +127,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs index 6d423bea015c..ec67776ec0a4 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -293,7 +293,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string? justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs index 3e9942c78c35..534039c94588 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/EnumTest.cs @@ -753,39 +753,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string? enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string? enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs index 471448331e54..c4a7ebd764c5 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Order.cs @@ -329,7 +329,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs index 98816089236f..ad57645de2f5 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Pet.cs @@ -307,7 +307,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string? statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option?>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)!); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs index 24e4762bb50b..41a2c79c34d6 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1850,27 +1850,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string? requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1906,27 +1917,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string? notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1953,6 +1975,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1963,12 +1987,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1998,6 +2032,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2008,12 +2044,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs index dc9d2973ebc0..6b0ee1bbe913 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -230,7 +230,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string? objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs index 81b4373f459a..3d814ffc0b00 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/Zebra.cs @@ -234,7 +234,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string? typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index 9ac00ba18d77..98e4d7afdbfd 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -207,7 +207,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string? zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs index 0e3bb3c8db2d..711470ca3a83 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ChildCat.cs @@ -186,7 +186,12 @@ public override ChildCat Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "pet_type": string petTypeRawValue = utf8JsonReader.GetString(); if (petTypeRawValue != null) - petType = new Option(ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue)); + { + ChildCat.PetTypeEnum? petTypeValue = ChildCat.PetTypeEnumFromStringOrDefault(petTypeRawValue); + if (petTypeValue == null) + throw new JsonException(); + petType = new Option(petTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs index abd542815ebb..73f65a894734 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/CopyActivity.cs @@ -179,7 +179,12 @@ public override CopyActivity Read(ref Utf8JsonReader utf8JsonReader, Type typeTo case "$schema": string schemaRawValue = utf8JsonReader.GetString(); if (schemaRawValue != null) - schema = new Option(CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue)); + { + CopyActivity.SchemaEnum? schemaValue = CopyActivity.SchemaEnumFromStringOrDefault(schemaRawValue); + if (schemaValue == null) + throw new JsonException(); + schema = new Option(schemaValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs index c06bc34c128a..8abf3f5844d0 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Descendant1.cs @@ -124,7 +124,12 @@ public override Descendant1 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant1.ObjectTypeEnum? objectTypeValue = Descendant1.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs index 843b92bf292a..5484c2ec84ad 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Descendant2.cs @@ -124,7 +124,12 @@ public override Descendant2 Read(ref Utf8JsonReader utf8JsonReader, Type typeToC case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + Descendant2.ObjectTypeEnum? objectTypeValue = Descendant2.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs index bfa3116c544d..e04f4f594f2b 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -290,7 +290,12 @@ public override EnumArrays Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo case "just_symbol": string justSymbolRawValue = utf8JsonReader.GetString(); if (justSymbolRawValue != null) - justSymbol = new Option(EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue)); + { + EnumArrays.JustSymbolEnum? justSymbolValue = EnumArrays.JustSymbolEnumFromStringOrDefault(justSymbolRawValue); + if (justSymbolValue == null) + throw new JsonException(); + justSymbol = new Option(justSymbolValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs index 7e4625c98db5..4f4100fc359e 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -750,39 +750,58 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv case "enum_string_required": string enumStringRequiredRawValue = utf8JsonReader.GetString(); if (enumStringRequiredRawValue != null) - enumStringRequired = new Option(EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue)); + { + EnumTest.EnumStringRequiredEnum? enumStringRequiredValue = EnumTest.EnumStringRequiredEnumFromStringOrDefault(enumStringRequiredRawValue); + if (enumStringRequiredValue == null) + throw new JsonException(); + enumStringRequired = new Option(enumStringRequiredValue); + } break; case "enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumInteger = new Option(null); + else { string enumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerEnum? enumIntegerValue = EnumTest.EnumIntegerEnumFromStringOrDefault(enumIntegerRawValue); - if (enumIntegerValue != null) - enumInteger = new Option(enumIntegerValue); + if (enumIntegerValue == null) + throw new JsonException(); + enumInteger = new Option(enumIntegerValue); } break; case "enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumIntegerOnly = new Option(null); + else { string enumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumIntegerOnlyEnum? enumIntegerOnlyValue = EnumTest.EnumIntegerOnlyEnumFromStringOrDefault(enumIntegerOnlyRawValue); - if (enumIntegerOnlyValue != null) - enumIntegerOnly = new Option(enumIntegerOnlyValue); + if (enumIntegerOnlyValue == null) + throw new JsonException(); + enumIntegerOnly = new Option(enumIntegerOnlyValue); } break; case "enum_number": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + enumNumber = new Option(null); + else { string enumNumberRawValue = utf8JsonReader.GetDouble().ToString(System.Globalization.CultureInfo.InvariantCulture); EnumTest.EnumNumberEnum? enumNumberValue = EnumTest.EnumNumberEnumFromStringOrDefault(enumNumberRawValue); - if (enumNumberValue != null) - enumNumber = new Option(enumNumberValue); + if (enumNumberValue == null) + throw new JsonException(); + enumNumber = new Option(enumNumberValue); } break; case "enum_string": string enumStringRawValue = utf8JsonReader.GetString(); if (enumStringRawValue != null) - enumString = new Option(EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue)); + { + EnumTest.EnumStringEnum? enumStringValue = EnumTest.EnumStringEnumFromStringOrDefault(enumStringRawValue); + if (enumStringValue == null) + throw new JsonException(); + enumString = new Option(enumStringValue); + } break; case "outerEnum": outerEnum = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Order.cs index 371ad4852ccc..76ffea5c5ab4 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Order.cs @@ -326,7 +326,12 @@ public override Order Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Order.StatusEnumFromStringOrDefault(statusRawValue)); + { + Order.StatusEnum? statusValue = Order.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Pet.cs index 97760fedabd9..cab3ba9dbf6e 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Pet.cs @@ -304,7 +304,12 @@ public override Pet Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert, case "status": string statusRawValue = utf8JsonReader.GetString(); if (statusRawValue != null) - status = new Option(Pet.StatusEnumFromStringOrDefault(statusRawValue)); + { + Pet.StatusEnum? statusValue = Pet.StatusEnumFromStringOrDefault(statusRawValue); + if (statusValue == null) + throw new JsonException(); + status = new Option(statusValue); + } break; case "tags": tags = new Option>(JsonSerializer.Deserialize>(ref utf8JsonReader, jsonSerializerOptions)); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs index 99fc5d83a29a..01ceaaae2c51 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -1847,27 +1847,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT requiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "required_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumInteger = new Option(null); + else { string requiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerEnum? requiredNotnullableEnumIntegerValue = RequiredClass.RequiredNotnullableEnumIntegerEnumFromStringOrDefault(requiredNotnullableEnumIntegerRawValue); - if (requiredNotnullableEnumIntegerValue != null) - requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); + if (requiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + requiredNotnullableEnumInteger = new Option(requiredNotnullableEnumIntegerValue); } break; case "required_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + requiredNotnullableEnumIntegerOnly = new Option(null); + else { string requiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNotnullableEnumIntegerOnlyEnum? requiredNotnullableEnumIntegerOnlyValue = RequiredClass.RequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNotnullableEnumIntegerOnlyRawValue); - if (requiredNotnullableEnumIntegerOnlyValue != null) - requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); + if (requiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + requiredNotnullableEnumIntegerOnly = new Option(requiredNotnullableEnumIntegerOnlyValue); } break; case "required_notnullable_enum_string": string requiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (requiredNotnullableEnumStringRawValue != null) - requiredNotnullableEnumString = new Option(RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue)); + { + RequiredClass.RequiredNotnullableEnumStringEnum? requiredNotnullableEnumStringValue = RequiredClass.RequiredNotnullableEnumStringEnumFromStringOrDefault(requiredNotnullableEnumStringRawValue); + if (requiredNotnullableEnumStringValue == null) + throw new JsonException(); + requiredNotnullableEnumString = new Option(requiredNotnullableEnumStringValue); + } break; case "required_notnullable_outerEnumDefaultValue": requiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1903,27 +1914,38 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT notrequiredNotnullableDatetimeProp = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); break; case "notrequired_notnullable_enum_integer": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumInteger = new Option(null); + else { string notrequiredNotnullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerEnum? notrequiredNotnullableEnumIntegerValue = RequiredClass.NotrequiredNotnullableEnumIntegerEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerRawValue); - if (notrequiredNotnullableEnumIntegerValue != null) - notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); + if (notrequiredNotnullableEnumIntegerValue == null) + throw new JsonException(); + notrequiredNotnullableEnumInteger = new Option(notrequiredNotnullableEnumIntegerValue); } break; case "notrequired_notnullable_enum_integer_only": - if (utf8JsonReader.TokenType != JsonTokenType.Null) + if (utf8JsonReader.TokenType == JsonTokenType.Null) + notrequiredNotnullableEnumIntegerOnly = new Option(null); + else { string notrequiredNotnullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnum? notrequiredNotnullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNotnullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNotnullableEnumIntegerOnlyRawValue); - if (notrequiredNotnullableEnumIntegerOnlyValue != null) - notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); + if (notrequiredNotnullableEnumIntegerOnlyValue == null) + throw new JsonException(); + notrequiredNotnullableEnumIntegerOnly = new Option(notrequiredNotnullableEnumIntegerOnlyValue); } break; case "notrequired_notnullable_enum_string": string notrequiredNotnullableEnumStringRawValue = utf8JsonReader.GetString(); if (notrequiredNotnullableEnumStringRawValue != null) - notrequiredNotnullableEnumString = new Option(RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue)); + { + RequiredClass.NotrequiredNotnullableEnumStringEnum? notrequiredNotnullableEnumStringValue = RequiredClass.NotrequiredNotnullableEnumStringEnumFromStringOrDefault(notrequiredNotnullableEnumStringRawValue); + if (notrequiredNotnullableEnumStringValue == null) + throw new JsonException(); + notrequiredNotnullableEnumString = new Option(notrequiredNotnullableEnumStringValue); + } break; case "notrequired_notnullable_outerEnumDefaultValue": notrequiredNotnullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1950,6 +1972,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerEnum? notrequiredNullableEnumIntegerValue = RequiredClass.NotrequiredNullableEnumIntegerEnumFromStringOrDefault(notrequiredNullableEnumIntegerRawValue); + if (notrequiredNullableEnumIntegerValue == null) + throw new JsonException(); notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerValue); } break; @@ -1960,12 +1984,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.NotrequiredNullableEnumIntegerOnlyEnum? notrequiredNullableEnumIntegerOnlyValue = RequiredClass.NotrequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue); + if (notrequiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyValue); } break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + if (notrequiredNullableEnumStringRawValue == null) + notrequiredNullableEnumString = new Option(null); + else + { + RequiredClass.NotrequiredNullableEnumStringEnum? notrequiredNullableEnumStringValue = RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue); + if (notrequiredNullableEnumStringValue == null) + throw new JsonException(); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringValue); + } break; case "notrequired_nullable_outerEnumDefaultValue": notrequiredNullableOuterEnumDefaultValue = new Option(JsonSerializer.Deserialize(ref utf8JsonReader, jsonSerializerOptions)); @@ -1995,6 +2029,8 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerEnum? requiredNullableEnumIntegerValue = RequiredClass.RequiredNullableEnumIntegerEnumFromStringOrDefault(requiredNullableEnumIntegerRawValue); + if (requiredNullableEnumIntegerValue == null) + throw new JsonException(); requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerValue); } break; @@ -2005,12 +2041,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT { string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetInt32().ToString(System.Globalization.CultureInfo.InvariantCulture); RequiredClass.RequiredNullableEnumIntegerOnlyEnum? requiredNullableEnumIntegerOnlyValue = RequiredClass.RequiredNullableEnumIntegerOnlyEnumFromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue); + if (requiredNullableEnumIntegerOnlyValue == null) + throw new JsonException(); requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyValue); } break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + if (requiredNullableEnumStringRawValue == null) + requiredNullableEnumString = new Option(null); + else + { + RequiredClass.RequiredNullableEnumStringEnum? requiredNullableEnumStringValue = RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue); + if (requiredNullableEnumStringValue == null) + throw new JsonException(); + requiredNullableEnumString = new Option(requiredNullableEnumStringValue); + } break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs index 6ec14fd96b47..3b7c69765ecd 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/TestDescendants.cs @@ -227,7 +227,12 @@ public override TestDescendants Read(ref Utf8JsonReader utf8JsonReader, Type typ case "objectType": string objectTypeRawValue = utf8JsonReader.GetString(); if (objectTypeRawValue != null) - objectType = new Option(TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue)); + { + TestDescendants.ObjectTypeEnum? objectTypeValue = TestDescendants.ObjectTypeEnumFromStringOrDefault(objectTypeRawValue); + if (objectTypeValue == null) + throw new JsonException(); + objectType = new Option(objectTypeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Zebra.cs index b51c154c8fc4..bc1f99da6d94 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Zebra.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/Zebra.cs @@ -231,7 +231,12 @@ public override Zebra Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert case "type": string typeRawValue = utf8JsonReader.GetString(); if (typeRawValue != null) - type = new Option(Zebra.TypeEnumFromStringOrDefault(typeRawValue)); + { + Zebra.TypeEnum? typeValue = Zebra.TypeEnumFromStringOrDefault(typeRawValue); + if (typeValue == null) + throw new JsonException(); + type = new Option(typeValue); + } break; default: break; diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs index d1421f858355..e8cf530a9235 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs @@ -204,7 +204,12 @@ public override ZeroBasedEnumClass Read(ref Utf8JsonReader utf8JsonReader, Type case "ZeroBasedEnum": string zeroBasedEnumRawValue = utf8JsonReader.GetString(); if (zeroBasedEnumRawValue != null) - zeroBasedEnum = new Option(ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue)); + { + ZeroBasedEnumClass.ZeroBasedEnumEnum? zeroBasedEnumValue = ZeroBasedEnumClass.ZeroBasedEnumEnumFromStringOrDefault(zeroBasedEnumRawValue); + if (zeroBasedEnumValue == null) + throw new JsonException(); + zeroBasedEnum = new Option(zeroBasedEnumValue); + } break; default: break;