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

devhl-labs · web-flow · commit 6568bc54a5c0 · 2024-04-21T23:47:43.000+08:00
* fixed nullability

* minor refactor to address a comment
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
@@ -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/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/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/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/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/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/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/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/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/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/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);

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`if (varBool != null)`
`198`		`- return new PolymorphicProperty(varBool);`
	`198`	`+ return new PolymorphicProperty(varBool.Value);`
`199`	`199`
`200`	`200`	`if (varString != null)`
`201`	`201`	`return new PolymorphicProperty(varString);`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`if (varBool != null)`
`200`		`- return new PolymorphicProperty(varBool);`
	`200`	`+ return new PolymorphicProperty(varBool.Value);`
`201`	`201`
`202`	`202`	`if (varString != null)`
`203`	`203`	`return new PolymorphicProperty(varString);`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`if (varBool != null)`
`201`		`- return new PolymorphicProperty(varBool);`
	`201`	`+ return new PolymorphicProperty(varBool.Value);`
`202`	`202`
`203`	`203`	`if (varString != null)`
`204`	`204`	`return new PolymorphicProperty(varString);`