From c6877947acf6e3826da5e7f628c6b02acd2ddbb6 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sat, 8 Jul 2023 22:26:59 -0400 Subject: [PATCH] removed a warning (#16037) --- .../languages/AbstractCSharpCodegen.java | 22 +++++++++---------- .../generichost/JsonConverter.mustache | 2 +- .../Model/PolymorphicProperty.cs | 6 ++--- .../Model/PolymorphicProperty.cs | 6 ++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index b537b0ee0c5..901a057f789 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -540,6 +540,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co if (allOf != null) { for(CodegenProperty property : allOf) { property.name = patchPropertyName(model, property.baseType); + patchPropertyVendorExtensinos(property); } } @@ -549,6 +550,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co for(CodegenProperty property : anyOf) { property.name = patchPropertyName(model, property.baseType); property.isNullable = true; + patchPropertyVendorExtensinos(property); } } @@ -558,6 +560,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co for(CodegenProperty property : oneOf) { property.name = patchPropertyName(model, property.baseType); property.isNullable = true; + patchPropertyVendorExtensinos(property); } } } @@ -632,6 +635,13 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co return value; } + private void patchPropertyVendorExtensinos(CodegenProperty property) { + Boolean isValueType = isValueType(property); + property.vendorExtensions.put("x-is-value-type", isValueType); + property.vendorExtensions.put("x-is-reference-type", !isValueType); + property.vendorExtensions.put("x-is-nullable-type", this.getNullableReferencesTypes() || isValueType); + } + protected void patchProperty(Map enumRefs, CodegenModel model, CodegenProperty property) { if (enumRefs.containsKey(property.dataType)) { // Handle any enum properties referred to by $ref. @@ -645,17 +655,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co property.isPrimitiveType = true; } - Boolean isValueType = isValueType(property); - - property.vendorExtensions.put("x-is-value-type", isValueType); - - if (property.isNullable && !property.isContainer && isValueType) { - property.vendorExtensions.put("x-nullable-value-type", true); - } - - if (this.getNullableReferencesTypes() || isValueType) { - property.vendorExtensions.put("x-nullable-type", true); - } + patchPropertyVendorExtensinos(property); String tmpPropertyName = escapeReservedWord(model, property.name); property.name = patchPropertyName(model, property.name); 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 cf850596572..73c8b4dff3d 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 @@ -38,7 +38,7 @@ JsonTokenType startingTokenType = utf8JsonReader.TokenType; {{#allVars}} - {{#isInnerEnum}}{{^isMap}}{{classname}}.{{/isMap}}{{/isInnerEnum}}{{#nrt}}{{#lambda.optional}}{{{datatypeWithEnum}}}{{/lambda.optional}}{{/nrt}}{{^nrt}}{{{datatypeWithEnum}}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = default; + {{#isInnerEnum}}{{^isMap}}{{classname}}.{{/isMap}}{{/isInnerEnum}}{{{datatypeWithEnum}}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = default; {{#-last}} {{/-last}} diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index 12a84ed4672..82846ccdd0d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -77,7 +77,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets VarBool /// - public bool VarBool { get; set; } + public bool? VarBool { get; set; } /// /// Gets or Sets VarString @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - bool varBool = default; + bool? varBool = default; string varString = default; Object varObject = default; List list = default; @@ -163,7 +163,7 @@ namespace Org.OpenAPITools.Model if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) { Utf8JsonReader utf8JsonReaderVarBool = utf8JsonReader; - OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarBool, jsonSerializerOptions, out varBool); + OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarBool, jsonSerializerOptions, out varBool); Utf8JsonReader utf8JsonReaderVarString = utf8JsonReader; OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarString, jsonSerializerOptions, out varString); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index 12a84ed4672..82846ccdd0d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -77,7 +77,7 @@ namespace Org.OpenAPITools.Model /// /// Gets or Sets VarBool /// - public bool VarBool { get; set; } + public bool? VarBool { get; set; } /// /// Gets or Sets VarString @@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Model JsonTokenType startingTokenType = utf8JsonReader.TokenType; - bool varBool = default; + bool? varBool = default; string varString = default; Object varObject = default; List list = default; @@ -163,7 +163,7 @@ namespace Org.OpenAPITools.Model if (utf8JsonReaderOneOf.TokenType == JsonTokenType.PropertyName && currentDepth == utf8JsonReaderOneOf.CurrentDepth - 1) { Utf8JsonReader utf8JsonReaderVarBool = utf8JsonReader; - OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarBool, jsonSerializerOptions, out varBool); + OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarBool, jsonSerializerOptions, out varBool); Utf8JsonReader utf8JsonReaderVarString = utf8JsonReader; OpenAPIClientUtils.TryDeserialize(ref utf8JsonReaderVarString, jsonSerializerOptions, out varString);