updated jaxrs template to work with jakarta option

Author: HugoMario

modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiOriginFilter.mustache

@@ -2,11 +2,17 @@ package {{apiPackage}};
 
 import java.io.IOException;
 
+{{#jakarta}}
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletResponse;
+{{/jakarta}}
+{{^jakarta}}
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
+{{/jakarta}}
 
 {{>generatedAnnotation}}
-public class ApiOriginFilter implements javax.servlet.Filter {
+public class ApiOriginFilter implements Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
         HttpServletResponse res = (HttpServletResponse) response;
@@ -19,4 +25,4 @@ public class ApiOriginFilter implements javax.servlet.Filter {
     public void destroy() {}
 
     public void init(FilterConfig filterConfig) throws ServletException {}
-}
+}

modules/swagger-codegen/src/main/resources/JavaJaxRS/ApiResponseMessage.mustache

@@ -1,8 +1,15 @@
 package {{apiPackage}};
 
+{{#jakarta}}
+import jakarta.xml.bind.annotation.XmlTransient;
+
+@jakarta.xml.bind.annotation.XmlRootElement
+{{/jakarta}}
+{{^jakarta}}
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
+{{/jakarta}}
 {{>generatedAnnotation}}
 public class ApiResponseMessage {
     public static final int ERROR = 1;

modules/swagger-codegen/src/main/resources/JavaJaxRS/JodaDateTimeProvider.mustache

@@ -4,6 +4,16 @@ import com.sun.jersey.core.spi.component.ComponentContext;
 import com.sun.jersey.spi.inject.Injectable;
 import com.sun.jersey.spi.inject.PerRequestTypeInjectableProvider;
 
+{{#jakarta}}
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.Provider;
+{{/jakarta}}
+{{^jakarta}}
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Context;
@@ -13,6 +23,7 @@ import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Provider;
 import org.joda.time.DateTime;
 import java.util.List;
+{{/jakarta}}
 
 @Provider
 public class JodaDateTimeProvider extends PerRequestTypeInjectableProvider<QueryParam, DateTime> {

modules/swagger-codegen/src/main/resources/JavaJaxRS/JodaLocalDateProvider.mustache

@@ -4,6 +4,16 @@ import com.sun.jersey.core.spi.component.ComponentContext;
 import com.sun.jersey.spi.inject.Injectable;
 import com.sun.jersey.spi.inject.PerRequestTypeInjectableProvider;
 
+{{#jakarta}}
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.Provider;
+{{/jakarta}}
+{{^jakarta}}
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Context;
@@ -13,6 +23,7 @@ import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Provider;
 import org.joda.time.LocalDate;
 import java.util.List;
+{{/jakarta}}
 
 @Provider
 public class JodaLocalDateProvider extends PerRequestTypeInjectableProvider<QueryParam, LocalDate> {

modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache

@@ -19,13 +19,27 @@ import java.io.InputStream;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 
+{{#jakarta}}
+import jakarta.servlet.ServletConfig;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.*;
+{{/jakarta}}
+{{^jakarta}}
 import javax.servlet.ServletConfig;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.*;
+{{/jakarta}}
 {{#useBeanValidation}}
+{{#jakarta}}
+import jakarta.validation.constraints.*;
+{{/jakarta}}
+{{^jakarta}}
 import javax.validation.constraints.*;
+{{/jakarta}}
 {{/useBeanValidation}}
 
 @Path("/{{{baseName}}}")

modules/swagger-codegen/src/main/resources/JavaJaxRS/apiService.mustache

@@ -13,10 +13,22 @@ import {{package}}.NotFoundException;
 
 import java.io.InputStream;
 
+
+{{#jakarta}}
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
+{{/jakarta}}
+{{^jakarta}}
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
+{{/jakarta}}
 {{#useBeanValidation}}
+{{#jakarta}}
+import jakarta.validation.constraints.*;
+{{/jakarta}}
+{{^jakarta}}
 import javax.validation.constraints.*;
+{{/jakarta}}
 {{/useBeanValidation}}
 {{>generatedAnnotation}}
 {{#operations}}

modules/swagger-codegen/src/main/resources/JavaJaxRS/bootstrap.mustache

@@ -5,10 +5,18 @@ import io.swagger.models.*;
 
 import io.swagger.models.auth.*;
 
+{{#jakarta}}
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+{{/jakarta}}
+{{^jakarta}}
 import javax.servlet.http.HttpServlet;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+{{/jakarta}}
 
 public class Bootstrap extends HttpServlet {
   @Override

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/RestApplication.mustache

@@ -1,9 +1,15 @@
 package {{invokerPackage}};
 
+{{#jakarta}}
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
+{{/jakarta}}
+{{^jakarta}}
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
+{{/jakarta}}
 
 @ApplicationPath("/")
 public class RestApplication extends Application {
   // Add implementation-specific details here
-}
+}

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache

@@ -4,12 +4,22 @@ package {{package}};
 {{/imports}}
 import {{package}}.{{classname}}Service;
 
+{{#jakarta}}
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+{{/jakarta}}
+{{^jakarta}}
 import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
+{{/jakarta}}
 
 import io.swagger.annotations.*;
 import java.io.InputStream;
@@ -20,7 +30,12 @@ import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import java.util.Map;
 import java.util.List;
 {{#useBeanValidation}}
+{{#jakarta}}
+import jakarta.validation.constraints.*;
+{{/jakarta}}
+{{^jakarta}}
 import javax.validation.constraints.*;
+{{/jakarta}}
 {{/useBeanValidation}}
 @Path("/{{{baseName}}}")
 @RequestScoped

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/apiService.mustache

@@ -13,8 +13,14 @@ import java.util.List;
 
 import java.io.InputStream;
 
+{{#jakarta}}
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
+{{/jakarta}}
+{{^jakarta}}
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
+{{/jakarta}}
 
 {{>generatedAnnotation}}
 {{#operations}}