Skip to content

Commit 152ea63

Browse files
committed
Reuse logic from working mustache file
1 parent b2ef45e commit 152ea63

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -309,29 +309,28 @@
309309
{{/useCompareNetObjects}}
310310
{{^useCompareNetObjects}}
311311
if (input == null)
312+
{
312313
return false;
313-
314-
return {{#parent}}base.Equals(input){{#allVars}}{{^isInherited}}{{#-first}} && {{/-first}}{{/isInherited}}{{/allVars}}{{/parent}}{{#allVars}}{{^isInherited}}{{^isContainer}}
314+
}
315+
return {{#vars}}{{#parent}}base.Equals(input) && {{/parent}}{{^isContainer}}
315316
(
316-
{{name}} == input.{{name}} ||
317+
this.{{name}} == input.{{name}} ||
317318
{{^vendorExtensions.x-is-value-type}}
318-
({{name}} != null &&
319-
{{name}}.Equals(input.{{name}}))
319+
(this.{{name}} != null &&
320+
this.{{name}}.Equals(input.{{name}}))
320321
{{/vendorExtensions.x-is-value-type}}
321322
{{#vendorExtensions.x-is-value-type}}
322-
{{name}}.Equals(input.{{name}})
323+
this.{{name}}.Equals(input.{{name}})
323324
{{/vendorExtensions.x-is-value-type}}
324325
){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}}
325326
(
326-
{{name}} == input.{{name}} ||
327-
{{^vendorExtensions.x-is-value-type}}{{name}} != null &&
327+
this.{{name}} == input.{{name}} ||
328+
{{^vendorExtensions.x-is-value-type}}this.{{name}} != null &&
328329
input.{{name}} != null &&
329-
{{/vendorExtensions.x-is-value-type}}{{name}}.SequenceEqual(input.{{name}})
330-
){{^-last}} && {{/-last}}{{/isContainer}}{{/isInherited}}{{/allVars}}{{^allVars}}{{#parent}}base.Equals(input){{/parent}}{{^parent}}false{{/parent}}{{/allVars}}{{^isAdditionalPropertiesTrue}};{{/isAdditionalPropertiesTrue}}
330+
{{/vendorExtensions.x-is-value-type}}this.{{name}}.SequenceEqual(input.{{name}})
331+
){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}{{#parent}}base.Equals(input){{/parent}}{{^parent}}false{{/parent}}{{/vars}}{{^isAdditionalPropertiesTrue}};{{/isAdditionalPropertiesTrue}}
331332
{{#isAdditionalPropertiesTrue}}
332-
{{^parentModel}}
333-
&& (AdditionalProperties.Count == input.AdditionalProperties.Count && !AdditionalProperties.Except(input.AdditionalProperties).Any());
334-
{{/parentModel}}
333+
&& (this.AdditionalProperties.Count == input.AdditionalProperties.Count && !this.AdditionalProperties.Except(input.AdditionalProperties).Any());
335334
{{/isAdditionalPropertiesTrue}}
336335
{{/useCompareNetObjects}}
337336
}
@@ -350,14 +349,14 @@
350349
{{^parent}}
351350
int hashCode = 41;
352351
{{/parent}}
353-
{{#allVars}}
352+
{{#vars}}
354353
{{#required}}
355354
{{^isNullable}}
356355
hashCode = (hashCode * 59) + {{name}}.GetHashCode();
357356
{{/isNullable}}
358357
{{/required}}
359-
{{/allVars}}
360-
{{#allVars}}
358+
{{/vars}}
359+
{{#vars}}
361360
{{#lambda.copy}}
362361
if ({{name}} != null)
363362
hashCode = (hashCode * 59) + {{name}}.GetHashCode();
@@ -371,7 +370,7 @@
371370
{{#lambda.pasteOnce}}
372371
{{/lambda.pasteOnce}}
373372
{{/required}}
374-
{{/allVars}}
373+
{{/vars}}
375374
{{#isAdditionalPropertiesTrue}}
376375
{{^parentModel}}
377376
hashCode = (hashCode * 59) + AdditionalProperties.GetHashCode();

0 commit comments

Comments
 (0)