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

Update logback core to newer version v1.5.13 #20363

Merged
merged 4 commits into from
Dec 21, 2024
Merged

Update logback core to newer version v1.5.13 #20363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adc7b4d
update logback to newer version
wing328 Dec 21, 2024
33e6fe5
update java inflector samples
wing328 Dec 21, 2024
ae8484a
update logback to newer version
wing328 Dec 21, 2024
5ef29f2
fix auto-generated tests
wing328 Dec 21, 2024
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 modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
<swagger.core.version>1.5.18</swagger.core.version>
<jetty.version>9.2.9.v20150224</jetty.version>
<junit.version>5.10.2</junit.version>
<logback.version>1.4.14</logback.version>
<logback.version>1.5.13</logback.version>
{{#useBeanValidation}}
<beanvalidation.version>3.0.2</beanvalidation.version>
{{/useBeanValidation}}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
<swagger.core.version>1.5.18</swagger.core.version>
<jetty.version>9.2.9.v20150224</jetty.version>
<junit.version>5.10.2</junit.version>
<logback.version>1.4.14</logback.version>
<logback.version>1.5.13</logback.version>
{{#useBeanValidation}}
<beanvalidation.version>3.0.1</beanvalidation.version>
{{/useBeanValidation}}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
<maven-plugin-version>1.0.0</maven-plugin-version>
<swagger-inflector-version>1.0.14</swagger-inflector-version>
<jetty-version>9.2.9.v20150224</jetty-version>
<logback-version>1.2.12</logback-version>
<logback-version>1.5.13</logback-version>
{{#useJakartaEe}}
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
{{/useJakartaEe}}
Expand Down
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/api_test.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.junit.Test;
import org.junit.Before;
import static org.junit.Assert.*;

import {{javaxPackage}}.validation.Valid;
import {{javaxPackage}}.ws.rs.core.MediaType;
import {{javaxPackage}}.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ for this project used jakarta.validation-api -->
<swagger-core-version>1.5.22</swagger-core-version>
<jetty-version>9.2.9.v20150224</jetty-version>
<junit-version>4.13.2</junit-version>
<logback-version>1.4.14</logback-version>
<logback-version>1.5.13</logback-version>
{{#useBeanValidation}}
<beanvalidation-version>2.0.2</beanvalidation-version>
{{/useBeanValidation}}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ for this project used jakarta.validation-api -->
{{/generateSpringApplication}}
{{^generateSpringBootApplication}}
<junit-version>4.13.2</junit-version>
<logback-version>1.2.12</logback-version>
<logback-version>1.5.13</logback-version>
{{/generateSpringBootApplication}}
<cxf-version>3.5.9</cxf-version>
<jackson-jaxrs-version>2.17.1</jackson-jaxrs-version>
Expand Down
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/api_test.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.junit.Test;
import org.junit.Before;
import static org.junit.Assert.*;

import {{javaxPackage}}.validation.Valid;
import {{javaxPackage}}.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.ClientConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ for this project used jakarta.validation-api -->
<swagger-core-version>1.5.18</swagger-core-version>
<jetty-version>9.2.9.v20150224</jetty-version>
<junit-version>4.13.2</junit-version>
<logback-version>1.4.14</logback-version>
<logback-version>1.5.13</logback-version>
{{#useBeanValidation}}
<beanvalidation-version>2.0.2</beanvalidation-version>
{{/useBeanValidation}}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ for this project used jakarta.validation-api -->
<swagger-core-version>1.5.22</swagger-core-version>
<jetty-version>9.2.9.v20150224</jetty-version>
<junit-version>4.13.2</junit-version>
<logback-version>1.4.14</logback-version>
<logback-version>1.5.13</logback-version>
{{#useBeanValidation}}
<beanvalidation-version>2.0.2</beanvalidation-version>
{{/useBeanValidation}}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
<jersey3-version>3.1.3</jersey3-version>
<jackson-version>2.17.1</jackson-version>
<junit-version>4.13.2</junit-version>
<logback-version>1.4.14</logback-version>
<logback-version>1.5.13</logback-version>
<servlet-api-version>5.0.0</servlet-api-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ for this project used jakarta.validation-api -->
<jersey2-version>2.35</jersey2-version>
<jackson-version>2.17.1</jackson-version>
<junit-version>4.13.2</junit-version>
<logback-version>1.4.14</logback-version>
<logback-version>1.5.13</logback-version>
<servlet-api-version>4.0.4</servlet-api-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<springfox-swagger-ui>2.6.0</springfox-swagger-ui>
<slf4j-api>1.7.25</slf4j-api>
<logstash-logback-encoder>4.11</logstash-logback-encoder>
<logback-core>1.4.13</logback-core>
<logback-classic>1.4.13</logback-classic>
<logback-core>1.5.13</logback-core>
<logback-classic>1.5.13</logback-classic>
<gatling.version>2.3.0</gatling.version>
<gatling-plugin.version>2.2.4</gatling-plugin.version>
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<version.commons.codec>1.10</version.commons.codec>
<version.encoder>1.2</version.encoder>
<version.metrics>3.1.2</version.metrics>
<version.logback>1.4.13</version.logback>
<version.logback>1.5.13</version.logback>
<version.junit>4.13.2</version.junit>
<version.mockito>2.1.0-beta.124</version.mockito>
<version.undertow>2.3.17.Final</version.undertow>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin.code.style=official
ktor_version=3.0.2
kotlin_version=2.0.20
logback_version=1.4.14
logback_version=1.5.13
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin.code.style=official
ktor_version=2.3.12
kotlin_version=2.0.20
logback_version=1.4.14
logback_version=1.5.13
2 changes: 1 addition & 1 deletion samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<swagger.core.version>1.5.18</swagger.core.version>
<jetty.version>9.2.9.v20150224</jetty.version>
<junit.version>5.10.2</junit.version>
<logback.version>1.4.14</logback.version>
<logback.version>1.5.13</logback.version>
<cxf.version>3.2.7</cxf.version>
<jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
<jackson.version>2.17.1</jackson.version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
<swagger.core.version>1.5.18</swagger.core.version>
<jetty.version>9.2.9.v20150224</jetty.version>
<junit.version>5.10.2</junit.version>
<logback.version>1.4.14</logback.version>
<logback.version>1.5.13</logback.version>
<cxf.version>3.2.7</cxf.version>
<jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
<jackson.version>2.17.1</jackson.version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<swagger.core.version>1.5.18</swagger.core.version>
<jetty.version>9.2.9.v20150224</jetty.version>
<junit.version>5.10.2</junit.version>
<logback.version>1.4.14</logback.version>
<logback.version>1.5.13</logback.version>
<cxf.version>3.2.7</cxf.version>
<jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
<jakarta.activation.version>2.1.0</jakarta.activation.version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<swagger.core.version>1.5.18</swagger.core.version>
<jetty.version>9.2.9.v20150224</jetty.version>
<junit.version>5.10.2</junit.version>
<logback.version>1.4.14</logback.version>
<logback.version>1.5.13</logback.version>
<cxf.version>3.2.7</cxf.version>
<jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
<jakarta.activation.version>2.1.0</jakarta.activation.version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<swagger.core.version>1.5.18</swagger.core.version>
<jetty.version>9.2.9.v20150224</jetty.version>
<junit.version>5.10.2</junit.version>
<logback.version>1.4.14</logback.version>
<logback.version>1.5.13</logback.version>
<cxf.version>3.2.7</cxf.version>
<jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
<jakarta.activation.version>1.2.2</jakarta.activation.version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<swagger.core.version>1.5.18</swagger.core.version>
<jetty.version>9.2.9.v20150224</jetty.version>
<junit.version>5.10.2</junit.version>
<logback.version>1.4.14</logback.version>
<logback.version>1.5.13</logback.version>
<cxf.version>3.2.7</cxf.version>
<jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
<jakarta.activation.version>1.2.2</jakarta.activation.version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<swagger.core.version>1.5.18</swagger.core.version>
<jetty.version>9.2.9.v20150224</jetty.version>
<junit.version>5.10.2</junit.version>
<logback.version>1.4.14</logback.version>
<logback.version>1.5.13</logback.version>
<cxf.version>3.2.7</cxf.version>
<jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
<jakarta.activation.version>2.1.0</jakarta.activation.version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/microprofile-rest-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<swagger.core.version>1.5.18</swagger.core.version>
<jetty.version>9.2.9.v20150224</jetty.version>
<junit.version>5.10.2</junit.version>
<logback.version>1.4.14</logback.version>
<logback.version>1.5.13</logback.version>
<cxf.version>3.2.7</cxf.version>
<jackson.jaxrs.version>2.17.1</jackson.jaxrs.version>
<jakarta.activation.version>1.2.2</jakarta.activation.version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ for this project used jakarta.validation-api -->
<swagger-core-version>1.5.18</swagger-core-version>
<jetty-version>9.2.9.v20150224</jetty-version>
<junit-version>4.13.2</junit-version>
<logback-version>1.4.14</logback-version>
<logback-version>1.5.13</logback-version>
<cxf-version>3.5.9</cxf-version>
<jackson-jaxrs-version>2.17.1</jackson-jaxrs-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/jaxrs-cxf-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ for this project used jakarta.validation-api -->
<swagger-core-version>1.5.18</swagger-core-version>
<jetty-version>9.2.9.v20150224</jetty-version>
<junit-version>4.13.2</junit-version>
<logback-version>1.4.14</logback-version>
<logback-version>1.5.13</logback-version>
<cxf-version>3.5.9</cxf-version>
<jackson-jaxrs-version>2.17.1</jackson-jaxrs-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/java-inflector/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.0.0-SNAPSHOT
7.11.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/java-inflector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
<maven-plugin-version>1.0.0</maven-plugin-version>
<swagger-inflector-version>1.0.14</swagger-inflector-version>
<jetty-version>9.2.9.v20150224</jetty-version>
<logback-version>1.2.10</logback-version>
<logback-version>1.5.13</logback-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<junit-version>4.13.2</junit-version>
<slf4j-version>1.6.3</slf4j-version>
Expand Down
2 changes: 1 addition & 1 deletion .../server/petstore/java-inflector/src/gen/java/org/openapitools/controllers/StringUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.openapitools.controllers;

@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).
Expand Down
6 changes: 3 additions & 3 deletions ...store/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@



@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
@JsonProperty("name")
private String name;
Expand Down Expand Up @@ -44,12 +44,12 @@ public boolean equals(Object o) {
return false;
}
AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
return Objects.equals(name, additionalPropertiesAnyType.name);
return super.equals(o) && Objects.equals(name, additionalPropertiesAnyType.name);
}

@Override
public int hashCode() {
return Objects.hash(name);
return Objects.hash(super.hashCode(), name);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...etstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@



@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesArray extends HashMap<String, List> {
@JsonProperty("name")
private String name;
Expand Down Expand Up @@ -45,12 +45,12 @@ public boolean equals(Object o) {
return false;
}
AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
return Objects.equals(name, additionalPropertiesArray.name);
return super.equals(o) && Objects.equals(name, additionalPropertiesArray.name);
}

@Override
public int hashCode() {
return Objects.hash(name);
return Objects.hash(super.hashCode(), name);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...store/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@



@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
@JsonProperty("name")
private String name;
Expand Down Expand Up @@ -44,12 +44,12 @@ public boolean equals(Object o) {
return false;
}
AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
return Objects.equals(name, additionalPropertiesBoolean.name);
return super.equals(o) && Objects.equals(name, additionalPropertiesBoolean.name);
}

@Override
public int hashCode() {
return Objects.hash(name);
return Objects.hash(super.hashCode(), name);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...etstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@



@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesClass {
@JsonProperty("map_string")
private Map<String, String> mapString = null;
Expand Down
6 changes: 3 additions & 3 deletions ...store/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@



@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
@JsonProperty("name")
private String name;
Expand Down Expand Up @@ -44,12 +44,12 @@ public boolean equals(Object o) {
return false;
}
AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
return Objects.equals(name, additionalPropertiesInteger.name);
return super.equals(o) && Objects.equals(name, additionalPropertiesInteger.name);
}

@Override
public int hashCode() {
return Objects.hash(name);
return Objects.hash(super.hashCode(), name);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...tstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@



@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
@JsonProperty("name")
private String name;
Expand Down Expand Up @@ -45,12 +45,12 @@ public boolean equals(Object o) {
return false;
}
AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
return Objects.equals(name, additionalPropertiesNumber.name);
return super.equals(o) && Objects.equals(name, additionalPropertiesNumber.name);
}

@Override
public int hashCode() {
return Objects.hash(name);
return Objects.hash(super.hashCode(), name);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...tstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@



@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaInflectorServerCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesObject extends HashMap<String, Map> {
@JsonProperty("name")
private String name;
Expand Down Expand Up @@ -44,12 +44,12 @@ public boolean equals(Object o) {
return false;
}
AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
return Objects.equals(name, additionalPropertiesObject.name);
return super.equals(o) && Objects.equals(name, additionalPropertiesObject.name);
}

@Override
public int hashCode() {
return Objects.hash(name);
return Objects.hash(super.hashCode(), name);
}

@Override
Expand Down
Loading
Loading