adjust jersey2/jersey3 templates (#21171)

* respect useJakartaEE in jersey3

* useJakarteEE=true in jersey3 samples

* don't force jakarta package for jersey3

* adjust whitespace between jersey2 and jersey3

* enforce useJakartaEe for jersey3, warn on misuse for jersey 2

* set useJakartaEe for jersey3, generate samples

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

@@ -587,6 +587,9 @@ public class JavaClientCodegen extends AbstractJavaCodegen
             // 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 class JavaClientCodegen extends AbstractJavaCodegen
             // 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"));

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.
    *

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();

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 import java.util.ArrayList;

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 /**

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"
 }

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 {{#performBeanValidation}}
 import org.hibernate.validator.constraints.*;

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache

@@ -408,8 +408,14 @@
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
+        {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
         <beanvalidation-version>3.0.2</beanvalidation-version>
+        {{/useJakartaEe}}
+        {{^useJakartaEe}}
+        <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
+        {{/useJakartaEe}}
         <junit-version>5.10.0</junit-version>
         {{#hasHttpSignatureMethods}}
         <http-signature-version>1.8</http-signature-version>

samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java

@@ -800,7 +800,7 @@ public class ApiClient extends JavaTimeFormatter {
     return entity;
   }
 
-    /**
+  /**
    * Adds the object with the provided key to the MultiPart.
    * Based on the object type sets Content-Disposition and Content-Type.
    *

samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java

@@ -800,7 +800,7 @@ public class ApiClient extends JavaTimeFormatter {
     return entity;
   }
 
-    /**
+  /**
    * Adds the object with the provided key to the MultiPart.
    * Based on the object type sets Content-Disposition and Content-Type.
    *

samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java

@@ -941,7 +941,7 @@ public class ApiClient extends JavaTimeFormatter {
     return entity;
   }
 
-    /**
+  /**
    * Adds the object with the provided key to the MultiPart.
    * Based on the object type sets Content-Disposition and Content-Type.
    *

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java

@@ -941,7 +941,7 @@ public class ApiClient extends JavaTimeFormatter {
     return entity;
   }
 
-    /**
+  /**
    * Adds the object with the provided key to the MultiPart.
    * Based on the object type sets Content-Disposition and Content-Type.
    *

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"
 }

samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/ApiClient.java

@@ -1142,7 +1142,7 @@ public class ApiClient extends JavaTimeFormatter {
   protected Client buildHttpClient() {
     // Create ClientConfig if it has not been initialized yet
     if (clientConfig == null) {
-    clientConfig = getDefaultClientConfig();
+      clientConfig = getDefaultClientConfig();
     }
 
     ClientBuilder clientBuilder = ClientBuilder.newBuilder();

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"
 }

samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java

@@ -1381,7 +1381,7 @@ public class ApiClient extends JavaTimeFormatter {
   protected Client buildHttpClient() {
     // Create ClientConfig if it has not been initialized yet
     if (clientConfig == null) {
-    clientConfig = getDefaultClientConfig();
+      clientConfig = getDefaultClientConfig();
     }
 
     ClientBuilder clientBuilder = ClientBuilder.newBuilder();

samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java

@@ -849,7 +849,7 @@ public class ApiClient extends JavaTimeFormatter {
     return entity;
   }
 
-    /**
+  /**
    * Adds the object with the provided key to the MultiPart.
    * Based on the object type sets Content-Disposition and Content-Type.
    *

samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java

@@ -800,7 +800,7 @@ public class ApiClient extends JavaTimeFormatter {
     return entity;
   }
 
-    /**
+  /**
    * Adds the object with the provided key to the MultiPart.
    * Based on the object type sets Content-Disposition and Content-Type.
    *

samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java

@@ -925,7 +925,7 @@ public class ApiClient extends JavaTimeFormatter {
     return entity;
   }
 
-    /**
+  /**
    * Adds the object with the provided key to the MultiPart.
    * Based on the object type sets Content-Disposition and Content-Type.
    *

samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java

@@ -925,7 +925,7 @@ public class ApiClient extends JavaTimeFormatter {
     return entity;
   }
 
-    /**
+  /**
    * Adds the object with the provided key to the MultiPart.
    * Based on the object type sets Content-Disposition and Content-Type.
    *

samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java

@@ -1023,7 +1023,7 @@ public class ApiClient extends JavaTimeFormatter {
     return entity;
   }
 
-    /**
+  /**
    * Adds the object with the provided key to the MultiPart.
    * Based on the object type sets Content-Disposition and Content-Type.
    *