[csharp] Fixed nullability of composed schemas (#18408)

* fixed nullability * minor refactor to address a comment
OpenAPITools · Apr 21, 2024 · 6568bc5 · 6568bc5
1 parent c8e835c
commit 6568bc5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.../openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache b/.../openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
@@ -300,14 +300,14 @@
 
             {{/-last}}
             {{/required}}
-            return new {{classname}}({{#lambda.joinWithComma}}{{#model.composedSchemas.anyOf}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}ParsedValue{{#required}}.Value{{^isNullable}}{{#vendorExtensions.x-is-value-type}}{{nrt!}}.Value{{nrt!}}{{/vendorExtensions.x-is-value-type}}{{/isNullable}}{{/required}}  {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#required}}.Value{{nrt!}}{{^isNullable}}{{#vendorExtensions.x-is-value-type}}.Value{{nrt!}}{{/vendorExtensions.x-is-value-type}}{{/isNullable}}{{/required}}  {{/allVars}}{{/lambda.joinWithComma}});
+            return new {{classname}}({{#lambda.joinWithComma}}{{#model.composedSchemas.anyOf}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}ParsedValue{{#required}}.Value{{#vendorExtensions.x-is-value-type}}{{nrt!}}.Value{{nrt!}}{{/vendorExtensions.x-is-value-type}}{{/required}}  {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#required}}.Value{{nrt!}}{{^isNullable}}{{#vendorExtensions.x-is-value-type}}.Value{{nrt!}}{{/vendorExtensions.x-is-value-type}}{{/isNullable}}{{/required}}  {{/allVars}}{{/lambda.joinWithComma}});
             {{/composedSchemas.oneOf}}
             {{^model.discriminator}}
             {{#composedSchemas}}
             {{#oneOf}}
             {{^vendorExtensions.x-duplicated-data-type}}
             if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} != null)
-                return new {{classname}}({{#lambda.joinWithComma}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}}  {{#model.composedSchemas.anyOf}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}}  {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#required}}ParsedValue{{/required}}  {{/allVars}}{{/lambda.joinWithComma}});
+                return new {{classname}}({{#lambda.joinWithComma}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#vendorExtensions.x-is-value-type}}.Value{{/vendorExtensions.x-is-value-type}}  {{#model.composedSchemas.anyOf}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#vendorExtensions.x-is-value-type}}{{^isNullable}}.Value{{/isNullable}}{{/vendorExtensions.x-is-value-type}}  {{/model.composedSchemas.anyOf}}{{#allVars}}{{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}}{{#required}}ParsedValue{{/required}}  {{/allVars}}{{/lambda.joinWithComma}});
 
             {{/vendorExtensions.x-duplicated-data-type}}
             {{#-last}}

diff --git a/...tore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/...tore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
@@ -195,7 +195,7 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type
             }
 
             if (varBool != null)
-                return new PolymorphicProperty(varBool);
+                return new PolymorphicProperty(varBool.Value);
 
             if (varString != null)
                 return new PolymorphicProperty(varString);

diff --git a/...arp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/...arp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
@@ -197,7 +197,7 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type
             }
 
             if (varBool != null)
-                return new PolymorphicProperty(varBool);
+                return new PolymorphicProperty(varBool.Value);
 
             if (varString != null)
                 return new PolymorphicProperty(varString);

diff --git a/...tstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/...tstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
@@ -195,7 +195,7 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type
             }
 
             if (varBool != null)
-                return new PolymorphicProperty(varBool);
+                return new PolymorphicProperty(varBool.Value);
 
             if (varString != null)
                 return new PolymorphicProperty(varString);

diff --git a/...sharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/...sharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
@@ -198,7 +198,7 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type
             }
 
             if (varBool != null)
-                return new PolymorphicProperty(varBool);
+                return new PolymorphicProperty(varBool.Value);
 
             if (varString != null)
                 return new PolymorphicProperty(varString);

diff --git a/...csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/...csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
@@ -195,7 +195,7 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type
             }
 
             if (varBool != null)
-                return new PolymorphicProperty(varBool);
+                return new PolymorphicProperty(varBool.Value);
 
             if (varString != null)
                 return new PolymorphicProperty(varString);