loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-04 06:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix datetime null warning when compiling.

Browse Source 
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.
This commit is contained in:
Jean-François Côté 2023-05-16 14:35:31 -04:00
parent 1561c33966
commit d157245efa
6 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache vendored
View File

@ -104,14 +104,14 @@ namespace {{modelPackage}}
return {{#vars}}{{^isContainer}} return {{#vars}}{{^isContainer}}
( (
{{name}} == other.{{name}} || {{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}}) {{name}}.Equals(other.{{name}})
){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}}
( (
{{name}} == other.{{name}} || {{name}} == other.{{name}} ||
{{^vendorExtensions.x-is-value-type}}{{name}} != null && {{^vendorExtensions.x-csharp-value-type}}{{name}} != null &&
other.{{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}}; ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}false{{/vars}};
} }
@ -126,7 +126,7 @@ namespace {{modelPackage}}
var hashCode = 41; var hashCode = 41;
// Suitable nullity checks etc, of course :) // Suitable nullity checks etc, of course :)
{{#vars}} {{#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(); hashCode = hashCode * 59 + {{name}}.GetHashCode();
{{/vars}} {{/vars}}
return hashCode; return hashCode;

10
modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache vendored
View File

@ -72,7 +72,7 @@ namespace {{modelPackage}}
[MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}}
[MaxLength({{.}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}} [MaxLength({{.}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}
[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}} [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}} {{#isEnum}}
public {{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}} public {{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
{{/isEnum}} {{/isEnum}}
@ -144,14 +144,14 @@ namespace {{modelPackage}}
return {{#vars}}{{^isContainer}} return {{#vars}}{{^isContainer}}
( (
{{name}} == other.{{name}} || {{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}}) {{name}}.Equals(other.{{name}})
){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}}
( (
{{name}} == other.{{name}} || {{name}} == other.{{name}} ||
{{^vendorExtensions.x-is-value-type}}{{name}} != null && {{^vendorExtensions.x-csharp-value-type}}{{name}} != null &&
other.{{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}}; ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}false{{/vars}};
} }
@ -166,7 +166,7 @@ namespace {{modelPackage}}
var hashCode = 41; var hashCode = 41;
// Suitable nullity checks etc, of course :) // Suitable nullity checks etc, of course :)
{{#vars}} {{#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(); hashCode = hashCode * 59 + {{name}}.GetHashCode();
{{/vars}} {{/vars}}
return hashCode; return hashCode;

8
modules/openapi-generator/src/main/resources/csharp-netcore-functions/model.mustache vendored
View File

@ -109,14 +109,14 @@ namespace {{modelPackage}}
return {{#vars}}{{^isContainer}} return {{#vars}}{{^isContainer}}
( (
{{name}} == other.{{name}} || {{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}}) {{name}}.Equals(other.{{name}})
){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}}
( (
{{name}} == other.{{name}} || {{name}} == other.{{name}} ||
{{^vendorExtensions.x-is-value-type}}{{name}} != null && {{^vendorExtensions.x-csharp-value-type}}{{name}} != null &&
other.{{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}}; ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}false{{/vars}};
} }
@ -131,7 +131,7 @@ namespace {{modelPackage}}
var hashCode = 41; var hashCode = 41;
// Suitable nullity checks etc, of course :) // Suitable nullity checks etc, of course :)
{{#vars}} {{#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(); hashCode = hashCode * 59 + {{name}}.GetHashCode();
{{/vars}} {{/vars}}
return hashCode; return hashCode;

20
modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelGeneric.mustache vendored
View File

@ -320,19 +320,19 @@
return {{#vars}}{{#parent}}base.Equals(input) && {{/parent}}{{^isContainer}} return {{#vars}}{{#parent}}base.Equals(input) && {{/parent}}{{^isContainer}}
( (
this.{{name}} == input.{{name}} || this.{{name}} == input.{{name}} ||
{{^vendorExtensions.x-is-value-type}} {{^vendorExtensions.x-csharp-value-type}}
(this.{{name}} != null && (this.{{name}} != null &&
this.{{name}}.Equals(input.{{name}})) this.{{name}}.Equals(input.{{name}}))
{{/vendorExtensions.x-is-value-type}} {{/vendorExtensions.x-csharp-value-type}}
{{#vendorExtensions.x-is-value-type}} {{#vendorExtensions.x-csharp-value-type}}
this.{{name}}.Equals(input.{{name}}) this.{{name}}.Equals(input.{{name}})
{{/vendorExtensions.x-is-value-type}} {{/vendorExtensions.x-csharp-value-type}}
){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}}
( (
this.{{name}} == input.{{name}} || this.{{name}} == input.{{name}} ||
{{^vendorExtensions.x-is-value-type}}this.{{name}} != null && {{^vendorExtensions.x-csharp-value-type}}this.{{name}} != null &&
input.{{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}} ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}{{#parent}}base.Equals(input){{/parent}}{{^parent}}false{{/parent}}{{/vars}}{{^isAdditionalPropertiesTrue}};{{/isAdditionalPropertiesTrue}}
{{#isAdditionalPropertiesTrue}} {{#isAdditionalPropertiesTrue}}
&& (this.AdditionalProperties.Count == input.AdditionalProperties.Count && !this.AdditionalProperties.Except(input.AdditionalProperties).Any()); && (this.AdditionalProperties.Count == input.AdditionalProperties.Count && !this.AdditionalProperties.Except(input.AdditionalProperties).Any());
@ -355,13 +355,13 @@
int hashCode = 41; int hashCode = 41;
{{/parent}} {{/parent}}
{{#vars}} {{#vars}}
{{^vendorExtensions.x-is-value-type}} {{^vendorExtensions.x-csharp-value-type}}
if (this.{{name}} != null) if (this.{{name}} != null)
hashCode = hashCode * 59 + this.{{name}}.GetHashCode(); hashCode = hashCode * 59 + this.{{name}}.GetHashCode();
{{/vendorExtensions.x-is-value-type}} {{/vendorExtensions.x-csharp-value-type}}
{{#vendorExtensions.x-is-value-type}} {{#vendorExtensions.x-csharp-value-type}}
hashCode = hashCode * 59 + this.{{name}}.GetHashCode(); hashCode = hashCode * 59 + this.{{name}}.GetHashCode();
{{/vendorExtensions.x-is-value-type}} {{/vendorExtensions.x-csharp-value-type}}
{{/vars}} {{/vars}}
{{#isAdditionalPropertiesTrue}} {{#isAdditionalPropertiesTrue}}
if (this.AdditionalProperties != null) if (this.AdditionalProperties != null)

12
modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache vendored
View File

@ -259,19 +259,19 @@
return {{#parent}}base.Equals(input) && {{/parent}}{{#readOnlyVars}}{{^isInherited}}{{^isContainer}} return {{#parent}}base.Equals(input) && {{/parent}}{{#readOnlyVars}}{{^isInherited}}{{^isContainer}}
( (
{{name}} == input.{{name}} || {{name}} == input.{{name}} ||
{{^vendorExtensions.x-is-value-type}} {{^vendorExtensions.x-csharp-value-type}}
({{name}} != null && ({{name}} != null &&
{{name}}.Equals(input.{{name}})) {{name}}.Equals(input.{{name}}))
{{/vendorExtensions.x-is-value-type}} {{/vendorExtensions.x-csharp-value-type}}
{{#vendorExtensions.x-is-value-type}} {{#vendorExtensions.x-csharp-value-type}}
{{name}}.Equals(input.{{name}}) {{name}}.Equals(input.{{name}})
{{/vendorExtensions.x-is-value-type}} {{/vendorExtensions.x-csharp-value-type}}
){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}}
( (
{{name}} == input.{{name}} || {{name}} == input.{{name}} ||
{{^vendorExtensions.x-is-value-type}}{{name}} != null && {{^vendorExtensions.x-csharp-value-type}}{{name}} != null &&
input.{{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}} ){{^-last}} && {{/-last}}{{/isContainer}}{{/isInherited}}{{/readOnlyVars}}{{^readOnlyVars}}{{#parent}}base.Equals(input){{/parent}}{{^parent}}false{{/parent}}{{/readOnlyVars}}{{^isAdditionalPropertiesTrue}};{{/isAdditionalPropertiesTrue}}
{{#isAdditionalPropertiesTrue}} {{#isAdditionalPropertiesTrue}}
{{^parentModel}} {{^parentModel}}

20
modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache vendored
View File

@ -361,19 +361,19 @@
return {{#vars}}{{#parent}}base.Equals(input) && {{/parent}}{{^isContainer}} return {{#vars}}{{#parent}}base.Equals(input) && {{/parent}}{{^isContainer}}
( (
this.{{name}} == input.{{name}} || this.{{name}} == input.{{name}} ||
{{^vendorExtensions.x-is-value-type}} {{^vendorExtensions.x-csharp-value-type}}
(this.{{name}} != null && (this.{{name}} != null &&
this.{{name}}.Equals(input.{{name}})) this.{{name}}.Equals(input.{{name}}))
{{/vendorExtensions.x-is-value-type}} {{/vendorExtensions.x-csharp-value-type}}
{{#vendorExtensions.x-is-value-type}} {{#vendorExtensions.x-csharp-value-type}}
this.{{name}}.Equals(input.{{name}}) this.{{name}}.Equals(input.{{name}})
{{/vendorExtensions.x-is-value-type}} {{/vendorExtensions.x-csharp-value-type}}
){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}} ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}}
( (
this.{{name}} == input.{{name}} || this.{{name}} == input.{{name}} ||
{{^vendorExtensions.x-is-value-type}}this.{{name}} != null && {{^vendorExtensions.x-csharp-value-type}}this.{{name}} != null &&
input.{{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}} ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}{{#parent}}base.Equals(input){{/parent}}{{^parent}}false{{/parent}}{{/vars}}{{^isAdditionalPropertiesTrue}};{{/isAdditionalPropertiesTrue}}
{{#isAdditionalPropertiesTrue}} {{#isAdditionalPropertiesTrue}}
&& (this.AdditionalProperties.Count == input.AdditionalProperties.Count && !this.AdditionalProperties.Except(input.AdditionalProperties).Any()); && (this.AdditionalProperties.Count == input.AdditionalProperties.Count && !this.AdditionalProperties.Except(input.AdditionalProperties).Any());
@ -396,15 +396,15 @@
int hashCode = 41; int hashCode = 41;
{{/parent}} {{/parent}}
{{#vars}} {{#vars}}
{{^vendorExtensions.x-is-value-type}} {{^vendorExtensions.x-csharp-value-type}}
if (this.{{name}} != null) if (this.{{name}} != null)
{ {
hashCode = (hashCode * 59) + this.{{name}}.GetHashCode(); hashCode = (hashCode * 59) + this.{{name}}.GetHashCode();
} }
{{/vendorExtensions.x-is-value-type}} {{/vendorExtensions.x-csharp-value-type}}
{{#vendorExtensions.x-is-value-type}} {{#vendorExtensions.x-csharp-value-type}}
hashCode = (hashCode * 59) + this.{{name}}.GetHashCode(); hashCode = (hashCode * 59) + this.{{name}}.GetHashCode();
{{/vendorExtensions.x-is-value-type}} {{/vendorExtensions.x-csharp-value-type}}
{{/vars}} {{/vars}}
{{#isAdditionalPropertiesTrue}} {{#isAdditionalPropertiesTrue}}
if (this.AdditionalProperties != null) if (this.AdditionalProperties != null)