From 14589964e304f6eded5589825794c93874c92dc6 Mon Sep 17 00:00:00 2001 From: Bernhard Danecker Date: Sun, 31 May 2026 15:44:41 +0200 Subject: [PATCH] [csharp][generichost] Deserialize present-but-null nullable enums MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For a property that is both `required` and `nullable` with an enum type, the generated JsonConverter only assigned the backing Option when the raw JSON string was non-null. An explicit `null` therefore left the Option unset, and the required-property check then threw `ArgumentException: Property is required` — even though the property was present (just null). Assign the Option unconditionally for nullable enums, mapping a null raw value to a null enum value. Non-nullable enums keep the existing guard, so their generated output is unchanged. Regenerated all generichost samples. Adds CSharpClientCodegenTest#testGenericHostNullableEnumDeserializesPresentNull, which generates the generichost client and asserts the RequiredClass converter uses the null-tolerant read for the required+nullable enum while the non-nullable enum keeps the guard. --- .../generichost/JsonConverter.mustache | 11 +++++++ .../CSharpClientCodegenTest.java | 33 +++++++++++++++++++ .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 24 +++++--------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 24 +++++--------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 24 +++++--------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 24 +++++--------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 24 +++++--------- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- .../src/Org.OpenAPITools/Model/EnumTest.cs | 3 +- .../Org.OpenAPITools/Model/RequiredClass.cs | 12 +++---- 38 files changed, 154 insertions(+), 220 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 469a22eabec3..d8e203b3f1ee 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 @@ -230,13 +230,24 @@ {{/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. }} {{^isInnerEnum}} + {{#isNullable}} + {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue == null ? null : {{{datatypeWithEnum}}}ValueConverter.FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue)); + {{/isNullable}} + {{^isNullable}} if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue != null) {{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} = {{>OptionProperty}}{{{datatypeWithEnum}}}ValueConverter.FromStringOrDefault({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}RawValue)); + {{/isNullable}} {{/isInnerEnum}} {{#isInnerEnum}} + {{#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)); + {{/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}} {{/isInnerEnum}} {{/isNumeric}} {{/isMap}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java index 86ae543e259e..a8c077a010e9 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 @@ -40,6 +40,39 @@ 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. + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + final OpenAPI openAPI = TestUtils.parseFlattenSpec( + "src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml"); + final DefaultGenerator defaultGenerator = new DefaultGenerator(); + final ClientOptInput clientOptInput = new ClientOptInput(); + clientOptInput.openAPI(openAPI); + CSharpClientCodegen cSharpClientCodegen = new CSharpClientCodegen(); + cSharpClientCodegen.setLibrary("generichost"); + cSharpClientCodegen.setOutputDir(output.getAbsolutePath()); + clientOptInput.config(cSharpClientCodegen); + defaultGenerator.opts(clientOptInput); + + Map files = defaultGenerator.generate().stream() + .collect(Collectors.toMap(File::getPath, Function.identity())); + + 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)"); + } + @Test public void testToEnumVarName() { final CSharpClientCodegen codegen = new CSharpClientCodegen(); 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 e3df927288aa..b02af9d45a7d 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 @@ -753,8 +753,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string? outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string? outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 90cc8a79dbc2..8c29515e2495 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 @@ -1915,13 +1915,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string? notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1949,16 +1947,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string? requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs index 24a5199c418b..2de2f5e8414e 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs @@ -281,8 +281,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs index 4349b036fca6..ef0b4ec5b61c 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -845,23 +845,19 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_integer": string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumIntegerRawValue != null) - notrequiredNullableEnumInteger = new Option(RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue)); + notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue)); break; case "notrequired_nullable_enum_integer_only": string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumIntegerOnlyRawValue != null) - notrequiredNullableEnumIntegerOnly = new Option(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue)); + notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue)); break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -883,26 +879,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_integer": string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumIntegerRawValue != null) - requiredNullableEnumInteger = new Option(RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(requiredNullableEnumIntegerRawValue)); + requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(requiredNullableEnumIntegerRawValue)); break; case "required_nullable_enum_integer_only": string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumIntegerOnlyRawValue != null) - requiredNullableEnumIntegerOnly = new Option(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue)); + requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue)); break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 725176ac17b0..59ba1f3cb315 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 @@ -761,8 +761,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string? outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string? outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 bf412bd89d85..5ddee451238a 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 @@ -1923,13 +1923,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string? notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1957,16 +1955,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string? requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 223a76a6ca96..1c8fffd9a77e 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 @@ -759,8 +759,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 15bbd1627186..d3d362f0d9bc 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 @@ -1921,13 +1921,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1955,16 +1953,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 ba1daad0bdc1..a187932be20f 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 @@ -762,8 +762,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string? outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string? outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 cfc639eb6e8c..2da0cf88c16f 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 @@ -1924,13 +1924,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string? notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1958,16 +1956,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string? requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs index 1f6bce32e98f..7de18e33bc27 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs @@ -281,8 +281,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs index 6f08aff08b92..14484cb58e83 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -845,23 +845,19 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_integer": string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumIntegerRawValue != null) - notrequiredNullableEnumInteger = new Option(RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue)); + notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue)); break; case "notrequired_nullable_enum_integer_only": string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumIntegerOnlyRawValue != null) - notrequiredNullableEnumIntegerOnly = new Option(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue)); + notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue)); break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -883,26 +879,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_integer": string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumIntegerRawValue != null) - requiredNullableEnumInteger = new Option(RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(requiredNullableEnumIntegerRawValue)); + requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(requiredNullableEnumIntegerRawValue)); break; case "required_nullable_enum_integer_only": string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumIntegerOnlyRawValue != null) - requiredNullableEnumIntegerOnly = new Option(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue)); + requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue)); break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 4e1990b650f9..f404d6065a29 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 @@ -759,8 +759,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 8354a7779b79..2667f2de331b 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 @@ -1921,13 +1921,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1955,16 +1953,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs index 1f6bce32e98f..7de18e33bc27 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs @@ -281,8 +281,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs index 6f08aff08b92..14484cb58e83 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -845,23 +845,19 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_integer": string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumIntegerRawValue != null) - notrequiredNullableEnumInteger = new Option(RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue)); + notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue)); break; case "notrequired_nullable_enum_integer_only": string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumIntegerOnlyRawValue != null) - notrequiredNullableEnumIntegerOnly = new Option(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue)); + notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue)); break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -883,26 +879,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_integer": string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumIntegerRawValue != null) - requiredNullableEnumInteger = new Option(RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(requiredNullableEnumIntegerRawValue)); + requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(requiredNullableEnumIntegerRawValue)); break; case "required_nullable_enum_integer_only": string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumIntegerOnlyRawValue != null) - requiredNullableEnumIntegerOnly = new Option(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue)); + requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue)); break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 4e1990b650f9..f404d6065a29 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 @@ -759,8 +759,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 8354a7779b79..2667f2de331b 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 @@ -1921,13 +1921,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1955,16 +1953,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs index 24a5199c418b..2de2f5e8414e 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs @@ -281,8 +281,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs index 4349b036fca6..ef0b4ec5b61c 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -845,23 +845,19 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_integer": string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumIntegerRawValue != null) - notrequiredNullableEnumInteger = new Option(RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue)); + notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue)); break; case "notrequired_nullable_enum_integer_only": string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumIntegerOnlyRawValue != null) - notrequiredNullableEnumIntegerOnly = new Option(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue)); + notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue)); break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -883,26 +879,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_integer": string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumIntegerRawValue != null) - requiredNullableEnumInteger = new Option(RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(requiredNullableEnumIntegerRawValue)); + requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(requiredNullableEnumIntegerRawValue)); break; case "required_nullable_enum_integer_only": string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumIntegerOnlyRawValue != null) - requiredNullableEnumIntegerOnly = new Option(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue)); + requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue)); break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 725176ac17b0..59ba1f3cb315 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 @@ -761,8 +761,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string? outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string? outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 bf412bd89d85..5ddee451238a 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 @@ -1923,13 +1923,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string? notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1957,16 +1955,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string? requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 223a76a6ca96..1c8fffd9a77e 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 @@ -759,8 +759,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 15bbd1627186..d3d362f0d9bc 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 @@ -1921,13 +1921,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1955,16 +1953,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 ba1daad0bdc1..a187932be20f 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 @@ -762,8 +762,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string? outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string? outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 cfc639eb6e8c..2da0cf88c16f 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 @@ -1924,13 +1924,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string? notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1958,16 +1956,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string? requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs index 24a5199c418b..2de2f5e8414e 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/EnumTest.cs @@ -281,8 +281,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs index 4349b036fca6..ef0b4ec5b61c 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Model/RequiredClass.cs @@ -845,23 +845,19 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_integer": string notrequiredNullableEnumIntegerRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumIntegerRawValue != null) - notrequiredNullableEnumInteger = new Option(RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue)); + notrequiredNullableEnumInteger = new Option(notrequiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerRawValue)); break; case "notrequired_nullable_enum_integer_only": string notrequiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumIntegerOnlyRawValue != null) - notrequiredNullableEnumIntegerOnly = new Option(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue)); + notrequiredNullableEnumIntegerOnly = new Option(notrequiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(notrequiredNullableEnumIntegerOnlyRawValue)); break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -883,26 +879,22 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_integer": string requiredNullableEnumIntegerRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumIntegerRawValue != null) - requiredNullableEnumInteger = new Option(RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(requiredNullableEnumIntegerRawValue)); + requiredNullableEnumInteger = new Option(requiredNullableEnumIntegerRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerValueConverter.FromStringOrDefault(requiredNullableEnumIntegerRawValue)); break; case "required_nullable_enum_integer_only": string requiredNullableEnumIntegerOnlyRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumIntegerOnlyRawValue != null) - requiredNullableEnumIntegerOnly = new Option(RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue)); + requiredNullableEnumIntegerOnly = new Option(requiredNullableEnumIntegerOnlyRawValue == null ? null : RequiredClassRequiredNullableEnumIntegerOnlyValueConverter.FromStringOrDefault(requiredNullableEnumIntegerOnlyRawValue)); break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClassRequiredNullableEnumStringValueConverter.FromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 725176ac17b0..59ba1f3cb315 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 @@ -761,8 +761,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string? outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string? outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 bf412bd89d85..5ddee451238a 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 @@ -1923,13 +1923,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string? notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1957,16 +1955,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string? requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 223a76a6ca96..1c8fffd9a77e 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 @@ -759,8 +759,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 15bbd1627186..d3d362f0d9bc 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 @@ -1921,13 +1921,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1955,16 +1953,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 ba1daad0bdc1..a187932be20f 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 @@ -762,8 +762,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string? outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string? outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 cfc639eb6e8c..2da0cf88c16f 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 @@ -1924,13 +1924,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string? notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string? notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1958,16 +1956,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string? requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string? requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString()); 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 4e1990b650f9..f404d6065a29 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 @@ -759,8 +759,7 @@ public override EnumTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv break; case "outerEnum": string outerEnumRawValue = utf8JsonReader.GetString(); - if (outerEnumRawValue != null) - outerEnum = new Option(OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); + outerEnum = new Option(outerEnumRawValue == null ? null : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue)); break; case "outerEnumDefaultValue": string outerEnumDefaultValueRawValue = utf8JsonReader.GetString(); 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 8354a7779b79..2667f2de331b 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 @@ -1921,13 +1921,11 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "notrequired_nullable_enum_string": string notrequiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableEnumStringRawValue != null) - notrequiredNullableEnumString = new Option(RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); + notrequiredNullableEnumString = new Option(notrequiredNullableEnumStringRawValue == null ? null : RequiredClass.NotrequiredNullableEnumStringEnumFromStringOrDefault(notrequiredNullableEnumStringRawValue)); break; case "notrequired_nullable_outerEnumDefaultValue": string notrequiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (notrequiredNullableOuterEnumDefaultValueRawValue != null) - notrequiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); + notrequiredNullableOuterEnumDefaultValue = new Option(notrequiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(notrequiredNullableOuterEnumDefaultValueRawValue)); break; case "notrequired_nullable_string_prop": notrequiredNullableStringProp = new Option(utf8JsonReader.GetString()); @@ -1955,16 +1953,14 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT break; case "required_nullable_enum_string": string requiredNullableEnumStringRawValue = utf8JsonReader.GetString(); - if (requiredNullableEnumStringRawValue != null) - requiredNullableEnumString = new Option(RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); + requiredNullableEnumString = new Option(requiredNullableEnumStringRawValue == null ? null : RequiredClass.RequiredNullableEnumStringEnumFromStringOrDefault(requiredNullableEnumStringRawValue)); break; case "required_nullable_integer_prop": requiredNullableIntegerProp = new Option(utf8JsonReader.TokenType == JsonTokenType.Null ? (int?)null : utf8JsonReader.GetInt32()); break; case "required_nullable_outerEnumDefaultValue": string requiredNullableOuterEnumDefaultValueRawValue = utf8JsonReader.GetString(); - if (requiredNullableOuterEnumDefaultValueRawValue != null) - requiredNullableOuterEnumDefaultValue = new Option(OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); + requiredNullableOuterEnumDefaultValue = new Option(requiredNullableOuterEnumDefaultValueRawValue == null ? null : OuterEnumDefaultValueValueConverter.FromStringOrDefault(requiredNullableOuterEnumDefaultValueRawValue)); break; case "required_nullable_string_prop": requiredNullableStringProp = new Option(utf8JsonReader.GetString());