Update logback core to newer version v1.5.13 (#20363)

* update logback to newer version * update java inflector samples * update logback to newer version * fix auto-generated tests
OpenAPITools · Dec 21, 2024 · 8790f7c · 8790f7c
1 parent eceef28
commit 8790f7c
Show file tree

Hide file tree

Showing 103 changed files with 227 additions and 148 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
@@ -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}}

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache
@@ -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}}

diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache
@@ -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}}

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/api_test.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/api_test.mustache
@@ -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;

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache
@@ -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}}

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache
@@ -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>

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/api_test.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/api_test.mustache
@@ -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;

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache
@@ -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}}

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
@@ -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}}

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/pom.mustache
@@ -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>

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache
@@ -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>

diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache
@@ -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>

diff --git a/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache
@@ -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>

diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle.properties b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/gradle.properties
@@ -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
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/gradle.properties b/modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor2/gradle.properties
@@ -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
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml
@@ -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>

diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml
@@ -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>

diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml
@@ -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>

diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml
@@ -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>

diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml b/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml
@@ -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>

diff --git a/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml b/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml
@@ -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>

diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml
@@ -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>

diff --git a/samples/client/petstore/java/microprofile-rest-client/pom.xml b/samples/client/petstore/java/microprofile-rest-client/pom.xml
@@ -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>

diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml b/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml
@@ -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>

diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml
@@ -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>

diff --git a/samples/server/petstore/java-inflector/.openapi-generator/VERSION b/samples/server/petstore/java-inflector/.openapi-generator/VERSION
@@ -1 +1 @@
-7.0.0-SNAPSHOT
+7.11.0-SNAPSHOT
diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml
@@ -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>

diff --git a/.../server/petstore/java-inflector/src/gen/java/org/openapitools/controllers/StringUtil.java b/.../server/petstore/java-inflector/src/gen/java/org/openapitools/controllers/StringUtil.java
@@ -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).

diff --git a/...store/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/...store/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -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;
@@ -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

diff --git a/...etstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/...etstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -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;
@@ -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

diff --git a/...store/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/...store/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -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;
@@ -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

diff --git a/...etstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/...etstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -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;

diff --git a/...store/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/...store/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -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;
@@ -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

diff --git a/...tstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/...tstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -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;
@@ -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

diff --git a/...tstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/...tstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -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;
@@ -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