Merge pull request #12131 from swagger-api/jakarta_jersey3_changes

Jakarta jersey3 changes

Author: HugoMario

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

@@ -66,6 +66,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
     public static final String ERROR_ON_UNKNOWN_ENUM = "errorOnUnknownEnum";
     public static final String CHECK_DUPLICATED_MODEL_NAME = "checkDuplicatedModelName";
     public static final String ADDITIONAL_MODEL_TYPE_ANNOTATIONS = "additionalModelTypeAnnotations";
+    public static final String JAKARTA = "jakarta";
 
     protected String dateLibrary = "threetenbp";
     protected boolean supportAsync = false;
@@ -100,6 +101,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
     protected String modelDocPath = "docs/";
     protected boolean supportJava6= false;
     protected boolean disableHtmlEscaping = false;
+    protected boolean jakarta = false;
     private NotNullAnnotationFeatures notNullOption;
     private IgnoreUnknownJacksonFeatures ignoreUnknown;
     protected List<String> additionalModelTypeAnnotations = new LinkedList<>();
@@ -212,6 +214,13 @@ public AbstractJavaCodegen() {
         cliOptions.add(CliOption.newBoolean(DISABLE_HTML_ESCAPING, "Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)"));
         cliOptions.add(CliOption.newBoolean(CHECK_DUPLICATED_MODEL_NAME, "Check if there are duplicated model names (ignoring case)"));
         cliOptions.add(CliOption.newString(ADDITIONAL_MODEL_TYPE_ANNOTATIONS, "Additional annotations for model type(class level annotations)"));
+
+        CliOption jeeSpec = CliOption.newBoolean(JAKARTA, "Use Jakarta EE (package jakarta.*) instead of Java EE (javax.*)");
+        Map<String, String> jeeSpecModeOptions = new HashMap<String, String>();
+        jeeSpecModeOptions.put("true", "Use Jakarta EE (package jakarta.*)");
+        jeeSpecModeOptions.put("false", "Use Java EE (javax.*)");
+        jeeSpec.setEnum(jeeSpecModeOptions);
+        cliOptions.add(jeeSpec);
     }
 
     @Override
@@ -523,6 +532,11 @@ public void processOpts() {
             additionalProperties.put("legacyDates", true);
         }
 
+        if (additionalProperties.containsKey(JAKARTA)) {
+            setJakarta(Boolean.parseBoolean(String.valueOf(additionalProperties.get(JAKARTA))));
+            additionalProperties.put(JAKARTA, jakarta);
+        }
+
         if (this.skipAliasGeneration == null) {
             this.skipAliasGeneration = Boolean.TRUE;
         }
@@ -1496,6 +1510,10 @@ public String escapeQuotationMark(String input) {
         return input.replace("\"", "");
     }
 
+    public void setJakarta(boolean jakarta) {
+        this.jakarta = jakarta;
+    }
+
     @Override
     public String escapeUnsafeCharacters(String input) {
         return input.replace("*/", "*_/").replace("/*", "/_*");

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

@@ -84,6 +84,7 @@ public JavaClientCodegen() {
         supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.11.4. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
         supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.11.4");
         supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.29.1. JSON processing: Jackson 2.11.4");
+        supportedLibraries.put("jersey3", "HTTP client: Jersey client 3.0.10. JSON processing: Jackson 2.10.2");
         supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.8.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
         supportedLibraries.put("okhttp4-gson", "HTTP client: OkHttp 4.10.0. JSON processing: Gson 2.8.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
         supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.3.1 (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.");
@@ -123,6 +124,10 @@ public void processOpts() {
         if (RETROFIT_1.equalsIgnoreCase(library)) {
             dateLibrary = "joda";
         }
+        if ("jersey3".equalsIgnoreCase(library)) {
+            dateLibrary = "java8";
+            additionalProperties.put(JAKARTA, true);
+        }
 
         super.processOpts();
 
@@ -252,7 +257,7 @@ public void processOpts() {
             if ("retrofit2".equals(getLibrary()) && !usePlayWS) {
                 supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
             }
-        } else if ("jersey2".equals(getLibrary())) {
+        } else if ("jersey3".equals(getLibrary()) || "jersey2".equals(getLibrary())) {
             supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
             supportingFiles.add(new SupportingFile("ApiResponse.mustache", invokerFolder, "ApiResponse.java"));
             additionalProperties.put("jackson", "true");

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java

@@ -50,6 +50,15 @@ public String getName() {
     public void processOpts() {
         super.processOpts();
 
+        if (additionalProperties.containsKey(JAKARTA)) {
+            setJakarta(convertPropertyToBoolean(JAKARTA));
+        }
+        if (jakarta) {
+            importMapping.put("Valid", "jakarta.validation.Valid");
+        } else {
+            importMapping.put("Valid", "javax.validation.Valid");
+        }
+
         if (additionalProperties.containsKey(USE_BEANVALIDATION)) {
             this.setUseBeanValidation(convertPropertyToBoolean(USE_BEANVALIDATION));
         }

modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache

@@ -29,8 +29,14 @@ import com.sun.jersey.api.client.WebResource.Builder;
 import com.sun.jersey.multipart.FormDataMultiPart;
 import com.sun.jersey.multipart.file.FileDataBodyPart;
 
+{{#jakarta}}
+import jakarta.ws.rs.core.Response.Status.Family;
+import jakarta.ws.rs.core.MediaType;
+{{/jakarta}}
+{{^jakarta}}
 import javax.ws.rs.core.Response.Status.Family;
 import javax.ws.rs.core.MediaType;
+{{/jakarta}}
 
 import java.util.Collection;
 import java.util.Collections;

modules/swagger-codegen/src/main/resources/Java/BeanValidationException.mustache

@@ -1,9 +1,14 @@
 package {{invokerPackage}};
 
 import java.util.Set;
-
+{{#jakarta}}
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ValidationException;
+{{/jakarta}}
+{{^jakarta}}
 import javax.validation.ConstraintViolation;
 import javax.validation.ValidationException;
+{{/jakarta}}
 
 public class BeanValidationException extends ValidationException {
     /**

modules/swagger-codegen/src/main/resources/Java/build.gradle.java11.mustache

@@ -16,7 +16,7 @@ repositories {
 ext {
     swagger_annotations_version = "1.5.24"
     jackson_version = "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
-    jersey_version = "1.19.4"
+    jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}1.19.4{{/jakarta}}"
     jodatime_version = "2.10.5"
     junit_version = "4.13.1"
 }
@@ -36,7 +36,7 @@ dependencies {
     {{#threetenbp}}
     implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
     {{/threetenbp}}
-    implementation 'com.sun.xml.ws:jaxws-rt:2.3.3'
+    implementation 'com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}'
     testImplementation "junit:junit:$junit_version"
     {{#wiremock}}
     testImplementation "com.github.tomakehurst:wiremock:2.27.2"

modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache

@@ -53,7 +53,7 @@ if(hasProperty('target') && target == 'android') {
         }
 
         dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
+            provided 'jakarta.annotation:jakarta.annotation-api:{{#jakarta}}2.1.1{{/jakarta}}{{^jakarta}}1.3.5{{/jakarta}}'
         }
     }
 
@@ -122,7 +122,7 @@ if(hasProperty('target') && target == 'android') {
 ext {
     swagger_annotations_version = "1.5.24"
     jackson_version = "{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
-    jersey_version = "1.19.4"
+    jersey_version = "{{#jakarta}}3.1.0{{/jakarta}}{{^jakarta}}1.19.4{{/jakarta}}"
     jodatime_version = "2.10.5"
     junit_version = "4.12"
 }

modules/swagger-codegen/src/main/resources/Java/generatedAnnotation.mustache

@@ -1 +1 @@
-{{^hideGenerationTimestamp}}@javax.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}
+{{^hideGenerationTimestamp}}@{{#jakarta}}jakarta{{/jakarta}}{{^jakarta}}javax{{/jakarta}}.annotation.Generated(value = "{{generatorClass}}", date = "{{generatedDate}}"){{/hideGenerationTimestamp}}

modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.java11.mustache

@@ -45,7 +45,7 @@ dependencies {
     {{/threetenbp}}
     implementation "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
     implementation "com.brsanthu:migbase64:2.2"
-    implementation "com.sun.xml.ws:jaxws-rt:2.3.3"
+    implementation "com.sun.xml.ws:jaxws-rt:{{#jakarta}}4.0.0{{/jakarta}}{{^jakarta}}2.3.3{{/jakarta}}"
     testImplementation "junit:junit:$junit_version"
     testImplementation "com.squareup.okhttp3:mockwebserver:3.6.0"
     testImplementation "org.assertj:assertj-core:1.7.1"

modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache

@@ -54,7 +54,7 @@ if(hasProperty('target') && target == 'android') {
         }
 
         dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
+            provided 'jakarta.annotation:jakarta.annotation-api:{{#jakarta}}2.1.1{{/jakarta}}{{^jakarta}}1.3.5{{/jakarta}}'
         }
     }