From 2da2cf584475f42de76b9c210491039a73a6b802 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Fri, 27 Oct 2023 10:25:13 +0200 Subject: [PATCH 1/2] Include parents hashCode --- gen/main/java/issue/_315/ServiceScopesEntry.java | 2 +- .../java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java | 2 +- .../java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java | 2 +- .../java/testmodel/micronaut_pojo/InheritanceWithEnumType3.java | 2 +- .../testmodel/micronaut_pojo/InheritanceWithStringType1.java | 2 +- .../testmodel/micronaut_pojo/InheritanceWithStringType2.java | 2 +- .../java/testmodel/micronaut_pojo/InheritanceWithoutType1.java | 2 +- .../java/testmodel/micronaut_pojo/InheritanceWithoutType2.java | 2 +- gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java | 2 +- gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithEnumType1.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithEnumType2.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithEnumType3.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithStringType1.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithStringType2.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithoutType1.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithoutType2.java | 2 +- .../testmodel/micronaut_pojo_nullable/OneOfImplementor1.java | 2 +- .../testmodel/micronaut_pojo_nullable/OneOfImplementor2.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithEnumType1.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithEnumType2.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithEnumType3.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithStringType1.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithStringType2.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithoutType1.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithoutType2.java | 2 +- gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java | 2 +- gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java | 2 +- src/main/resources/Micronaut/modelPojo.mustache | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gen/main/java/issue/_315/ServiceScopesEntry.java b/gen/main/java/issue/_315/ServiceScopesEntry.java index f861b99d..18d33c03 100644 --- a/gen/main/java/issue/_315/ServiceScopesEntry.java +++ b/gen/main/java/issue/_315/ServiceScopesEntry.java @@ -20,7 +20,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(); + return 31 * super.hashCode() + java.util.Objects.hash(); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java index 2fe48caf..fb29cabd 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(d, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(d, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java index ac1a5d7f..95845d83 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(e, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(e, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType3.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType3.java index e591c662..8e2fe58b 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType3.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType3.java @@ -25,7 +25,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(); + return 31 * super.hashCode() + java.util.Objects.hash(); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java index b21a4735..12c7713b 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(b, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(b, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java index a654242d..abceaeca 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(c, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(c, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java index a6f22dda..93301009 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(f, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(f, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java index 8a38971a..d29b967f 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(g, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(g, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java index e79606b7..a79ee01b 100644 --- a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java +++ b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(property, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java index e01584ea..8d34220b 100644 --- a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java +++ b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(property, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java index 38f97666..2882a3aa 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(d, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(d, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java index d6b3606d..45f5ac18 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(e, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(e, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType3.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType3.java index 9b2b1855..4be8644a 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType3.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType3.java @@ -25,7 +25,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(); + return 31 * super.hashCode() + java.util.Objects.hash(); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java index 6ff4fe03..eef5d07c 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(b, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(b, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java index 9907265b..4886f706 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(c, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(c, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java index ffe538cc..ea43ec34 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(f, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(f, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java index 6b52d284..7113042a 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(g, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(g, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java index 9a5db496..b60095ba 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(property, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java index 7a8c7cd7..aecf9fc3 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(property, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java index 968a8386..7c034206 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(d, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(d, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java index 3da555ad..eb0a1aee 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(e, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(e, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType3.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType3.java index 52411be2..a54fc8a1 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType3.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType3.java @@ -23,7 +23,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(); + return 31 * super.hashCode() + java.util.Objects.hash(); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java index 0e8dfe6b..c213ef9d 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(b, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(b, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java index 681dca4b..9aebdd74 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(c, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(c, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java index c4a02c1b..405514e6 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(f, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(f, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java index 56d7f51e..b35f0f30 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(g, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(g, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java b/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java index d4cec238..dedc91c6 100644 --- a/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java +++ b/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(property, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java b/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java index f2582f57..7ed4d0ec 100644 --- a/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java +++ b/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return java.util.Objects.hash(property, super.hashCode()); + return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/src/main/resources/Micronaut/modelPojo.mustache b/src/main/resources/Micronaut/modelPojo.mustache index 327b6e5c..1b71f9ec 100644 --- a/src/main/resources/Micronaut/modelPojo.mustache +++ b/src/main/resources/Micronaut/modelPojo.mustache @@ -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 {{#parent}}31 * super.hashCode() + {{/parent}}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}}); } @Override From b7376c9e5b3770b5366633e28e0e11492d627b18 Mon Sep 17 00:00:00 2001 From: Tim Smyth Date: Fri, 27 Oct 2023 11:06:07 +0200 Subject: [PATCH 2/2] PR remarks --- gen/main/java/issue/_315/ServiceScopesEntry.java | 2 +- .../java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java | 2 +- .../java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java | 2 +- .../java/testmodel/micronaut_pojo/InheritanceWithEnumType3.java | 2 +- .../testmodel/micronaut_pojo/InheritanceWithStringType1.java | 2 +- .../testmodel/micronaut_pojo/InheritanceWithStringType2.java | 2 +- .../java/testmodel/micronaut_pojo/InheritanceWithoutType1.java | 2 +- .../java/testmodel/micronaut_pojo/InheritanceWithoutType2.java | 2 +- gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java | 2 +- gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithEnumType1.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithEnumType2.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithEnumType3.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithStringType1.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithStringType2.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithoutType1.java | 2 +- .../micronaut_pojo_nullable/InheritanceWithoutType2.java | 2 +- .../testmodel/micronaut_pojo_nullable/OneOfImplementor1.java | 2 +- .../testmodel/micronaut_pojo_nullable/OneOfImplementor2.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithEnumType1.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithEnumType2.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithEnumType3.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithStringType1.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithStringType2.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithoutType1.java | 2 +- .../java/testmodel/nomicronaut/InheritanceWithoutType2.java | 2 +- gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java | 2 +- gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java | 2 +- src/main/resources/Micronaut/modelPojo.mustache | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gen/main/java/issue/_315/ServiceScopesEntry.java b/gen/main/java/issue/_315/ServiceScopesEntry.java index 18d33c03..0a4f0932 100644 --- a/gen/main/java/issue/_315/ServiceScopesEntry.java +++ b/gen/main/java/issue/_315/ServiceScopesEntry.java @@ -20,7 +20,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(); + return java.util.Objects.hash(super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java index fb29cabd..2fe48caf 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(d, super.hashCode()); + return java.util.Objects.hash(d, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java index 95845d83..ac1a5d7f 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(e, super.hashCode()); + return java.util.Objects.hash(e, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType3.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType3.java index 8e2fe58b..24bee1c9 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType3.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType3.java @@ -25,7 +25,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(); + return java.util.Objects.hash(super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java index 12c7713b..b21a4735 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(b, super.hashCode()); + return java.util.Objects.hash(b, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java index abceaeca..a654242d 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(c, super.hashCode()); + return java.util.Objects.hash(c, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java index 93301009..a6f22dda 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(f, super.hashCode()); + return java.util.Objects.hash(f, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java index d29b967f..8a38971a 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(g, super.hashCode()); + return java.util.Objects.hash(g, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java index a79ee01b..e79606b7 100644 --- a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java +++ b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); + return java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java index 8d34220b..e01584ea 100644 --- a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java +++ b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); + return java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java index 2882a3aa..38f97666 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(d, super.hashCode()); + return java.util.Objects.hash(d, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java index 45f5ac18..d6b3606d 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(e, super.hashCode()); + return java.util.Objects.hash(e, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType3.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType3.java index 4be8644a..fdb97bc3 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType3.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType3.java @@ -25,7 +25,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(); + return java.util.Objects.hash(super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java index eef5d07c..6ff4fe03 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(b, super.hashCode()); + return java.util.Objects.hash(b, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java index 4886f706..9907265b 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(c, super.hashCode()); + return java.util.Objects.hash(c, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java index ea43ec34..ffe538cc 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(f, super.hashCode()); + return java.util.Objects.hash(f, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java index 7113042a..6b52d284 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(g, super.hashCode()); + return java.util.Objects.hash(g, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java index b60095ba..9a5db496 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); + return java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java index aecf9fc3..7a8c7cd7 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java @@ -32,7 +32,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); + return java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java index 7c034206..968a8386 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(d, super.hashCode()); + return java.util.Objects.hash(d, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java index eb0a1aee..3da555ad 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(e, super.hashCode()); + return java.util.Objects.hash(e, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType3.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType3.java index a54fc8a1..4d0cc36c 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType3.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType3.java @@ -23,7 +23,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(); + return java.util.Objects.hash(super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java index c213ef9d..0e8dfe6b 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(b, super.hashCode()); + return java.util.Objects.hash(b, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java index 9aebdd74..681dca4b 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(c, super.hashCode()); + return java.util.Objects.hash(c, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java index 405514e6..c4a02c1b 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(f, super.hashCode()); + return java.util.Objects.hash(f, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java index b35f0f30..56d7f51e 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(g, super.hashCode()); + return java.util.Objects.hash(g, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java b/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java index dedc91c6..d4cec238 100644 --- a/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java +++ b/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); + return java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java b/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java index 7ed4d0ec..f2582f57 100644 --- a/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java +++ b/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java @@ -30,7 +30,7 @@ public boolean equals(Object object) { @Override public int hashCode() { - return 31 * super.hashCode() + java.util.Objects.hash(property, super.hashCode()); + return java.util.Objects.hash(property, super.hashCode()); } @Override diff --git a/src/main/resources/Micronaut/modelPojo.mustache b/src/main/resources/Micronaut/modelPojo.mustache index 1b71f9ec..5f5f0b41 100644 --- a/src/main/resources/Micronaut/modelPojo.mustache +++ b/src/main/resources/Micronaut/modelPojo.mustache @@ -50,7 +50,7 @@ public {{#discriminator}}abstract {{/discriminator}}class {{classname}}{{^parent @Override public int hashCode() { - return {{#parent}}31 * super.hashCode() + {{/parent}}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}}); } @Override