loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

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

Browse Source 
* fixed nullability

* minor refactor to address a comment
This commit is contained in:
devhl-labs 2024-04-21 11:47:43 -04:00 committed by GitHub
parent c8e835cac7
commit 6568bc54a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache vendored
View File

@ -300,14 +300,14 @@
{{/-last}} {{/-last}}
{{/required}} {{/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}} {{/composedSchemas.oneOf}}
{{^model.discriminator}} {{^model.discriminator}}
{{#composedSchemas}} {{#composedSchemas}}
{{#oneOf}} {{#oneOf}}
{{^vendorExtensions.x-duplicated-data-type}} {{^vendorExtensions.x-duplicated-data-type}}
if ({{#lambda.camelcase_sanitize_param}}{{name}}{{/lambda.camelcase_sanitize_param}} != null) 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}} {{/vendorExtensions.x-duplicated-data-type}}
{{#-last}} {{#-last}}

2
samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
View File

@ -195,7 +195,7 @@ namespace Org.OpenAPITools.Model
} }
if (varBool != null) if (varBool != null)
return new PolymorphicProperty(varBool); return new PolymorphicProperty(varBool.Value);
if (varString != null) if (varString != null)
return new PolymorphicProperty(varString); return new PolymorphicProperty(varString);

2
samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
View File

@ -197,7 +197,7 @@ namespace Org.OpenAPITools.Model
} }
if (varBool != null) if (varBool != null)
return new PolymorphicProperty(varBool); return new PolymorphicProperty(varBool.Value);
if (varString != null) if (varString != null)
return new PolymorphicProperty(varString); return new PolymorphicProperty(varString);

2
samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
View File

@ -195,7 +195,7 @@ namespace Org.OpenAPITools.Model
} }
if (varBool != null) if (varBool != null)
return new PolymorphicProperty(varBool); return new PolymorphicProperty(varBool.Value);
if (varString != null) if (varString != null)
return new PolymorphicProperty(varString); return new PolymorphicProperty(varString);

2
samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
View File

@ -198,7 +198,7 @@ namespace Org.OpenAPITools.Model
} }
if (varBool != null) if (varBool != null)
return new PolymorphicProperty(varBool); return new PolymorphicProperty(varBool.Value);
if (varString != null) if (varString != null)
return new PolymorphicProperty(varString); return new PolymorphicProperty(varString);

2
samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
View File

@ -195,7 +195,7 @@ namespace Org.OpenAPITools.Model
} }
if (varBool != null) if (varBool != null)
return new PolymorphicProperty(varBool); return new PolymorphicProperty(varBool.Value);
if (varString != null) if (varString != null)
return new PolymorphicProperty(varString); return new PolymorphicProperty(varString);