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 index 59896d820f43..4fefd6db233e 100644 --- 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 @@ 1.5.18 9.2.9.v20150224 5.10.2 - 1.4.14 + 1.5.13 {{#useBeanValidation}} 3.0.2 {{/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 index e4ab3b15ec86..9462e0d9236b 100644 --- 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 @@ 1.5.18 9.2.9.v20150224 5.10.2 - 1.4.14 + 1.5.13 {{#useBeanValidation}} 3.0.1 {{/useBeanValidation}} diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache index 3e5ed936625f..67af2ce5e31a 100644 --- a/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaInflector/pom.mustache @@ -162,7 +162,7 @@ 1.0.0 1.0.14 9.2.9.v20150224 - 1.2.12 + 1.5.13 {{#useJakartaEe}} 2.1.1 {{/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 index a4477b5a0aa3..7decc4e441d6 100644 --- 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 index 4900c6d27ded..71b5f42a18df 100644 --- 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 --> 1.5.22 9.2.9.v20150224 4.13.2 - 1.4.14 + 1.5.13 {{#useBeanValidation}} 2.0.2 {{/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 index dc1d394348d7..d744472a18f3 100644 --- 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}} 4.13.2 - 1.2.12 + 1.5.13 {{/generateSpringBootApplication}} 3.5.9 2.17.1 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 index 8606cf7fb63d..bbaf8e4d9997 100644 --- 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 index cbee86960906..35a5954ebb74 100644 --- 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 --> 1.5.18 9.2.9.v20150224 4.13.2 - 1.4.14 + 1.5.13 {{#useBeanValidation}} 2.0.2 {{/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 index 961cd74d1579..f6c85b652eae 100644 --- 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 --> 1.5.22 9.2.9.v20150224 4.13.2 - 1.4.14 + 1.5.13 {{#useBeanValidation}} 2.0.2 {{/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 index 5734fc17ddf4..bfc62eb8ae3e 100644 --- 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 @@ 3.1.3 2.17.1 4.13.2 - 1.4.14 + 1.5.13 5.0.0 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache index 3b2a9f2dc3e1..954fc7cae4f2 100644 --- 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 --> 2.35 2.17.1 4.13.2 - 1.4.14 + 1.5.13 4.0.4 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache index a71a194d56bf..77ffeef5254f 100644 --- 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 @@ 2.6.0 1.7.25 4.11 - 1.4.13 - 1.4.13 + 1.5.13 + 1.5.13 2.3.0 2.2.4 3.2.2 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 index a082fc34eb9d..5d9b6b553ae1 100644 --- 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 @@ 1.10 1.2 3.1.2 - 1.4.13 + 1.5.13 4.13.2 2.1.0-beta.124 2.3.17.Final 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 index fb877a9edd28..1fb076431bba 100644 --- 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 \ No newline at end of file +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 index d507b58c1c87..126ddfe69da1 100644 --- 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 \ No newline at end of file +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 index a6a61b273cb0..a5df70c97604 100644 --- 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 @@ 1.5.18 9.2.9.v20150224 5.10.2 - 1.4.14 + 1.5.13 3.2.7 2.17.1 2.17.1 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 index 16079576ce67..e79da281f43c 100644 --- 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 @@ 1.5.18 9.2.9.v20150224 5.10.2 - 1.4.14 + 1.5.13 3.2.7 2.17.1 2.17.1 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 index 5804a8d6e32b..d930a9f96dc9 100644 --- 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 @@ 1.5.18 9.2.9.v20150224 5.10.2 - 1.4.14 + 1.5.13 3.2.7 2.17.1 2.1.0 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 index d62c69aa7957..7b03483c49eb 100644 --- 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 @@ 1.5.18 9.2.9.v20150224 5.10.2 - 1.4.14 + 1.5.13 3.2.7 2.17.1 2.1.0 diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml b/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml index d9ca684ed950..57273ef43a84 100644 --- 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 @@ 1.5.18 9.2.9.v20150224 5.10.2 - 1.4.14 + 1.5.13 3.2.7 2.17.1 1.2.2 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 index d5fb59988d9a..cc21c05b3882 100644 --- 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 @@ 1.5.18 9.2.9.v20150224 5.10.2 - 1.4.14 + 1.5.13 3.2.7 2.17.1 1.2.2 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 index ec0b6c7eb2bf..3e6d548f51ae 100644 --- 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 @@ 1.5.18 9.2.9.v20150224 5.10.2 - 1.4.14 + 1.5.13 3.2.7 2.17.1 2.1.0 diff --git a/samples/client/petstore/java/microprofile-rest-client/pom.xml b/samples/client/petstore/java/microprofile-rest-client/pom.xml index f3bb0cf3c400..59af12cd31c9 100644 --- a/samples/client/petstore/java/microprofile-rest-client/pom.xml +++ b/samples/client/petstore/java/microprofile-rest-client/pom.xml @@ -155,7 +155,7 @@ 1.5.18 9.2.9.v20150224 5.10.2 - 1.4.14 + 1.5.13 3.2.7 2.17.1 1.2.2 diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml b/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml index cc13daea0bfb..52fe25f92ee0 100644 --- 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 --> 1.5.18 9.2.9.v20150224 4.13.2 - 1.4.14 + 1.5.13 3.5.9 2.17.1 1.3.5 diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml index edf9249f8cd0..1521434254ca 100644 --- 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 --> 1.5.18 9.2.9.v20150224 4.13.2 - 1.4.14 + 1.5.13 3.5.9 2.17.1 1.3.5 diff --git a/samples/server/petstore/java-inflector/.openapi-generator/VERSION b/samples/server/petstore/java-inflector/.openapi-generator/VERSION index 757e67400401..884119126398 100644 --- a/samples/server/petstore/java-inflector/.openapi-generator/VERSION +++ b/samples/server/petstore/java-inflector/.openapi-generator/VERSION @@ -1 +1 @@ -7.0.0-SNAPSHOT \ No newline at end of file +7.11.0-SNAPSHOT diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml index acd13679ba6b..6cdeb7eaa66e 100644 --- a/samples/server/petstore/java-inflector/pom.xml +++ b/samples/server/petstore/java-inflector/pom.xml @@ -162,7 +162,7 @@ 1.0.0 1.0.14 9.2.9.v20150224 - 1.2.10 + 1.5.13 1.3.5 4.13.2 1.6.3 diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/controllers/StringUtil.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/controllers/StringUtil.java index c53c2d62b08c..a6b07c1a90e4 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/controllers/StringUtil.java +++ b/samples/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/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 45349a0d1ff2..99664c1f9fcc 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/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 { @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/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java index e5f8a37caac8..6306e4130717 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/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 { @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/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java index e6a70ee6675e..1cbed4f4c10c 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/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 { @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/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index b0fe5955c311..b5afd7e852d7 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/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 mapString = null; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java index 769a33533def..f2fb063f62d8 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/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 { @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/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java index fba5c58a6ca2..ccb2d261e4e9 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/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 { @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/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java index 7ff74d023e40..88c7c039f57d 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/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 { @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/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java index 82b785f68dfd..f77e44c517cf 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/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 { @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 index 83a35cb8fb16..002b00d3a80d 100644 --- 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/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 51d1f66b6e28..5c3837046340 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/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> arrayArrayNumber = null; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 3d43be02811f..93a8a90b57be 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/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 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 index 2d2bb7e9736f..0ba51572d37a 100644 --- 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,6 +6,7 @@ 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; @@ -13,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 ArrayTest { @JsonProperty("array_of_string") private List 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 index 1066d414917d..9baf3d2b6013 100644 --- 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/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Capitalization.java index 8de335e5ae00..741418db50d5 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/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 index c2128a55abf5..57616b9e4d6f 100644 --- 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 index 3e3d692f4525..dc5edf5e7eff 100644 --- 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 index b17b14c15b88..7cc32987ca6d 100644 --- 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 index 1e55f2ce1d60..a29d7c4b53b0 100644 --- 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 index d0309bdf1336..0f1096efe644 100644 --- 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 index 82b4fec020c4..27db23d26081 100644 --- 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 diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumTest.java index a183df292ef3..446db0765b32 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/EnumTest.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 EnumTest { /** * Gets or Sets enumString diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 231e04756dba..fcc31395ca3e 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -6,6 +6,7 @@ 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.ModelFile; @@ -13,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 FileSchemaTestClass { @JsonProperty("file") private ModelFile _file; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FormatTest.java index 0ba9970df741..0857cd103a2f 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/FormatTest.java @@ -15,7 +15,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 FormatTest { @JsonProperty("integer") private Integer integer; @@ -355,7 +355,7 @@ public String toString() { sb.append(" date: ").append(toIndentedString(date)).append("\n"); sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); + sb.append(" password: ").append("*").append("\n"); sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 7cd40575db2f..fe5bff2964d6 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/HasOnlyReadOnly.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 HasOnlyReadOnly { @JsonProperty("bar") private String bar; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MapTest.java index dad11aaad01b..d4486af22f12 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MapTest.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 MapTest { @JsonProperty("map_map_of_string") private Map> mapMapOfString = null; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 4533e418bb34..3a3414bbfec1 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -15,7 +15,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 MixedPropertiesAndAdditionalPropertiesClass { @JsonProperty("uuid") private UUID uuid; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Model200Response.java index 9941883c30be..8e8faa0087c1 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Model200Response.java @@ -14,7 +14,7 @@ **/ @ApiModel(description = "Model for testing model name starting with number") -@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 Model200Response { @JsonProperty("name") private Integer name; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelApiResponse.java index 62f6a501f1ac..c09a3e85b04d 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelApiResponse.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 ModelApiResponse { @JsonProperty("code") private Integer code; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelFile.java index 7073df37eaf5..483bb5b6d147 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelFile.java @@ -14,7 +14,7 @@ **/ @ApiModel(description = "Must be named `File` for test.") -@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 ModelFile { @JsonProperty("sourceURI") private String sourceURI; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelList.java index 5ae57a336eb8..a74e3f39d9f5 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelList.java @@ -3,6 +3,7 @@ import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -10,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 ModelList { @JsonProperty("123-list") private String _123list; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelReturn.java index a470e947c815..9dfbf8f802f0 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ModelReturn.java @@ -14,7 +14,7 @@ **/ @ApiModel(description = "Model for testing reserved words") -@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 ModelReturn { @JsonProperty("return") private Integer _return; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Name.java index 1cac4ce3c50a..683f566c677f 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Name.java @@ -13,7 +13,7 @@ **/ @ApiModel(description = "Model for testing model name same as property name") -@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 Name { @JsonProperty("name") private Integer name; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/NumberOnly.java index 2ba1616189aa..189160727a51 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/NumberOnly.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 NumberOnly { @JsonProperty("JustNumber") private BigDecimal justNumber; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Order.java index 389f6b360de4..49a662e17ce9 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Order.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 Order { @JsonProperty("id") private Long id; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/OuterComposite.java index 48c0bdfab327..82ef81a33ac6 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/OuterComposite.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 OuterComposite { @JsonProperty("my_number") private BigDecimal myNumber; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Pet.java index 418e4f1e6923..3f4818170378 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Pet.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -18,7 +19,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 Pet { @JsonProperty("id") private Long id; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index ec126ac7f9ad..f122c7a42c03 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/ReadOnlyFirst.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 ReadOnlyFirst { @JsonProperty("bar") private String bar; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/SpecialModelName.java index b34b6dc259fe..0be0cd995cc8 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/SpecialModelName.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 SpecialModelName { @JsonProperty("$special[property.name]") private Long $specialPropertyName; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Tag.java index dfe3ec38db06..6bd167aca80d 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/Tag.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 Tag { @JsonProperty("id") private Long id; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderDefault.java index f7557955d241..0e999725b48c 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderDefault.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 TypeHolderDefault { @JsonProperty("string_item") private String stringItem = "what"; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderExample.java index 5ce6daf8d028..d35c15894480 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/TypeHolderExample.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 TypeHolderExample { @JsonProperty("string_item") private String stringItem; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/User.java index 3ede0b08956d..68f90e0bf955 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/User.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 User { @JsonProperty("id") private Long id; diff --git a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/XmlItem.java index 816985036ac6..f5cf122ed432 100644 --- a/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/java-inflector/src/gen/java/org/openapitools/model/XmlItem.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 XmlItem { @JsonProperty("attribute_string") private String attributeString; diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/AnotherFakeController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/AnotherFakeController.java index 0391e63f3b66..8d38388de3f1 100644 --- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/AnotherFakeController.java +++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/AnotherFakeController.java @@ -11,8 +11,9 @@ import org.openapitools.model.*; import org.openapitools.model.Client; +import java.util.UUID; -@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 AnotherFakeController { /** * Uncomment and implement as you see fit. These operations will map @@ -21,7 +22,7 @@ public class AnotherFakeController { **/ /* - public ResponseContext call123testSpecialTags(RequestContext request , Client body) { + public ResponseContext call123testSpecialTags(RequestContext request , UUID uuidTest, Client body) { return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); } */ diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeClassnameTestController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeClassnameTestController.java index 84ba2a5b5768..9ef9a4bee76a 100644 --- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeClassnameTestController.java +++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeClassnameTestController.java @@ -12,7 +12,7 @@ import org.openapitools.model.Client; -@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 FakeClassnameTestController { /** * Uncomment and implement as you see fit. These operations will map diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeController.java index d3be134a7bf4..0736578041e5 100644 --- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeController.java +++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/FakeController.java @@ -15,13 +15,14 @@ import java.util.Date; import java.io.File; import org.openapitools.model.FileSchemaTestClass; +import java.util.List; import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; import org.openapitools.model.XmlItem; -@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 FakeController { /** * Uncomment and implement as you see fit. These operations will map diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/PetController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/PetController.java index bd5828a2ef49..b35e409b639e 100644 --- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/PetController.java +++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/PetController.java @@ -11,11 +11,12 @@ import org.openapitools.model.*; import java.io.File; +import java.util.List; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import java.util.Set; -@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 PetController { /** * Uncomment and implement as you see fit. These operations will map diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/StoreController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/StoreController.java index 8e383b935cf3..a53267ee7b29 100644 --- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/StoreController.java +++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/StoreController.java @@ -13,7 +13,7 @@ import java.util.Map; import org.openapitools.model.Order; -@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 StoreController { /** * Uncomment and implement as you see fit. These operations will map diff --git a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/UserController.java b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/UserController.java index 1eb1c03a981a..3c1c3feee81d 100644 --- a/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/UserController.java +++ b/samples/server/petstore/java-inflector/src/main/java/org/openapitools/controllers/UserController.java @@ -14,7 +14,7 @@ import java.util.List; import org.openapitools.model.User; -@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 UserController { /** * Uncomment and implement as you see fit. These operations will map diff --git a/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml b/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml index 432de96b6f01..ba968087cc27 100644 --- a/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/java-inflector/src/main/openapi/openapi.yaml @@ -47,7 +47,8 @@ paths: - pet x-codegen-request-body-name: body x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json put: operationId: updatePet requestBody: @@ -82,7 +83,8 @@ paths: - pet x-codegen-request-body-name: body x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json /pet/findByStatus: get: description: Multiple status values can be provided with comma separated strings @@ -127,7 +129,9 @@ paths: summary: Finds Pets by status tags: - pet - x-accepts: application/json + x-accepts: + - application/json + - application/xml /pet/findByTags: get: deprecated: true @@ -172,7 +176,9 @@ paths: summary: Finds Pets by tags tags: - pet - x-accepts: application/json + x-accepts: + - application/json + - application/xml /pet/{petId}: delete: operationId: deletePet @@ -202,7 +208,8 @@ paths: summary: Deletes a pet tags: - pet - x-accepts: application/json + x-accepts: + - application/json get: description: Returns a single pet operationId: getPetById @@ -235,7 +242,9 @@ paths: summary: Find pet by ID tags: - pet - x-accepts: application/json + x-accepts: + - application/json + - application/xml post: operationId: updatePetWithForm parameters: @@ -263,7 +272,8 @@ paths: tags: - pet x-content-type: application/x-www-form-urlencoded - x-accepts: application/json + x-accepts: + - application/json /pet/{petId}/uploadImage: post: operationId: uploadFile @@ -295,7 +305,8 @@ paths: tags: - pet x-content-type: multipart/form-data - x-accepts: application/json + x-accepts: + - application/json /store/inventory: get: description: Returns a map of status codes to quantities @@ -315,7 +326,8 @@ paths: summary: Returns pet inventories by status tags: - store - x-accepts: application/json + x-accepts: + - application/json /store/order: post: operationId: placeOrder @@ -344,7 +356,9 @@ paths: - store x-codegen-request-body-name: body x-content-type: '*/*' - x-accepts: application/json + x-accepts: + - application/json + - application/xml /store/order/{order_id}: delete: description: For valid response try integer IDs with value < 1000. Anything @@ -367,7 +381,8 @@ paths: summary: Delete purchase order by ID tags: - store - x-accepts: application/json + x-accepts: + - application/json get: description: For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions @@ -401,7 +416,9 @@ paths: summary: Find purchase order by ID tags: - store - x-accepts: application/json + x-accepts: + - application/json + - application/xml /user: post: description: This can only be done by the logged in user. @@ -422,7 +439,8 @@ paths: - user x-codegen-request-body-name: body x-content-type: '*/*' - x-accepts: application/json + x-accepts: + - application/json /user/createWithArray: post: operationId: createUsersWithArrayInput @@ -444,7 +462,8 @@ paths: - user x-codegen-request-body-name: body x-content-type: '*/*' - x-accepts: application/json + x-accepts: + - application/json /user/createWithList: post: operationId: createUsersWithListInput @@ -466,7 +485,8 @@ paths: - user x-codegen-request-body-name: body x-content-type: '*/*' - x-accepts: application/json + x-accepts: + - application/json /user/login: get: operationId: loginUser @@ -510,7 +530,9 @@ paths: summary: Logs user into the system tags: - user - x-accepts: application/json + x-accepts: + - application/json + - application/xml /user/logout: get: operationId: logoutUser @@ -521,7 +543,8 @@ paths: summary: Logs out current logged in user session tags: - user - x-accepts: application/json + x-accepts: + - application/json /user/{username}: delete: description: This can only be done by the logged in user. @@ -543,7 +566,8 @@ paths: summary: Delete user tags: - user - x-accepts: application/json + x-accepts: + - application/json get: operationId: getUserByName parameters: @@ -572,7 +596,9 @@ paths: summary: Get user by user name tags: - user - x-accepts: application/json + x-accepts: + - application/json + - application/xml put: description: This can only be done by the logged in user. operationId: updateUser @@ -602,7 +628,8 @@ paths: - user x-codegen-request-body-name: body x-content-type: '*/*' - x-accepts: application/json + x-accepts: + - application/json /fake_classname_test: patch: description: To test class name in snake case @@ -628,7 +655,8 @@ paths: - fake_classname_tags 123#$%^ x-codegen-request-body-name: body x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json /fake: delete: description: Fake endpoint to test group parameters (optional) @@ -677,7 +705,8 @@ paths: tags: - fake x-group-parameters: true - x-accepts: application/json + x-accepts: + - application/json get: description: To test enum parameters operationId: testEnumParameters @@ -762,7 +791,8 @@ paths: tags: - fake x-content-type: application/x-www-form-urlencoded - x-accepts: application/json + x-accepts: + - application/json patch: description: To test "client" model operationId: testClientModel @@ -785,7 +815,8 @@ paths: - fake x-codegen-request-body-name: body x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json post: description: |- Fake endpoint for testing various parameters @@ -816,7 +847,8 @@ paths: tags: - fake x-content-type: application/x-www-form-urlencoded - x-accepts: application/json + x-accepts: + - application/json /fake/outer/number: post: description: Test serialization of outer number types @@ -839,7 +871,8 @@ paths: - fake x-codegen-request-body-name: body x-content-type: '*/*' - x-accepts: '*/*' + x-accepts: + - '*/*' /fake/outer/string: post: description: Test serialization of outer string types @@ -862,7 +895,8 @@ paths: - fake x-codegen-request-body-name: body x-content-type: '*/*' - x-accepts: '*/*' + x-accepts: + - '*/*' /fake/outer/boolean: post: description: Test serialization of outer boolean types @@ -885,7 +919,8 @@ paths: - fake x-codegen-request-body-name: body x-content-type: '*/*' - x-accepts: '*/*' + x-accepts: + - '*/*' /fake/outer/composite: post: description: Test serialization of object with outer number type @@ -908,7 +943,8 @@ paths: - fake x-codegen-request-body-name: body x-content-type: '*/*' - x-accepts: '*/*' + x-accepts: + - '*/*' /fake/jsonFormData: get: operationId: testJsonFormData @@ -926,7 +962,8 @@ paths: tags: - fake x-content-type: application/x-www-form-urlencoded - x-accepts: application/json + x-accepts: + - application/json /fake/inline-additionalProperties: post: operationId: testInlineAdditionalProperties @@ -948,7 +985,8 @@ paths: - fake x-codegen-request-body-name: param x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json /fake/body-with-query-params: put: operationId: testBodyWithQueryParams @@ -972,7 +1010,8 @@ paths: - fake x-codegen-request-body-name: body x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json /fake/create_xml_item: post: description: this route creates an XmlItem @@ -1008,11 +1047,20 @@ paths: - fake x-codegen-request-body-name: XmlItem x-content-type: application/xml - x-accepts: application/json + x-accepts: + - application/json /another-fake/dummy: patch: description: To test special tags and operation ID starting with number operationId: 123_test_@#$%_special_tags + parameters: + - description: to test uuid example value + in: header + name: uuid_test + required: true + schema: + format: uuid + type: string requestBody: content: application/json: @@ -1032,7 +1080,8 @@ paths: - $another-fake? x-codegen-request-body-name: body x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json /fake/body-with-file-schema: put: description: "For this test, the body for this request much reference a schema\ @@ -1052,7 +1101,8 @@ paths: - fake x-codegen-request-body-name: body x-content-type: application/json - x-accepts: application/json + x-accepts: + - application/json /fake/test-query-parameters: put: description: To test the collection format in query parameters @@ -1106,7 +1156,8 @@ paths: description: Success tags: - fake - x-accepts: application/json + x-accepts: + - application/json /fake/{petId}/uploadImageWithRequiredFile: post: operationId: uploadFileWithRequiredFile @@ -1139,7 +1190,8 @@ paths: tags: - pet x-content-type: multipart/form-data - x-accepts: application/json + x-accepts: + - application/json components: schemas: Order: diff --git a/samples/server/petstore/java-microprofile/pom.xml b/samples/server/petstore/java-microprofile/pom.xml index 1182edad8eb0..550d81ab8233 100644 --- a/samples/server/petstore/java-microprofile/pom.xml +++ b/samples/server/petstore/java-microprofile/pom.xml @@ -151,7 +151,7 @@ 1.5.18 9.2.9.v20150224 5.10.2 - 1.4.14 + 1.5.13 3.2.7 2.17.1 2.17.1 diff --git a/samples/server/petstore/java-undertow/pom.xml b/samples/server/petstore/java-undertow/pom.xml index abb0357de8fb..69683a835d30 100644 --- a/samples/server/petstore/java-undertow/pom.xml +++ b/samples/server/petstore/java-undertow/pom.xml @@ -26,7 +26,7 @@ 1.10 1.2 3.1.2 - 1.4.13 + 1.5.13 4.13.2 2.1.0-beta.124 2.3.17.Final diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml index 9e61cf651455..9ab8a5f8b1b7 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml @@ -226,7 +226,7 @@ for this project used jakarta.validation-api --> 1.5.22 9.2.9.v20150224 4.13.2 - 1.4.14 + 1.5.13 2.0.2 3.5.9 2.17.1 diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/PetApiTest.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/PetApiTest.java index 5fc4823c1c74..d2d6044a259b 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/PetApiTest.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/PetApiTest.java @@ -20,6 +20,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/StoreApiTest.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/StoreApiTest.java index 3f976f3dc7a0..9f41fe1e3e4f 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/StoreApiTest.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/StoreApiTest.java @@ -19,6 +19,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/UserApiTest.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/UserApiTest.java index af395ef11412..534d6b4dd980 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/UserApiTest.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/test/java/org/openapitools/api/UserApiTest.java @@ -19,6 +19,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml index eba9703eb696..f799b3d10b55 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml @@ -226,7 +226,7 @@ for this project used jakarta.validation-api --> 1.5.22 9.2.9.v20150224 4.13.2 - 1.4.14 + 1.5.13 2.0.2 3.5.9 2.17.1 diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/PetApiTest.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/PetApiTest.java index 5fc4823c1c74..d2d6044a259b 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/PetApiTest.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/PetApiTest.java @@ -20,6 +20,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/StoreApiTest.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/StoreApiTest.java index 3f976f3dc7a0..9f41fe1e3e4f 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/StoreApiTest.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/StoreApiTest.java @@ -19,6 +19,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/UserApiTest.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/UserApiTest.java index af395ef11412..534d6b4dd980 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/UserApiTest.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/test/java/org/openapitools/api/UserApiTest.java @@ -19,6 +19,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index 8d20bbb7f1f6..4023565e937a 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -226,7 +226,7 @@ for this project used jakarta.validation-api --> 1.5.22 9.2.9.v20150224 4.13.2 - 1.4.14 + 1.5.13 2.0.2 3.5.9 2.17.1 diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/AnotherFakeApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/AnotherFakeApiTest.java index edd0da7797c4..fa47eea6ad29 100644 --- a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/AnotherFakeApiTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/AnotherFakeApiTest.java @@ -19,6 +19,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/FakeApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/FakeApiTest.java index 20839b15e3ca..e489503f215e 100644 --- a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/FakeApiTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/FakeApiTest.java @@ -27,6 +27,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/FakeClassnameTags123ApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/FakeClassnameTags123ApiTest.java index a20299dcb2c2..178dc3bc11c5 100644 --- a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/FakeClassnameTags123ApiTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/FakeClassnameTags123ApiTest.java @@ -18,6 +18,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/PetApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/PetApiTest.java index b5575602cb6a..33ef3a6e2297 100644 --- a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/PetApiTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/PetApiTest.java @@ -21,6 +21,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/StoreApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/StoreApiTest.java index 53eee27fddf3..2783a6210716 100644 --- a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/StoreApiTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/StoreApiTest.java @@ -19,6 +19,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/UserApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/UserApiTest.java index 5b5d67899f75..9ea32cad31ba 100644 --- a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/UserApiTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/UserApiTest.java @@ -19,6 +19,7 @@ import org.junit.Before; import static org.junit.Assert.*; +import javax.validation.Valid; import javax.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.ClientConfiguration; diff --git a/samples/server/petstore/jaxrs-datelib-j8/pom.xml b/samples/server/petstore/jaxrs-datelib-j8/pom.xml index bc26cad95f77..010fc980ec1f 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/pom.xml +++ b/samples/server/petstore/jaxrs-datelib-j8/pom.xml @@ -209,7 +209,7 @@ for this project used jakarta.validation-api --> 2.35 2.17.1 4.13.2 - 1.4.14 + 1.5.13 4.0.4 UTF-8 diff --git a/samples/server/petstore/jaxrs-jersey/pom.xml b/samples/server/petstore/jaxrs-jersey/pom.xml index bb5cad519c6c..8082c0f8955c 100644 --- a/samples/server/petstore/jaxrs-jersey/pom.xml +++ b/samples/server/petstore/jaxrs-jersey/pom.xml @@ -209,7 +209,7 @@ for this project used jakarta.validation-api --> 2.35 2.17.1 4.13.2 - 1.4.14 + 1.5.13 4.0.4 UTF-8 diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml index 27272cdee6b7..9219246ac6d4 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml @@ -209,7 +209,7 @@ for this project used jakarta.validation-api --> 2.35 2.17.1 4.13.2 - 1.4.14 + 1.5.13 4.0.4 UTF-8 diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml index 12699ccce64f..866617019ac6 100644 --- a/samples/server/petstore/jaxrs/jersey2/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2/pom.xml @@ -209,7 +209,7 @@ for this project used jakarta.validation-api --> 2.35 2.17.1 4.13.2 - 1.4.14 + 1.5.13 4.0.4 UTF-8 diff --git a/samples/server/petstore/jaxrs/jersey3/pom.xml b/samples/server/petstore/jaxrs/jersey3/pom.xml index 5e5457aef78b..dfcda7df9f6e 100644 --- a/samples/server/petstore/jaxrs/jersey3/pom.xml +++ b/samples/server/petstore/jaxrs/jersey3/pom.xml @@ -209,7 +209,7 @@ 3.1.3 2.17.1 4.13.2 - 1.4.14 + 1.5.13 5.0.0 UTF-8 diff --git a/samples/server/petstore/kotlin-server-modelMutable/gradle.properties b/samples/server/petstore/kotlin-server-modelMutable/gradle.properties index fb877a9edd28..1fb076431bba 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/gradle.properties +++ b/samples/server/petstore/kotlin-server-modelMutable/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 \ No newline at end of file +logback_version=1.5.13 diff --git a/samples/server/petstore/kotlin-server/ktor/gradle.properties b/samples/server/petstore/kotlin-server/ktor/gradle.properties index fb877a9edd28..1fb076431bba 100644 --- a/samples/server/petstore/kotlin-server/ktor/gradle.properties +++ b/samples/server/petstore/kotlin-server/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 \ No newline at end of file +logback_version=1.5.13 diff --git a/samples/server/petstore/kotlin-server/ktor2/gradle.properties b/samples/server/petstore/kotlin-server/ktor2/gradle.properties index d507b58c1c87..126ddfe69da1 100644 --- a/samples/server/petstore/kotlin-server/ktor2/gradle.properties +++ b/samples/server/petstore/kotlin-server/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 \ No newline at end of file +logback_version=1.5.13