Skip to content

Commit b456067

Browse files
committed
enforce useJakartaEe for jersey3, warn on misuse for jersey 2
1 parent 35176a8 commit b456067

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

bin/configs/java-jersey3-oneOf.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf_additionalProp
55
templateDir: modules/openapi-generator/src/main/resources/Java
66
additionalProperties:
77
hideGenerationTimestamp: true
8-
useJakartaEe: true

bin/configs/java-jersey3.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ library: jersey3
44
inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
55
templateDir: modules/openapi-generator/src/main/resources/Java
66
additionalProperties:
7-
useJakartaEe: true
87
useBeanValidation: true
98
artifactId: petstore-jersey3
109
hideGenerationTimestamp: true

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,9 @@ public void processOpts() {
587587
// The flag below should be set for all Java libraries, but the templates need to be ported
588588
// one by one for each library.
589589
supportsAdditionalPropertiesWithComposedSchema = true;
590+
if (useJakartaEe) {
591+
LOGGER.warn("Jersey 2 is not compatible with Jakarta EE. Please use Jersey 3 or set {} to false.", USE_JAKARTA_EE);
592+
}
590593
} else if (libJersey3) {
591594
additionalProperties.put("jersey3", true);
592595
supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
@@ -603,6 +606,7 @@ public void processOpts() {
603606
// The flag below should be set for all Java libraries, but the templates need to be ported
604607
// one by one for each library.
605608
supportsAdditionalPropertiesWithComposedSchema = true;
609+
applyJakartaPackage();
606610
} else if (libNative) {
607611
supportingFiles.add(new SupportingFile("ApiResponse.mustache", invokerFolder, "ApiResponse.java"));
608612
supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));

0 commit comments

Comments
 (0)