Skip to content

Commit 987a0e1

Browse files
author
DielN
committed
Add missing dependency for reflection equals
1 parent 8405e51 commit 987a0e1

File tree

16 files changed

+72
-84
lines changed

16 files changed

+72
-84
lines changed

‎bin/configs/java-microprofile-rest-client-3.0-jackson.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ additionalProperties:
99
configKey: petstore
1010
microprofileRestClientVersion: "3.0"
1111
hideGenerationTimestamp: true
12+
useReflectionEqualsHashCode: true

‎modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,14 @@
196196
<version>${mutiny.version}</version>
197197
</dependency>
198198
{{/microprofileMutiny}}
199+
{{#useReflectionEqualsHashCode}}
200+
<!-- For equals and hashCode using reflection -->
201+
<dependency>
202+
<groupId>org.apache.commons</groupId>
203+
<artifactId>commons-lang3</artifactId>
204+
<version>${commons.lang3.version}</version>
205+
</dependency>
206+
{{/useReflectionEqualsHashCode}}
199207
</dependencies>
200208
<repositories>
201209
<repository>
@@ -210,6 +218,8 @@
210218
<java.version>1.8</java.version>
211219
<maven.compiler.source>${java.version}</maven.compiler.source>
212220
<maven.compiler.target>${java.version}</maven.compiler.target>
221+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
222+
213223
<swagger.core.version>1.5.18</swagger.core.version>
214224
<jetty.version>9.2.9.v20150224</jetty.version>
215225
<junit.version>5.10.2</junit.version>
@@ -238,9 +248,11 @@
238248
<jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
239249
<maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
240250
<build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
241-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
242251
{{#microprofileMutiny}}
243252
<mutiny.version>1.2.0</mutiny.version>
244253
{{/microprofileMutiny}}
254+
{{#useReflectionEqualsHashCode}}
255+
<commons.lang3.version>3.17.0</commons.lang3.version>
256+
{{/useReflectionEqualsHashCode}}
245257
</properties>
246258
</project>

‎modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,14 @@
189189
<version>${jakarta.annotation.version}</version>
190190
<scope>provided</scope>
191191
</dependency>
192+
{{#useReflectionEqualsHashCode}}
193+
<!-- For equals and hashCode using reflection -->
194+
<dependency>
195+
<groupId>org.apache.commons</groupId>
196+
<artifactId>commons-lang3</artifactId>
197+
<version>${commons.lang3.version}</version>
198+
</dependency>
199+
{{/useReflectionEqualsHashCode}}
192200
</dependencies>
193201
<repositories>
194202
<repository>
@@ -203,6 +211,8 @@
203211
<java.version>11</java.version>
204212
<maven.compiler.source>${java.version}</maven.compiler.source>
205213
<maven.compiler.target>${java.version}</maven.compiler.target>
214+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
215+
206216
<swagger.core.version>1.5.18</swagger.core.version>
207217
<jetty.version>9.2.9.v20150224</jetty.version>
208218
<junit.version>5.10.2</junit.version>
@@ -231,6 +241,8 @@
231241
<jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
232242
<maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
233243
<build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
234-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
244+
{{#useReflectionEqualsHashCode}}
245+
<commons.lang3.version>3.17.0</commons.lang3.version>
246+
{{/useReflectionEqualsHashCode}}
235247
</properties>
236248
</project>

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@
152152
<java.version>11</java.version>
153153
<maven.compiler.source>${java.version}</maven.compiler.source>
154154
<maven.compiler.target>${java.version}</maven.compiler.target>
155+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
156+
155157
<swagger.core.version>1.5.18</swagger.core.version>
156158
<jetty.version>9.2.9.v20150224</jetty.version>
157159
<junit.version>5.10.2</junit.version>
@@ -175,6 +177,5 @@
175177
<jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
176178
<maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
177179
<build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
178-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
179180
</properties>
180181
</project>

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@
127127
<version>${jakarta.annotation.version}</version>
128128
<scope>provided</scope>
129129
</dependency>
130+
<!-- For equals and hashCode using reflection -->
131+
<dependency>
132+
<groupId>org.apache.commons</groupId>
133+
<artifactId>commons-lang3</artifactId>
134+
<version>${commons.lang3.version}</version>
135+
</dependency>
130136
</dependencies>
131137
<repositories>
132138
<repository>
@@ -141,6 +147,8 @@
141147
<java.version>11</java.version>
142148
<maven.compiler.source>${java.version}</maven.compiler.source>
143149
<maven.compiler.target>${java.version}</maven.compiler.target>
150+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
151+
144152
<swagger.core.version>1.5.18</swagger.core.version>
145153
<jetty.version>9.2.9.v20150224</jetty.version>
146154
<junit.version>5.10.2</junit.version>
@@ -164,6 +172,6 @@
164172
<jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
165173
<maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
166174
<build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
167-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
175+
<commons.lang3.version>3.17.0</commons.lang3.version>
168176
</properties>
169177
</project>

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Category.java‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
package org.openapitools.client.model;
1414

15+
import org.apache.commons.lang3.builder.EqualsBuilder;
16+
import org.apache.commons.lang3.builder.HashCodeBuilder;
1517
import java.util.Objects;
1618
import java.util.Arrays;
1719
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -90,20 +92,12 @@ public Category name(String name) {
9092

9193
@Override
9294
public boolean equals(Object o) {
93-
if (this == o) {
94-
return true;
95-
}
96-
if (o == null || getClass() != o.getClass()) {
97-
return false;
98-
}
99-
Category category = (Category) o;
100-
return Objects.equals(this.id, category.id) &&
101-
Objects.equals(this.name, category.name);
95+
return EqualsBuilder.reflectionEquals(this, o, false, null, true);
10296
}
10397

10498
@Override
10599
public int hashCode() {
106-
return Objects.hash(id, name);
100+
return HashCodeBuilder.reflectionHashCode(this);
107101
}
108102

109103
/**

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
package org.openapitools.client.model;
1414

15+
import org.apache.commons.lang3.builder.EqualsBuilder;
16+
import org.apache.commons.lang3.builder.HashCodeBuilder;
1517
import java.util.Objects;
1618
import java.util.Arrays;
1719
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -120,21 +122,12 @@ public ModelApiResponse message(String message) {
120122

121123
@Override
122124
public boolean equals(Object o) {
123-
if (this == o) {
124-
return true;
125-
}
126-
if (o == null || getClass() != o.getClass()) {
127-
return false;
128-
}
129-
ModelApiResponse _apiResponse = (ModelApiResponse) o;
130-
return Objects.equals(this.code, _apiResponse.code) &&
131-
Objects.equals(this.type, _apiResponse.type) &&
132-
Objects.equals(this.message, _apiResponse.message);
125+
return EqualsBuilder.reflectionEquals(this, o, false, null, true);
133126
}
134127

135128
@Override
136129
public int hashCode() {
137-
return Objects.hash(code, type, message);
130+
return HashCodeBuilder.reflectionHashCode(this);
138131
}
139132

140133
/**

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
package org.openapitools.client.model;
1414

15+
import org.apache.commons.lang3.builder.EqualsBuilder;
16+
import org.apache.commons.lang3.builder.HashCodeBuilder;
1517
import java.util.Objects;
1618
import java.util.Arrays;
1719
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -242,24 +244,12 @@ public Order complete(Boolean complete) {
242244

243245
@Override
244246
public boolean equals(Object o) {
245-
if (this == o) {
246-
return true;
247-
}
248-
if (o == null || getClass() != o.getClass()) {
249-
return false;
250-
}
251-
Order order = (Order) o;
252-
return Objects.equals(this.id, order.id) &&
253-
Objects.equals(this.petId, order.petId) &&
254-
Objects.equals(this.quantity, order.quantity) &&
255-
Objects.equals(this.shipDate, order.shipDate) &&
256-
Objects.equals(this.status, order.status) &&
257-
Objects.equals(this.complete, order.complete);
247+
return EqualsBuilder.reflectionEquals(this, o, false, null, true);
258248
}
259249

260250
@Override
261251
public int hashCode() {
262-
return Objects.hash(id, petId, quantity, shipDate, status, complete);
252+
return HashCodeBuilder.reflectionHashCode(this);
263253
}
264254

265255
/**

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
package org.openapitools.client.model;
1414

15+
import org.apache.commons.lang3.builder.EqualsBuilder;
16+
import org.apache.commons.lang3.builder.HashCodeBuilder;
1517
import java.util.Objects;
1618
import java.util.Arrays;
1719
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -264,24 +266,12 @@ public Pet status(StatusEnum status) {
264266

265267
@Override
266268
public boolean equals(Object o) {
267-
if (this == o) {
268-
return true;
269-
}
270-
if (o == null || getClass() != o.getClass()) {
271-
return false;
272-
}
273-
Pet pet = (Pet) o;
274-
return Objects.equals(this.id, pet.id) &&
275-
Objects.equals(this.category, pet.category) &&
276-
Objects.equals(this.name, pet.name) &&
277-
Objects.equals(this.photoUrls, pet.photoUrls) &&
278-
Objects.equals(this.tags, pet.tags) &&
279-
Objects.equals(this.status, pet.status);
269+
return EqualsBuilder.reflectionEquals(this, o, false, null, true);
280270
}
281271

282272
@Override
283273
public int hashCode() {
284-
return Objects.hash(id, category, name, photoUrls, tags, status);
274+
return HashCodeBuilder.reflectionHashCode(this);
285275
}
286276

287277
/**

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Tag.java‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
package org.openapitools.client.model;
1414

15+
import org.apache.commons.lang3.builder.EqualsBuilder;
16+
import org.apache.commons.lang3.builder.HashCodeBuilder;
1517
import java.util.Objects;
1618
import java.util.Arrays;
1719
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -90,20 +92,12 @@ public Tag name(String name) {
9092

9193
@Override
9294
public boolean equals(Object o) {
93-
if (this == o) {
94-
return true;
95-
}
96-
if (o == null || getClass() != o.getClass()) {
97-
return false;
98-
}
99-
Tag tag = (Tag) o;
100-
return Objects.equals(this.id, tag.id) &&
101-
Objects.equals(this.name, tag.name);
95+
return EqualsBuilder.reflectionEquals(this, o, false, null, true);
10296
}
10397

10498
@Override
10599
public int hashCode() {
106-
return Objects.hash(id, name);
100+
return HashCodeBuilder.reflectionHashCode(this);
107101
}
108102

109103
/**

0 commit comments

Comments
 (0)