Skip to content
Draft
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
7ca49b4
Fix hashCode for additionalProperties
jpfinne Mar 8, 2025
4ad76cc
[go-server] Moved helper code from router and updated logger for chi …
jarangutan Mar 9, 2025
b50b13b
Fix hashcode and equals
jpfinne Mar 9, 2025
f0e1a74
Revert Microfile (still using extends HashMap)
jpfinne Mar 9, 2025
abf7319
Fix defaultValue for AdditionalProperties fields when using generateA…
jpfinne Mar 9, 2025
349c850
Fix test for defaultValue for AdditionalProperties fields when using …
jpfinne Mar 9, 2025
21be5f5
fix(typescript-nestjs): handle query params serialization properly (#…
mahmoudzeyada Mar 10, 2025
0e34d39
add tests, option for useVirtualHooks (csharp) (#20837)
wing328 Mar 10, 2025
3c25de0
Fix test for defaultValue for AdditionalProperties fields when using …
jpfinne Mar 10, 2025
d5dcfa6
Remove unused sample
jpfinne Mar 11, 2025
579cd8d
Fix test for AdditionalProperties
jpfinne Mar 11, 2025
01a7e95
Default is still new HashMap<>()
jpfinne Mar 11, 2025
b30db6b
Fix missing file in test
jpfinne Mar 11, 2025
c5ad4d2
Fix wrong windows path
jpfinne Mar 11, 2025
95b32fd
Files includes FakeApiController
jpfinne Mar 11, 2025
b317d38
Files includes FakeApiController
jpfinne Mar 11, 2025
523a992
Remove custom batch
jpfinne Mar 11, 2025
95f2272
Remove .git
jpfinne Mar 11, 2025
8ead4b6
[typescript-angular] fix: correctly serialize query params objects (#…
daniel-sc Mar 12, 2025
7d9e1ec
Bump feign version to 13.5 from 10.12. (#20849)
JoshKeighley20 Mar 12, 2025
7f40ce0
Use interfaces for Polly retry policies (#20821)
jacobilsoe Mar 12, 2025
e40f9e3
update C# samples
wing328 Mar 12, 2025
3ab495a
Fix operationId mapping (#20846)
wing328 Mar 12, 2025
5c51ee4
[Rust Server] Bump up env_logger to 0.11 (#20865)
pgoodjohn Mar 13, 2025
a3fb8f5
Bump dorny/test-reporter from 1 to 2 (#20862)
dependabot[bot] Mar 13, 2025
1c13655
Bump @babel/helpers from 7.20.13 to 7.26.10 in /website (#20867)
dependabot[bot] Mar 13, 2025
b1f572e
[go-server] move errMsg helpers to helpers file (#20876)
jarangutan Mar 15, 2025
89f2fac
fix indentation
jpfinne Mar 16, 2025
a5ff8a0
Add handling of hashCode for additionalProperties
jpfinne Mar 16, 2025
984a6f9
Fix hashCode for additionalProperties
jpfinne Mar 8, 2025
e9e3411
Fix hashcode and equals
jpfinne Mar 9, 2025
6f2b450
Revert Microfile (still using extends HashMap)
jpfinne Mar 9, 2025
6e3b594
Fix defaultValue for AdditionalProperties fields when using generateA…
jpfinne Mar 9, 2025
eb650e0
Fix test for defaultValue for AdditionalProperties fields when using …
jpfinne Mar 9, 2025
fc023fe
Fix test for defaultValue for AdditionalProperties fields when using …
jpfinne Mar 10, 2025
e6abba4
Remove unused sample
jpfinne Mar 11, 2025
cd542a5
Fix test for AdditionalProperties
jpfinne Mar 11, 2025
8ee8978
Default is still new HashMap<>()
jpfinne Mar 11, 2025
44e1999
Fix missing file in test
jpfinne Mar 11, 2025
41e27a8
Fix wrong windows path
jpfinne Mar 11, 2025
5fcb5ab
Files includes FakeApiController
jpfinne Mar 11, 2025
bc3ad42
Files includes FakeApiController
jpfinne Mar 11, 2025
05d8e52
Remove custom batch
jpfinne Mar 11, 2025
47cd457
Remove .git
jpfinne Mar 11, 2025
f6e9245
fix indentation
jpfinne Mar 16, 2025
4c660ac
Add handling of hashCode for additionalProperties
jpfinne Mar 16, 2025
c36f864
fix hashCode for okhttp-gson
jpfinne Mar 16, 2025
1c9d50e
Merge remote-tracking branch 'origin/fixHashCodeForJavaSingleAddition…
jpfinne Mar 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions bin/configs/java-resttemplate-generateAliasAsModel.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
generatorName: java
outputDir: samples/client/petstore/java/resttemplate-generateAliasAsModel
library: resttemplate
inputSpec: modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml
templateDir: modules/openapi-generator/src/main/resources/Java
generateAliasAsModel: true
additionalProperties:
java8: true
useJakartaEe: true
artifactId: petstore-resttemplate-generateAliasAsModel
hideGenerationTimestamp: "true"
generateConstructorWithAllArgs: true
12 changes: 12 additions & 0 deletions bin/configs/spring-boot-generateAliasAsModel.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-generateAliasAsModel
library: spring-boot
inputSpec: modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
generateAliasAsModel: "true"
additionalProperties:
documentationProvider: springfox
useSwaggerUI: false
java8: true
artifactId: spring-boot-generateAliasAsModel
hideGenerationTimestamp: "true"
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@

import static org.openapitools.codegen.utils.CamelizeOption.*;
import static org.openapitools.codegen.utils.ModelUtils.getSchemaItems;
import static org.openapitools.codegen.utils.ModelUtils.isGenerateAliasAsModel;
import static org.openapitools.codegen.utils.OnceLogger.once;
import static org.openapitools.codegen.utils.StringUtils.*;

Expand Down Expand Up @@ -1329,6 +1330,11 @@ public String toDefaultValue(CodegenProperty cp, Schema schema) {
return null;
}

if (ModelUtils.isGenerateAliasAsModel() && !cp.dataType.contains("Map<")) {
// Aliased class used as the field name instead of Map<>
return null;
}

return String.format(Locale.ROOT, "new %s<>()",
instantiationTypes().getOrDefault("map", "HashMap"));
} else if (ModelUtils.isIntegerSchema(schema)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} &&
{{/-last}}{{/vars}}{{#additionalPropertiesType}} &&
Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} &&
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}}
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}}
{{classname}} {{classVarName}} = ({{classname}}) o;
return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}}
{{/useReflectionEqualsHashCode}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

Expand All @@ -280,7 +282,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
return HashCodeBuilder.reflectionHashCode(this);
{{/useReflectionEqualsHashCode}}
{{^useReflectionEqualsHashCode}}
return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}});
return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}});
{{/useReflectionEqualsHashCode}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} &&
{{/-last}}{{/vars}}{{#additionalPropertiesType}}&&
Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} &&
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}}
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}}
{{classname}} {{classVarName}} = ({{classname}}) o;
return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}}
{{/useReflectionEqualsHashCode}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} &&
{{/-last}}{{/vars}}{{#additionalPropertiesType}}&&
Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} &&
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}}
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}}
{{classname}} {{classVarName}} = ({{classname}}) o;
return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}}
{{/useReflectionEqualsHashCode}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

Expand Down
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also fix hashCode() in this file please?

Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} &&
{{/-last}}{{/vars}}{{#additionalPropertiesType}}&&
Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} &&
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}}
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}}
{{classname}} {{classVarName}} = ({{classname}}) o;
return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}}
{{/useReflectionEqualsHashCode}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
return {{#vars}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} &&
{{/-last}}{{/vars}}{{#isAdditionalPropertiesTrue}}&&
Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/isAdditionalPropertiesTrue}}{{#parent}} &&
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}}
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}}
{{classname}} {{classVarName}} = ({{classname}}) o;
return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}}
{{/useReflectionEqualsHashCode}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} &&
{{/-last}}{{/vars}}{{#additionalPropertiesType}} &&
Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} &&
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}}
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}}
{{classname}} {{classVarName}} = ({{classname}}) o;
return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}}
{{/useReflectionEqualsHashCode}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

Expand All @@ -321,7 +323,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
return HashCodeBuilder.reflectionHashCode(this);
{{/useReflectionEqualsHashCode}}
{{^useReflectionEqualsHashCode}}
return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}});
return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}});
{{/useReflectionEqualsHashCode}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} &&
{{/-last}}{{/vars}}{{#additionalPropertiesType}} &&
Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} &&
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}}
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}}
{{classname}} {{classVarName}} = ({{classname}}) o;
return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}}
{{/useReflectionEqualsHashCode}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

Expand All @@ -321,7 +323,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
return HashCodeBuilder.reflectionHashCode(this);
{{/useReflectionEqualsHashCode}}
{{^useReflectionEqualsHashCode}}
return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}});
return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}});
{{/useReflectionEqualsHashCode}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

Expand Down
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add additionalProperties to hashCode() here please?

Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{classname}} {{classVarName}} = ({{classname}}) o;
return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} &&
{{/-last}}{{/vars}}{{#parent}} &&
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}}
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}}
{{classname}} {{classVarName}} = ({{classname}}) o;
return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}}
{{/useReflectionEqualsHashCode}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,10 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} &&
{{/-last}}{{/vars}}{{#additionalPropertiesType}} &&
Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} &&
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}}
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}}
{{classname}} {{classVarName}} = ({{classname}}) o;
return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}}
return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}}
}{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
Expand Down
Loading
Loading