Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include parents hashCode #326

Merged
merged 2 commits into from
Oct 27, 2023
Merged

Include parents hashCode #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2da2cf5
Include parents hashCode
pulledtim Oct 27, 2023
b7376c9
PR remarks
pulledtim Oct 27, 2023
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
2 changes: 1 addition & 1 deletion gen/main/java/issue/_315/ServiceScopesEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public boolean equals(Object object) {

@Override
public int hashCode() {
return java.util.Objects.hash();
return java.util.Objects.hash(super.hashCode());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public boolean equals(Object object) {

@Override
public int hashCode() {
return java.util.Objects.hash();
return java.util.Objects.hash(super.hashCode());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public boolean equals(Object object) {

@Override
public int hashCode() {
return java.util.Objects.hash();
return java.util.Objects.hash(super.hashCode());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public boolean equals(Object object) {

@Override
public int hashCode() {
return java.util.Objects.hash();
return java.util.Objects.hash(super.hashCode());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/Micronaut/modelPojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public {{#discriminator}}abstract {{/discriminator}}class {{classname}}{{^parent

@Override
public int hashCode() {
return java.util.Objects.hash({{#vendorExtensions.additionalPropertiesMap}}this.additionalProperties{{#vars}}, {{/vars}}{{/vendorExtensions.additionalPropertiesMap}}{{^vars}}{{#discriminator}}{{discriminator.propertyGetter}}(){{/discriminator}}{{/vars}}{{#vars}}{{^isFile}}{{^isByteArray}}{{name}}{{/isByteArray}}{{/isFile}}{{#isByteArray}}java.util.Arrays.hashCode({{name}}){{/isByteArray}}{{#isFile}}java.util.Arrays.hashCode({{name}}){{/isFile}}{{^-last}}, {{/-last}}{{#-last}}{{#discriminator}}, {{discriminator.propertyGetter}}(){{/discriminator}}{{#parent}}, super.hashCode(){{/parent}}{{/-last}}{{/vars}});
return java.util.Objects.hash({{#vendorExtensions.additionalPropertiesMap}}this.additionalProperties{{#vars}}, {{/vars}}{{/vendorExtensions.additionalPropertiesMap}}{{^vars}}{{#discriminator}}{{discriminator.propertyGetter}}(){{/discriminator}}{{/vars}}{{#vars}}{{^isFile}}{{^isByteArray}}{{name}}{{/isByteArray}}{{/isFile}}{{#isByteArray}}java.util.Arrays.hashCode({{name}}){{/isByteArray}}{{#isFile}}java.util.Arrays.hashCode({{name}}){{/isFile}}{{^-last}}, {{/-last}}{{#-last}}{{#discriminator}}, {{discriminator.propertyGetter}}(){{/discriminator}}{{/-last}}{{/vars}}{{#parent}}{{#vars}}, {{/vars}}super.hashCode(){{/parent}});
Copy link
Author

Choose a reason for hiding this comment

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

Issue with a missing comma could occur if its an Map (modeled as additionalPropertiesMap field), without further fields but with inheritance. But I can't come up with a case for that tbh

}

@Override
Expand Down