fix build error

OpenAPITools · Dec 30, 2023 · cb9e68e · cb9e68e
1 parent 8cb0da6
commit cb9e68e
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 33 deletions.
diff --git a/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -1773,7 +1773,7 @@ protected boolean isValueType(CodegenProperty var) {
 
     protected boolean useNet60OrLater() { return false; }
 
-    private boolean useDateOnly() {
+    protected boolean useDateOnly() {
         return useNet60OrLater() && !useDateTimeForDateFlag;
     }
 

diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -114,6 +114,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     protected boolean supportsAsync = Boolean.TRUE;
     protected boolean netStandard = Boolean.FALSE;
     protected boolean supportsFileParameters = Boolean.TRUE;
+    protected boolean supportsDateOnly = Boolean.FALSE;
 
     protected boolean validatable = Boolean.TRUE;
     protected boolean equatable = Boolean.FALSE;
@@ -791,6 +792,7 @@ public void processOpts() {
         syncBooleanProperty(additionalProperties, CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, this::setUseOneOfDiscriminatorLookup, this.useOneOfDiscriminatorLookup);
         syncBooleanProperty(additionalProperties, "supportsFileParameters", this::setSupportsFileParameters, this.supportsFileParameters);
         syncBooleanProperty(additionalProperties, "useSourceGeneration", this::setUseSourceGeneration, this.useSourceGeneration);
+        syncBooleanProperty(additionalProperties, "supportsDateOnly", this::setSupportsDateOnly, this.supportsDateOnly);
 
         final String testPackageName = testPackageName();
         String packageFolder = sourceFolder + File.separator + packageName;
@@ -852,6 +854,10 @@ public void processOpts() {
             }
         }
 
+        if (useDateOnly()) {
+            setSupportsDateOnly(true);
+            additionalProperties.put("supportsDateOnly", true);
+        }
         // include the spec in the output
         supportingFiles.add(new SupportingFile("openapi.mustache", "api", "openapi.yaml"));
 
@@ -1101,6 +1107,10 @@ public void setSupportsFileParameters(Boolean supportsFileParameters) {
         this.supportsFileParameters = supportsFileParameters;
     }
 
+    public void setSupportsDateOnly(Boolean supportsDateOnly) {
+        this.supportsDateOnly = supportsDateOnly;
+    }
+
     public void setSupportsRetry(Boolean supportsRetry) {
         this.supportsRetry = supportsRetry;
     }

diff --git a/.../openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache b/.../openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
@@ -208,7 +208,7 @@
                         {{/isNumeric}}
                         {{#isDate}}
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{>OptionProperty}}JsonSerializer.Deserialize<DateTime{{#isNullable}}?{{/isNullable}}>(ref utf8JsonReader, jsonSerializerOptions));
+                                {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{>OptionProperty}}JsonSerializer.Deserialize<{{#supportsDateOnly}}DateOnly{{/supportsDateOnly}}{{^supportsDateOnly}}DateTime{{/supportsDateOnly}}{{#isNullable}}?{{/isNullable}}>(ref utf8JsonReader, jsonSerializerOptions));
                         {{/isDate}}
                         {{#isDateTime}}
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -577,4 +577,4 @@
             {{/lambda.trimLineBreaks}}
             {{/lambda.trimTrailingWithNewLine}}
         }
-    }
+    }
diff --git a/...enerator/src/main/resources/csharp/libraries/generichost/SourceGenerationContext.mustache b/...enerator/src/main/resources/csharp/libraries/generichost/SourceGenerationContext.mustache
@@ -1,9 +1,8 @@
 {{#useSourceGeneration}}
-
     /// <summary>
     /// The {{classname}}SerializationContext
     /// </summary>
     [JsonSourceGenerationOptions(WriteIndented = true, GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)]
     [JsonSerializable(typeof({{classname}}))]
     {{>visibility}} partial class {{classname}}SerializationContext : JsonSerializerContext { }
-{{/useSourceGeneration}}
+{{/useSourceGeneration}}
diff --git a/...generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DateOnlyClass.cs b/...generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/DateOnlyClass.cs
@@ -136,7 +136,7 @@ public override DateOnlyClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                     {
                         case "dateOnlyProperty":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateOnlyProperty = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateOnlyProperty = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         default:
                             break;

diff --git a/...ent-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/EnumClass.cs b/...ent-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/EnumClass.cs
@@ -189,7 +189,6 @@ public override void Write(Utf8JsonWriter writer, EnumClass? enumClass, JsonSeri
         }
     }
 
-
     /// <summary>
     /// The EnumClassSerializationContext
     /// </summary>

diff --git a/...nt-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs b/...nt-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/FormatTest.cs
@@ -552,7 +552,7 @@ public override FormatTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo
                             break;
                         case "date":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                date = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                date = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "number":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)

diff --git a/...generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableClass.cs b/...generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/NullableClass.cs
@@ -343,7 +343,7 @@ public override NullableClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "datetime_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)

diff --git a/...ent-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnum.cs b/...ent-generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnum.cs
@@ -189,7 +189,6 @@ public override void Write(Utf8JsonWriter writer, OuterEnum? outerEnum, JsonSeri
         }
     }
 
-
     /// <summary>
     /// The OuterEnumSerializationContext
     /// </summary>

diff --git a/...ost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumDefaultValue.cs b/...ost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumDefaultValue.cs
@@ -189,7 +189,6 @@ public override void Write(Utf8JsonWriter writer, OuterEnumDefaultValue? outerEn
         }
     }
 
-
     /// <summary>
     /// The OuterEnumDefaultValueSerializationContext
     /// </summary>

diff --git a/...erichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumInteger.cs b/...erichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumInteger.cs
@@ -180,7 +180,6 @@ public override void Write(Utf8JsonWriter writer, OuterEnumInteger? outerEnumInt
         }
     }
 
-
     /// <summary>
     /// The OuterEnumIntegerSerializationContext
     /// </summary>

diff --git a/...6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumIntegerDefaultValue.cs b/...6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumIntegerDefaultValue.cs
@@ -180,7 +180,6 @@ public override void Write(Utf8JsonWriter writer, OuterEnumIntegerDefaultValue?
         }
     }
 
-
     /// <summary>
     /// The OuterEnumIntegerDefaultValueSerializationContext
     /// </summary>

diff --git a/...generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumTest.cs b/...generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/OuterEnumTest.cs
@@ -259,7 +259,6 @@ public override void Write(Utf8JsonWriter writer, OuterEnumTest? outerEnumTest,
         }
     }
 
-
     /// <summary>
     /// The OuterEnumTestSerializationContext
     /// </summary>

diff --git a/...generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RequiredClass.cs b/...generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/RequiredClass.cs
@@ -1829,7 +1829,7 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                     {
                         case "required_not_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                requiredNotNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                requiredNotNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "required_notnullable_array_of_string":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1882,7 +1882,7 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "required_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                requiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                requiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "required_nullable_datetime_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1919,15 +1919,15 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "not_required_notnullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                notRequiredNotnullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                notRequiredNotnullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "not_required_notnullableinteger_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
                                 notRequiredNotnullableintegerProp = new Option<int?>(utf8JsonReader.GetInt32());
                             break;
                         case "not_required_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                notRequiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                notRequiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "not_required_nullable_integer_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)

diff --git a/...generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ZeroBasedEnum.cs b/...generichost-net6.0-nrt-useSourceGeneration/src/UseSourceGeneration/Model/ZeroBasedEnum.cs
@@ -175,7 +175,6 @@ public override void Write(Utf8JsonWriter writer, ZeroBasedEnum? zeroBasedEnum,
         }
     }
 
-
     /// <summary>
     /// The ZeroBasedEnumSerializationContext
     /// </summary>

diff --git a/...e/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/...e/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs
@@ -135,7 +135,7 @@ public override DateOnlyClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                     {
                         case "dateOnlyProperty":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateOnlyProperty = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateOnlyProperty = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         default:
                             break;

diff --git a/...tore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/...tore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -551,7 +551,7 @@ public override FormatTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo
                             break;
                         case "date":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                date = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                date = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "number":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)

diff --git a/...e/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/...e/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -342,7 +342,7 @@ public override NullableClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "datetime_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)

diff --git a/...e/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RequiredClass.cs b/...e/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/RequiredClass.cs
@@ -1828,7 +1828,7 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                     {
                         case "required_not_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                requiredNotNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                requiredNotNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "required_notnullable_array_of_string":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1881,7 +1881,7 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "required_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                requiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                requiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "required_nullable_datetime_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
@@ -1918,15 +1918,15 @@ public override RequiredClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "not_required_notnullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                notRequiredNotnullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                notRequiredNotnullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "not_required_notnullableinteger_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
                                 notRequiredNotnullableintegerProp = new Option<int?>(utf8JsonReader.GetInt32());
                             break;
                         case "not_required_nullable_date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                notRequiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                notRequiredNullableDateProp = new Option<DateOnly?>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "not_required_nullable_integer_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)

diff --git a/...store/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/...store/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs
@@ -133,7 +133,7 @@ public override DateOnlyClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                     {
                         case "dateOnlyProperty":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateOnlyProperty = new Option<DateOnly>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateOnlyProperty = new Option<DateOnly>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         default:
                             break;

diff --git a/...petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/...petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs
@@ -549,7 +549,7 @@ public override FormatTest Read(ref Utf8JsonReader utf8JsonReader, Type typeToCo
                             break;
                         case "date":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                date = new Option<DateOnly>(JsonSerializer.Deserialize<DateTime>(ref utf8JsonReader, jsonSerializerOptions));
+                                date = new Option<DateOnly>(JsonSerializer.Deserialize<DateOnly>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "number":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)

diff --git a/...store/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/...store/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs
@@ -340,7 +340,7 @@ public override NullableClass Read(ref Utf8JsonReader utf8JsonReader, Type typeT
                             break;
                         case "date_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)
-                                dateProp = new Option<DateOnly>(JsonSerializer.Deserialize<DateTime?>(ref utf8JsonReader, jsonSerializerOptions));
+                                dateProp = new Option<DateOnly>(JsonSerializer.Deserialize<DateOnly?>(ref utf8JsonReader, jsonSerializerOptions));
                             break;
                         case "datetime_prop":
                             if (utf8JsonReader.TokenType != JsonTokenType.Null)