From d157245efa437b35118f6c1739fa4180ff27fd6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20C=C3=B4t=C3=A9?= Date: Tue, 16 May 2023 14:35:31 -0400 Subject: [PATCH] Fix datetime null warning when compiling. Removing the x-is-value-type which was a buggy and old version of the new x-csharp-value-type that work for every type. --- .../resources/aspnetcore/2.1/model.mustache | 8 ++++---- .../resources/aspnetcore/3.0/model.mustache | 10 +++++----- .../csharp-netcore-functions/model.mustache | 8 ++++---- .../modelGeneric.mustache | 20 +++++++++---------- .../generichost/modelGeneric.mustache | 12 +++++------ .../csharp-netcore/modelGeneric.mustache | 20 +++++++++---------- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache index 30ee6f18d35..4603fa8f12b 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache @@ -104,14 +104,14 @@ namespace {{modelPackage}} return {{#vars}}{{^isContainer}} ( {{name}} == other.{{name}} || - {{^vendorExtensions.x-is-value-type}}{{name}} != null &&{{/vendorExtensions.x-is-value-type}} + {{^vendorExtensions.x-csharp-value-type}}{{name}} != null &&{{/vendorExtensions.x-csharp-value-type}} {{name}}.Equals(other.{{name}}) ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ( {{name}} == other.{{name}} || - {{^vendorExtensions.x-is-value-type}}{{name}} != null && + {{^vendorExtensions.x-csharp-value-type}}{{name}} != null && other.{{name}} != null && - {{/vendorExtensions.x-is-value-type}}{{name}}.SequenceEqual(other.{{name}}) + {{/vendorExtensions.x-csharp-value-type}}{{name}}.SequenceEqual(other.{{name}}) ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}false{{/vars}}; } @@ -126,7 +126,7 @@ namespace {{modelPackage}} var hashCode = 41; // Suitable nullity checks etc, of course :) {{#vars}} - {{^vendorExtensions.x-is-value-type}}if ({{name}} != null){{/vendorExtensions.x-is-value-type}} + {{^vendorExtensions.x-csharp-value-type}}if ({{name}} != null){{/vendorExtensions.x-csharp-value-type}} hashCode = hashCode * 59 + {{name}}.GetHashCode(); {{/vars}} return hashCode; diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache index 915d0a58be6..5d8183c38c3 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache @@ -72,7 +72,7 @@ namespace {{modelPackage}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MaxLength({{.}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}} [Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}} - [DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}{{#vendorExtensions.x-is-value-type}}true{{/vendorExtensions.x-is-value-type}}{{^vendorExtensions.x-is-value-type}}false{{/vendorExtensions.x-is-value-type}}{{/isNullable}})] + [DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}{{#vendorExtensions.x-csharp-value-type}}true{{/vendorExtensions.x-csharp-value-type}}{{^vendorExtensions.x-csharp-value-type}}false{{/vendorExtensions.x-csharp-value-type}}{{/isNullable}})] {{#isEnum}} public {{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}} {{/isEnum}} @@ -144,14 +144,14 @@ namespace {{modelPackage}} return {{#vars}}{{^isContainer}} ( {{name}} == other.{{name}} || - {{^vendorExtensions.x-is-value-type}}{{name}} != null &&{{/vendorExtensions.x-is-value-type}} + {{^vendorExtensions.x-csharp-value-type}}{{name}} != null &&{{/vendorExtensions.x-csharp-value-type}} {{name}}.Equals(other.{{name}}) ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ( {{name}} == other.{{name}} || - {{^vendorExtensions.x-is-value-type}}{{name}} != null && + {{^vendorExtensions.x-csharp-value-type}}{{name}} != null && other.{{name}} != null && - {{/vendorExtensions.x-is-value-type}}{{name}}.SequenceEqual(other.{{name}}) + {{/vendorExtensions.x-csharp-value-type}}{{name}}.SequenceEqual(other.{{name}}) ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}false{{/vars}}; } @@ -166,7 +166,7 @@ namespace {{modelPackage}} var hashCode = 41; // Suitable nullity checks etc, of course :) {{#vars}} - {{^vendorExtensions.x-is-value-type}}if ({{name}} != null){{/vendorExtensions.x-is-value-type}} + {{^vendorExtensions.x-csharp-value-type}}if ({{name}} != null){{/vendorExtensions.x-csharp-value-type}} hashCode = hashCode * 59 + {{name}}.GetHashCode(); {{/vars}} return hashCode; diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/model.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/model.mustache index eebb50bf87c..cc83ec36125 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/model.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/model.mustache @@ -109,14 +109,14 @@ namespace {{modelPackage}} return {{#vars}}{{^isContainer}} ( {{name}} == other.{{name}} || - {{^vendorExtensions.x-is-value-type}}{{name}} != null &&{{/vendorExtensions.x-is-value-type}} + {{^vendorExtensions.x-csharp-value-type}}{{name}} != null &&{{/vendorExtensions.x-csharp-value-type}} {{name}}.Equals(other.{{name}}) ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ( {{name}} == other.{{name}} || - {{^vendorExtensions.x-is-value-type}}{{name}} != null && + {{^vendorExtensions.x-csharp-value-type}}{{name}} != null && other.{{name}} != null && - {{/vendorExtensions.x-is-value-type}}{{name}}.SequenceEqual(other.{{name}}) + {{/vendorExtensions.x-csharp-value-type}}{{name}}.SequenceEqual(other.{{name}}) ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}false{{/vars}}; } @@ -131,7 +131,7 @@ namespace {{modelPackage}} var hashCode = 41; // Suitable nullity checks etc, of course :) {{#vars}} - {{^vendorExtensions.x-is-value-type}}if ({{name}} != null){{/vendorExtensions.x-is-value-type}} + {{^vendorExtensions.x-csharp-value-type}}if ({{name}} != null){{/vendorExtensions.x-csharp-value-type}} hashCode = hashCode * 59 + {{name}}.GetHashCode(); {{/vars}} return hashCode; diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelGeneric.mustache index 80122db2164..c1c724c6d61 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelGeneric.mustache @@ -320,19 +320,19 @@ return {{#vars}}{{#parent}}base.Equals(input) && {{/parent}}{{^isContainer}} ( this.{{name}} == input.{{name}} || - {{^vendorExtensions.x-is-value-type}} + {{^vendorExtensions.x-csharp-value-type}} (this.{{name}} != null && this.{{name}}.Equals(input.{{name}})) - {{/vendorExtensions.x-is-value-type}} - {{#vendorExtensions.x-is-value-type}} + {{/vendorExtensions.x-csharp-value-type}} + {{#vendorExtensions.x-csharp-value-type}} this.{{name}}.Equals(input.{{name}}) - {{/vendorExtensions.x-is-value-type}} + {{/vendorExtensions.x-csharp-value-type}} ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ( this.{{name}} == input.{{name}} || - {{^vendorExtensions.x-is-value-type}}this.{{name}} != null && + {{^vendorExtensions.x-csharp-value-type}}this.{{name}} != null && input.{{name}} != null && - {{/vendorExtensions.x-is-value-type}}this.{{name}}.SequenceEqual(input.{{name}}) + {{/vendorExtensions.x-csharp-value-type}}this.{{name}}.SequenceEqual(input.{{name}}) ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}{{#parent}}base.Equals(input){{/parent}}{{^parent}}false{{/parent}}{{/vars}}{{^isAdditionalPropertiesTrue}};{{/isAdditionalPropertiesTrue}} {{#isAdditionalPropertiesTrue}} && (this.AdditionalProperties.Count == input.AdditionalProperties.Count && !this.AdditionalProperties.Except(input.AdditionalProperties).Any()); @@ -355,13 +355,13 @@ int hashCode = 41; {{/parent}} {{#vars}} - {{^vendorExtensions.x-is-value-type}} + {{^vendorExtensions.x-csharp-value-type}} if (this.{{name}} != null) hashCode = hashCode * 59 + this.{{name}}.GetHashCode(); - {{/vendorExtensions.x-is-value-type}} - {{#vendorExtensions.x-is-value-type}} + {{/vendorExtensions.x-csharp-value-type}} + {{#vendorExtensions.x-csharp-value-type}} hashCode = hashCode * 59 + this.{{name}}.GetHashCode(); - {{/vendorExtensions.x-is-value-type}} + {{/vendorExtensions.x-csharp-value-type}} {{/vars}} {{#isAdditionalPropertiesTrue}} if (this.AdditionalProperties != null) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache index a0aa1398673..9feba180ea9 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache @@ -259,19 +259,19 @@ return {{#parent}}base.Equals(input) && {{/parent}}{{#readOnlyVars}}{{^isInherited}}{{^isContainer}} ( {{name}} == input.{{name}} || - {{^vendorExtensions.x-is-value-type}} + {{^vendorExtensions.x-csharp-value-type}} ({{name}} != null && {{name}}.Equals(input.{{name}})) - {{/vendorExtensions.x-is-value-type}} - {{#vendorExtensions.x-is-value-type}} + {{/vendorExtensions.x-csharp-value-type}} + {{#vendorExtensions.x-csharp-value-type}} {{name}}.Equals(input.{{name}}) - {{/vendorExtensions.x-is-value-type}} + {{/vendorExtensions.x-csharp-value-type}} ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ( {{name}} == input.{{name}} || - {{^vendorExtensions.x-is-value-type}}{{name}} != null && + {{^vendorExtensions.x-csharp-value-type}}{{name}} != null && input.{{name}} != null && - {{/vendorExtensions.x-is-value-type}}{{name}}.SequenceEqual(input.{{name}}) + {{/vendorExtensions.x-csharp-value-type}}{{name}}.SequenceEqual(input.{{name}}) ){{^-last}} && {{/-last}}{{/isContainer}}{{/isInherited}}{{/readOnlyVars}}{{^readOnlyVars}}{{#parent}}base.Equals(input){{/parent}}{{^parent}}false{{/parent}}{{/readOnlyVars}}{{^isAdditionalPropertiesTrue}};{{/isAdditionalPropertiesTrue}} {{#isAdditionalPropertiesTrue}} {{^parentModel}} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache index 4ad255aef4c..b8a91aa98aa 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache @@ -361,19 +361,19 @@ return {{#vars}}{{#parent}}base.Equals(input) && {{/parent}}{{^isContainer}} ( this.{{name}} == input.{{name}} || - {{^vendorExtensions.x-is-value-type}} + {{^vendorExtensions.x-csharp-value-type}} (this.{{name}} != null && this.{{name}}.Equals(input.{{name}})) - {{/vendorExtensions.x-is-value-type}} - {{#vendorExtensions.x-is-value-type}} + {{/vendorExtensions.x-csharp-value-type}} + {{#vendorExtensions.x-csharp-value-type}} this.{{name}}.Equals(input.{{name}}) - {{/vendorExtensions.x-is-value-type}} + {{/vendorExtensions.x-csharp-value-type}} ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ( this.{{name}} == input.{{name}} || - {{^vendorExtensions.x-is-value-type}}this.{{name}} != null && + {{^vendorExtensions.x-csharp-value-type}}this.{{name}} != null && input.{{name}} != null && - {{/vendorExtensions.x-is-value-type}}this.{{name}}.SequenceEqual(input.{{name}}) + {{/vendorExtensions.x-csharp-value-type}}this.{{name}}.SequenceEqual(input.{{name}}) ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}{{#parent}}base.Equals(input){{/parent}}{{^parent}}false{{/parent}}{{/vars}}{{^isAdditionalPropertiesTrue}};{{/isAdditionalPropertiesTrue}} {{#isAdditionalPropertiesTrue}} && (this.AdditionalProperties.Count == input.AdditionalProperties.Count && !this.AdditionalProperties.Except(input.AdditionalProperties).Any()); @@ -396,15 +396,15 @@ int hashCode = 41; {{/parent}} {{#vars}} - {{^vendorExtensions.x-is-value-type}} + {{^vendorExtensions.x-csharp-value-type}} if (this.{{name}} != null) { hashCode = (hashCode * 59) + this.{{name}}.GetHashCode(); } - {{/vendorExtensions.x-is-value-type}} - {{#vendorExtensions.x-is-value-type}} + {{/vendorExtensions.x-csharp-value-type}} + {{#vendorExtensions.x-csharp-value-type}} hashCode = (hashCode * 59) + this.{{name}}.GetHashCode(); - {{/vendorExtensions.x-is-value-type}} + {{/vendorExtensions.x-csharp-value-type}} {{/vars}} {{#isAdditionalPropertiesTrue}} if (this.AdditionalProperties != null)