update java inflector samples

OpenAPITools · Dec 21, 2024 · 33e6fe5 · 33e6fe5
1 parent adc7b4d
commit 33e6fe5
Show file tree

Hide file tree

Showing 55 changed files with 178 additions and 113 deletions.
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/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/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

diff --git a/...tstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/...tstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesString.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 AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
   private String name;
@@ -44,12 +44,12 @@ public boolean equals(Object o) {
       return false;
     }
     AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
-    return Objects.equals(name, additionalPropertiesString.name);
+    return super.equals(o) && Objects.equals(name, additionalPropertiesString.name);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name);
+    return Objects.hash(super.hashCode(), name);
   }
 
   @Override

diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Animal.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 Animal   {
   @JsonProperty("className")
   private String className;

diff --git a/...petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/...petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -7,13 +7,14 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 
 
 
 
-@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 ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
   private List<List<BigDecimal>> arrayArrayNumber = null;

diff --git a/...server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/...server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -7,13 +7,14 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 
 
 
 
-@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 ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
   private List<BigDecimal> arrayNumber = null;

diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -6,14 +6,15 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openapitools.model.ReadOnlyFirst;
 
 
 
 
 
-@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 ArrayTest   {
   @JsonProperty("array_of_string")
   private List<String> arrayOfString = null;

diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/BigCat.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 BigCat extends Cat  {
   /**
    * Gets or Sets kind
@@ -79,12 +79,12 @@ public boolean equals(Object o) {
       return false;
     }
     BigCat bigCat = (BigCat) o;
-    return Objects.equals(kind, bigCat.kind);
+    return super.equals(o) && Objects.equals(kind, bigCat.kind);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(kind);
+    return Objects.hash(super.hashCode(), kind);
   }
 
   @Override

diff --git a/...es/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Capitalization.java b/...es/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Capitalization.java
@@ -10,7 +10,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 Capitalization   {
   @JsonProperty("smallCamel")
   private String smallCamel;

diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Cat.java
@@ -11,7 +11,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 Cat extends Animal  {
   @JsonProperty("declawed")
   private Boolean declawed;
@@ -43,12 +43,12 @@ public boolean equals(Object o) {
       return false;
     }
     Cat cat = (Cat) o;
-    return Objects.equals(declawed, cat.declawed);
+    return super.equals(o) && Objects.equals(declawed, cat.declawed);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(declawed);
+    return Objects.hash(super.hashCode(), declawed);
   }
 
   @Override

diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Category.java
@@ -10,7 +10,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 Category   {
   @JsonProperty("id")
   private Long id;

diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,7 @@
  **/
 
 @ApiModel(description = "Model for testing model with \"_class\" property")
-@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 ClassModel   {
   @JsonProperty("_class")
   private String propertyClass;

diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Client.java
@@ -10,7 +10,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 Client   {
   @JsonProperty("client")
   private String client;

diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Dog.java
@@ -11,7 +11,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 Dog extends Animal  {
   @JsonProperty("breed")
   private String breed;
@@ -43,12 +43,12 @@ public boolean equals(Object o) {
       return false;
     }
     Dog dog = (Dog) o;
-    return Objects.equals(breed, dog.breed);
+    return super.equals(o) && Objects.equals(breed, dog.breed);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(breed);
+    return Objects.hash(super.hashCode(), breed);
   }
 
   @Override

diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -7,13 +7,14 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 
 
 
 
-@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 EnumArrays   {
   /**
    * Gets or Sets justSymbol