From afb1a655ad9c58a2a67b4fac051840d20a5d3cc8 Mon Sep 17 00:00:00 2001 From: martin-mfg <2026226+martin-mfg@users.noreply.github.com> Date: Sun, 27 Apr 2025 16:11:30 +0200 Subject: [PATCH 1/6] respect useJakartaEE in jersey3 --- .../src/main/resources/Java/libraries/jersey3/api.mustache | 4 ++-- .../main/resources/Java/libraries/jersey3/api_test.mustache | 4 ++-- .../main/resources/Java/libraries/jersey3/model.mustache | 4 ++-- .../src/main/resources/Java/libraries/jersey3/pom.mustache | 6 ++++++ samples/client/petstore/java/jersey3-oneOf/pom.xml | 4 ++-- samples/client/petstore/java/jersey3/pom.xml | 4 ++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache index 66051c4ffbc8..d9e9bf14bcd6 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache @@ -12,8 +12,8 @@ import {{javaxPackage}}.ws.rs.core.GenericType; {{/imports}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} import java.util.ArrayList; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api_test.mustache index 7b8214bd48ad..926ba0a82913 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api_test.mustache @@ -17,8 +17,8 @@ import java.util.List; import java.util.Map; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model.mustache index 1904ee40ea4f..2758278aceed 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model.mustache @@ -42,8 +42,8 @@ import android.os.Parcelable; import android.os.Parcel; {{/parcelableModel}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} {{#performBeanValidation}} import org.hibernate.validator.constraints.*; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache index a3c115041714..7a119555bfde 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache @@ -408,8 +408,14 @@ 2.17.1 2.17.1 0.2.6 + {{#useJakartaEe}} 2.1.1 3.0.2 + {{/useJakartaEe}} + {{^useJakartaEe}} + 1.3.5 + 2.0.2 + {{/useJakartaEe}} 5.10.0 {{#hasHttpSignatureMethods}} 1.8 diff --git a/samples/client/petstore/java/jersey3-oneOf/pom.xml b/samples/client/petstore/java/jersey3-oneOf/pom.xml index 590d772f329e..7367727daa0e 100644 --- a/samples/client/petstore/java/jersey3-oneOf/pom.xml +++ b/samples/client/petstore/java/jersey3-oneOf/pom.xml @@ -333,8 +333,8 @@ 2.17.1 2.17.1 0.2.6 - 2.1.1 - 3.0.2 + 1.3.5 + 2.0.2 5.10.0 2.21.0 diff --git a/samples/client/petstore/java/jersey3/pom.xml b/samples/client/petstore/java/jersey3/pom.xml index 69c559dbede8..5ed1039b1906 100644 --- a/samples/client/petstore/java/jersey3/pom.xml +++ b/samples/client/petstore/java/jersey3/pom.xml @@ -356,8 +356,8 @@ 2.17.1 2.17.1 0.2.6 - 2.1.1 - 3.0.2 + 1.3.5 + 2.0.2 5.10.0 1.8 8.3.3 From f33f65450ade6cf09fa7ffb9db6d6e60aade5c2e Mon Sep 17 00:00:00 2001 From: martin-mfg <2026226+martin-mfg@users.noreply.github.com> Date: Sun, 27 Apr 2025 16:45:58 +0200 Subject: [PATCH 2/6] useJakarteEE=true in jersey3 samples --- bin/configs/java-jersey3-oneOf.yaml | 1 + bin/configs/java-jersey3.yaml | 1 + samples/client/petstore/java/jersey3-oneOf/pom.xml | 4 ++-- samples/client/petstore/java/jersey3/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/configs/java-jersey3-oneOf.yaml b/bin/configs/java-jersey3-oneOf.yaml index 846b7bda109a..404492b540d1 100644 --- a/bin/configs/java-jersey3-oneOf.yaml +++ b/bin/configs/java-jersey3-oneOf.yaml @@ -5,3 +5,4 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf_additionalProp templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: hideGenerationTimestamp: true + useJakartaEe: true diff --git a/bin/configs/java-jersey3.yaml b/bin/configs/java-jersey3.yaml index 513f3889d3c7..5059a89805e3 100644 --- a/bin/configs/java-jersey3.yaml +++ b/bin/configs/java-jersey3.yaml @@ -4,6 +4,7 @@ library: jersey3 inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: + useJakartaEe: true useBeanValidation: true artifactId: petstore-jersey3 hideGenerationTimestamp: true diff --git a/samples/client/petstore/java/jersey3-oneOf/pom.xml b/samples/client/petstore/java/jersey3-oneOf/pom.xml index 7367727daa0e..590d772f329e 100644 --- a/samples/client/petstore/java/jersey3-oneOf/pom.xml +++ b/samples/client/petstore/java/jersey3-oneOf/pom.xml @@ -333,8 +333,8 @@ 2.17.1 2.17.1 0.2.6 - 1.3.5 - 2.0.2 + 2.1.1 + 3.0.2 5.10.0 2.21.0 diff --git a/samples/client/petstore/java/jersey3/pom.xml b/samples/client/petstore/java/jersey3/pom.xml index 5ed1039b1906..69c559dbede8 100644 --- a/samples/client/petstore/java/jersey3/pom.xml +++ b/samples/client/petstore/java/jersey3/pom.xml @@ -356,8 +356,8 @@ 2.17.1 2.17.1 0.2.6 - 1.3.5 - 2.0.2 + 2.1.1 + 3.0.2 5.10.0 1.8 8.3.3 From dfcd10491a8951a8c1910bcf6e60bd0c586dafc8 Mon Sep 17 00:00:00 2001 From: martin-mfg <2026226+martin-mfg@users.noreply.github.com> Date: Sun, 27 Apr 2025 20:37:41 +0200 Subject: [PATCH 3/6] don't force jakarta package for jersey3 --- .../org/openapitools/codegen/languages/JavaClientCodegen.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 9763f7064684..9ddc05123c0d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -603,7 +603,6 @@ public void processOpts() { // The flag below should be set for all Java libraries, but the templates need to be ported // one by one for each library. supportsAdditionalPropertiesWithComposedSchema = true; - applyJakartaPackage(); } else if (libNative) { supportingFiles.add(new SupportingFile("ApiResponse.mustache", invokerFolder, "ApiResponse.java")); supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java")); From 35176a842e40a47f89160e425a8ddbd8c4a8acf5 Mon Sep 17 00:00:00 2001 From: martin-mfg <2026226+martin-mfg@users.noreply.github.com> Date: Mon, 28 Apr 2025 11:35:26 +0200 Subject: [PATCH 4/6] adjust whitespace between jersey2 and jersey3 --- .../main/resources/Java/libraries/jersey2/ApiClient.mustache | 2 +- .../main/resources/Java/libraries/jersey3/ApiClient.mustache | 2 +- .../main/resources/Java/libraries/jersey3/build.gradle.mustache | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache index ee7fcb2513c7..733904e12ed8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache @@ -1021,7 +1021,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { return entity; } - /** + /** * Adds the object with the provided key to the MultiPart. * Based on the object type sets Content-Disposition and Content-Type. * diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache index 6ba811059bb8..733904e12ed8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache @@ -1386,7 +1386,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { protected Client buildHttpClient() { // Create ClientConfig if it has not been initialized yet if (clientConfig == null) { - clientConfig = getDefaultClientConfig(); + clientConfig = getDefaultClientConfig(); } ClientBuilder clientBuilder = ClientBuilder.newBuilder(); diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache index f95eafca0c69..3c87fc238cd8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache @@ -152,7 +152,6 @@ dependencies { {{#useReflectionEqualsHashCode}} implementation "org.apache.commons:commons-lang3:$commons_lang3_version" {{/useReflectionEqualsHashCode}} - testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" } From b4560677e70127a7b52527ce2c350e2766408abd Mon Sep 17 00:00:00 2001 From: martin-mfg <2026226+martin-mfg@users.noreply.github.com> Date: Mon, 28 Apr 2025 14:58:01 +0200 Subject: [PATCH 5/6] enforce useJakartaEe for jersey3, warn on misuse for jersey 2 --- bin/configs/java-jersey3-oneOf.yaml | 1 - bin/configs/java-jersey3.yaml | 1 - .../org/openapitools/codegen/languages/JavaClientCodegen.java | 4 ++++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/configs/java-jersey3-oneOf.yaml b/bin/configs/java-jersey3-oneOf.yaml index 404492b540d1..846b7bda109a 100644 --- a/bin/configs/java-jersey3-oneOf.yaml +++ b/bin/configs/java-jersey3-oneOf.yaml @@ -5,4 +5,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf_additionalProp templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: hideGenerationTimestamp: true - useJakartaEe: true diff --git a/bin/configs/java-jersey3.yaml b/bin/configs/java-jersey3.yaml index 5059a89805e3..513f3889d3c7 100644 --- a/bin/configs/java-jersey3.yaml +++ b/bin/configs/java-jersey3.yaml @@ -4,7 +4,6 @@ library: jersey3 inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: - useJakartaEe: true useBeanValidation: true artifactId: petstore-jersey3 hideGenerationTimestamp: true diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 9ddc05123c0d..ff49b058bfad 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -587,6 +587,9 @@ public void processOpts() { // The flag below should be set for all Java libraries, but the templates need to be ported // one by one for each library. supportsAdditionalPropertiesWithComposedSchema = true; + if (useJakartaEe) { + LOGGER.warn("Jersey 2 is not compatible with Jakarta EE. Please use Jersey 3 or set {} to false.", USE_JAKARTA_EE); + } } else if (libJersey3) { additionalProperties.put("jersey3", true); supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java")); @@ -603,6 +606,7 @@ public void processOpts() { // The flag below should be set for all Java libraries, but the templates need to be ported // one by one for each library. supportsAdditionalPropertiesWithComposedSchema = true; + applyJakartaPackage(); } else if (libNative) { supportingFiles.add(new SupportingFile("ApiResponse.mustache", invokerFolder, "ApiResponse.java")); supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java")); From 13c77f0731a96f218db37367a8bc6fe12df49528 Mon Sep 17 00:00:00 2001 From: martin-mfg <2026226+martin-mfg@users.noreply.github.com> Date: Mon, 28 Apr 2025 16:53:37 +0200 Subject: [PATCH 6/6] set useJakartaEe for jersey3, generate samples --- .../org/openapitools/codegen/languages/JavaClientCodegen.java | 1 + .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- samples/client/petstore/java/jersey3-oneOf/build.gradle | 1 - .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- samples/client/petstore/java/jersey3/build.gradle | 1 - .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- 14 files changed, 12 insertions(+), 13 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index ff49b058bfad..f198604d301b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -606,6 +606,7 @@ public void processOpts() { // The flag below should be set for all Java libraries, but the templates need to be ported // one by one for each library. supportsAdditionalPropertiesWithComposedSchema = true; + setUseJakartaEe(true); applyJakartaPackage(); } else if (libNative) { supportingFiles.add(new SupportingFile("ApiResponse.mustache", invokerFolder, "ApiResponse.java")); diff --git a/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java index 6dc50e81b2f6..d407ee5cc04b 100644 --- a/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java @@ -800,7 +800,7 @@ public Entity serialize(Object obj, Map formParams, String co return entity; } - /** + /** * Adds the object with the provided key to the MultiPart. * Based on the object type sets Content-Disposition and Content-Type. * diff --git a/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java index 6dc50e81b2f6..d407ee5cc04b 100644 --- a/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java @@ -800,7 +800,7 @@ public Entity serialize(Object obj, Map formParams, String co return entity; } - /** + /** * Adds the object with the provided key to the MultiPart. * Based on the object type sets Content-Disposition and Content-Type. * diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java index 9b7f98bc488b..4869dd917693 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java @@ -941,7 +941,7 @@ public Entity serialize(Object obj, Map formParams, String co return entity; } - /** + /** * Adds the object with the provided key to the MultiPart. * Based on the object type sets Content-Disposition and Content-Type. * diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java index 9b7f98bc488b..4869dd917693 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java @@ -941,7 +941,7 @@ public Entity serialize(Object obj, Map formParams, String co return entity; } - /** + /** * Adds the object with the provided key to the MultiPart. * Based on the object type sets Content-Disposition and Content-Type. * diff --git a/samples/client/petstore/java/jersey3-oneOf/build.gradle b/samples/client/petstore/java/jersey3-oneOf/build.gradle index 95a7eee9bbd3..3ed93e909703 100644 --- a/samples/client/petstore/java/jersey3-oneOf/build.gradle +++ b/samples/client/petstore/java/jersey3-oneOf/build.gradle @@ -121,7 +121,6 @@ dependencies { implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" - testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" } diff --git a/samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/ApiClient.java index bde8c1f82823..c335db48e30e 100644 --- a/samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/ApiClient.java @@ -1142,7 +1142,7 @@ public ApiResponse invokeAPI(String path, String method, List query protected Client buildHttpClient() { // Create ClientConfig if it has not been initialized yet if (clientConfig == null) { - clientConfig = getDefaultClientConfig(); + clientConfig = getDefaultClientConfig(); } ClientBuilder clientBuilder = ClientBuilder.newBuilder(); diff --git a/samples/client/petstore/java/jersey3/build.gradle b/samples/client/petstore/java/jersey3/build.gradle index 10c96f84970e..47fa3017b748 100644 --- a/samples/client/petstore/java/jersey3/build.gradle +++ b/samples/client/petstore/java/jersey3/build.gradle @@ -129,7 +129,6 @@ dependencies { implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version" implementation "org.apache.commons:commons-lang3:$commons_lang3_version" - testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java index 742027aa8bc8..b43bd82c48d2 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java @@ -1381,7 +1381,7 @@ public ApiResponse invokeAPI(String path, String method, List query protected Client buildHttpClient() { // Create ClientConfig if it has not been initialized yet if (clientConfig == null) { - clientConfig = getDefaultClientConfig(); + clientConfig = getDefaultClientConfig(); } ClientBuilder clientBuilder = ClientBuilder.newBuilder(); diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java index b1b582b33664..33bdfaf6ab31 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java @@ -849,7 +849,7 @@ public Entity serialize(Object obj, Map formParams, String co return entity; } - /** + /** * Adds the object with the provided key to the MultiPart. * Based on the object type sets Content-Disposition and Content-Type. * diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java index 57a85a3816df..3a9e11fecb21 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java @@ -800,7 +800,7 @@ public Entity serialize(Object obj, Map formParams, String co return entity; } - /** + /** * Adds the object with the provided key to the MultiPart. * Based on the object type sets Content-Disposition and Content-Type. * diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java index 9cd3d085103e..bee4ec83a4e0 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java @@ -925,7 +925,7 @@ public Entity serialize(Object obj, Map formParams, String co return entity; } - /** + /** * Adds the object with the provided key to the MultiPart. * Based on the object type sets Content-Disposition and Content-Type. * diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java index 9cd3d085103e..bee4ec83a4e0 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java @@ -925,7 +925,7 @@ public Entity serialize(Object obj, Map formParams, String co return entity; } - /** + /** * Adds the object with the provided key to the MultiPart. * Based on the object type sets Content-Disposition and Content-Type. * diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java index 0482577ff82b..0778e70d3116 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java @@ -1023,7 +1023,7 @@ public Entity serialize(Object obj, Map formParams, String co return entity; } - /** + /** * Adds the object with the provided key to the MultiPart. * Based on the object type sets Content-Disposition and Content-Type. *