upgraded to - tomcat-10.x, jersey 3.x and jakarta-fied the app

mrin9 · Mar 20, 2021 · a404b1b · a404b1b
1 parent 8ed0294
commit a404b1b
Show file tree

Hide file tree

Showing 30 changed files with 112 additions and 391 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,15 +15,15 @@
 
  <!-- Common Properties for all modules -->
  <properties>
- <log4j-version>2.14.0</log4j-version>
- <tomcat-version>9.0.41</tomcat-version>
- <jersey-version>2.33</jersey-version>
- <swagger-version>1.5.21</swagger-version>
- <jackson-version>2.12.1</jackson-version>
+ <log4j-version>2.14.1</log4j-version>
+ <tomcat-version>10.0.4</tomcat-version>
+ <jersey-version>3.0.1</jersey-version>
+ <swagger-version>2.1.7</swagger-version>
+ <jackson-version>2.12.2</jackson-version>
  <hibernate-version>4.3.11.Final</hibernate-version> <!-- Hibernate 5 (5.3.6.Final) and above gives a classCastException -->
  <maven-jar-plugin-version>3.1.0</maven-jar-plugin-version>
  <maven-dependency-plugin-version>3.1.1</maven-dependency-plugin-version>
- <commons-lang-version>3.11</commons-lang-version>
+ <commons-lang-version>3.12.0</commons-lang-version>
  <commons-text-version>1.9</commons-text-version>
  <h2-database-version>1.4.200</h2-database-version>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/web-api/pom.xml b/web-api/pom.xml
@@ -14,13 +14,11 @@
 
  <!-- Dependencies -->
  <dependencies>
-
- <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
+ <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
  <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
- <scope>provided</scope>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.1.1</version>
  </dependency>
 
  <!-- Tomcat -->
@@ -53,11 +51,7 @@
  <artifactId>hibernate-c3p0</artifactId>
  <version>${hibernate-version}</version>
  </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
+
  <!-- Jersey -->
  <dependency>
  <groupId>org.glassfish.jersey.containers</groupId>
@@ -112,80 +106,24 @@
  <!-- Swagger -->
  <dependency>
  <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>2.1.6</version>
- </dependency>
- <dependency>
- <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-core</artifactId>
- <version>2.1.6</version>
- </dependency>
- <dependency>
- <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-jaxrs2</artifactId>
- <version>2.1.6</version>
- </dependency>
- <dependency>
- <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-models</artifactId>
- <version>2.1.6</version>
- </dependency>
- <!--
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
+ <artifactId>swagger-annotations-jakarta</artifactId>
  <version>${swagger-version}</version>
  </dependency>
  <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-core</artifactId>
- <version>${swagger-version}</version>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jaxrs</artifactId>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-core-jakarta</artifactId>
  <version>${swagger-version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </exclusion>
- </exclusions>
  </dependency>
  <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jersey2-jaxrs</artifactId>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-jaxrs2-jakarta</artifactId>
  <version>${swagger-version}</version>
  </dependency>
  <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-models-jakarta</artifactId>
  <version>${swagger-version}</version>
  </dependency>
- -->
-
- <!-- Javax Annotation -->
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.3.0</version>
- </dependency>
 
  <!-- For ASCII art -->
  <dependency>

diff --git a/web-api/src/main/java/com/app/JerseyApplication.java b/web-api/src/main/java/com/app/JerseyApplication.java
@@ -1,9 +1,9 @@
 package com.app;
 
-import javax.servlet.ServletContext;
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.ServletContext;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.UriInfo;
 
 import com.app.api.HandleInputJsonParseException;
 import com.app.util.HibernateUtil;
@@ -30,7 +30,6 @@ public class JerseyApplication extends ResourceConfig {
 
  @Context
  UriInfo uri;
-
  public JerseyApplication(@Context ServletContext servletContext) {
  log.info(String.format("\n\n " +
  "*** Web App Initiated *** " +

diff --git a/web-api/src/main/java/com/app/WebContextListener.txt b/web-api/src/main/java/com/app/WebContextListener.txt
@@ -1,8 +1,8 @@
 package com.app;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
 
 
 @WebListener

diff --git a/web-api/src/main/java/com/app/api/BaseController.java b/web-api/src/main/java/com/app/api/BaseController.java
@@ -1,10 +1,10 @@
 package com.app.api;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.SecurityContext;
 public class BaseController {
  @Context
  protected HttpServletRequest req;

diff --git a/web-api/src/main/java/com/app/api/HandleInputJsonParseException.java b/web-api/src/main/java/com/app/api/HandleInputJsonParseException.java
@@ -2,10 +2,10 @@
 
 import com.app.model.BaseResponse;
 import org.glassfish.jersey.server.ParamException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
 
 @Provider
 public class HandleInputJsonParseException implements ExceptionMapper<ParamException>{

diff --git a/web-api/src/main/java/com/app/api/MiscController.java b/web-api/src/main/java/com/app/api/MiscController.java
@@ -1,12 +1,12 @@
 package com.app.api;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.*;
-import javax.annotation.security.PermitAll;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.*;
+import jakarta.annotation.security.PermitAll;
 
 import com.app.DatabaseService;
 import com.app.model.BaseResponse;
-import javax.annotation.security.RolesAllowed;
+import jakarta.annotation.security.RolesAllowed;
 
 import com.app.util.Constants.UserRoleConstants;
 import io.swagger.v3.oas.annotations.Operation;

diff --git a/web-api/src/main/java/com/app/api/RelayRuntimeExceptionInResponse.java b/web-api/src/main/java/com/app/api/RelayRuntimeExceptionInResponse.java
@@ -2,10 +2,10 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
 import com.app.model.BaseResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/web-api/src/main/java/com/app/api/controllers/AuthenticationController.java b/web-api/src/main/java/com/app/api/controllers/AuthenticationController.java
@@ -1,8 +1,8 @@
 package com.app.api.controllers;
 
-import javax.annotation.security.PermitAll;
-import javax.ws.rs.*;
-import javax.ws.rs.core.*;
+import jakarta.annotation.security.PermitAll;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.*;
 
 import com.app.api.BaseController;
 import com.app.model.user.*;

diff --git a/web-api/src/main/java/com/app/api/controllers/CartController.java b/web-api/src/main/java/com/app/api/controllers/CartController.java
@@ -18,11 +18,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.security.RolesAllowed;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.List;
 import com.app.dao.CartDao;
 

diff --git a/web-api/src/main/java/com/app/api/controllers/CustomerController.java b/web-api/src/main/java/com/app/api/controllers/CustomerController.java
@@ -19,11 +19,11 @@
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
 
-import javax.annotation.security.RolesAllowed;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.List;
 
 @Path("customers")

diff --git a/web-api/src/main/java/com/app/api/controllers/EmployeeController.java b/web-api/src/main/java/com/app/api/controllers/EmployeeController.java
@@ -20,11 +20,11 @@
 import org.hibernate.Session;
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
-import javax.annotation.security.RolesAllowed;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.List;
 
 @Path("employees")

diff --git a/web-api/src/main/java/com/app/api/controllers/OrderController.java b/web-api/src/main/java/com/app/api/controllers/OrderController.java
@@ -17,11 +17,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.security.RolesAllowed;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/web-api/src/main/java/com/app/api/controllers/ProductController.java b/web-api/src/main/java/com/app/api/controllers/ProductController.java
@@ -16,11 +16,11 @@
 import org.hibernate.*;
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
-import javax.annotation.security.RolesAllowed;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.math.BigDecimal;
 import java.util.List;
 

diff --git a/web-api/src/main/java/com/app/api/controllers/StatsController.java b/web-api/src/main/java/com/app/api/controllers/StatsController.java
@@ -20,11 +20,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.security.RolesAllowed;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.List;
 
 @Path("stats")

diff --git a/web-api/src/main/java/com/app/api/controllers/UserController.java b/web-api/src/main/java/com/app/api/controllers/UserController.java
@@ -22,12 +22,12 @@
 import org.hibernate.criterion.Example;
 import org.hibernate.criterion.Projections;
 
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.annotation.security.PermitAll;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.ArrayList;
 import java.util.List;
 import static com.app.util.HibernateUtil.getSessionFactory;

diff --git a/web-api/src/main/java/com/app/dao/CartDao.java b/web-api/src/main/java/com/app/dao/CartDao.java
@@ -3,7 +3,7 @@
 import com.app.model.cart.CartModel;
 import com.app.model.cart.CartViewModel;
 import org.hibernate.*;
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolationException;
 import java.util.List;
 
 public class CartDao {

diff --git a/web-api/src/main/java/com/app/dao/CustomerDao.java b/web-api/src/main/java/com/app/dao/CustomerDao.java
@@ -2,7 +2,7 @@
 
 import com.app.model.customer.CustomerModel;
 import org.hibernate.*;
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolationException;
 
 public class CustomerDao {
 

diff --git a/web-api/src/main/java/com/app/dao/EmployeeDao.java b/web-api/src/main/java/com/app/dao/EmployeeDao.java
@@ -2,7 +2,7 @@
 
 import com.app.model.employee.EmployeeModel;
 import org.hibernate.*;
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolationException;
 
 public class EmployeeDao {
  public static EmployeeModel getById(Session hbrSession, Integer employeeId){