Transition from Java EE to Jakarta EE (#62)

codenvy · Aug 19, 2021 · c73085c · c73085c
1 parent 584faf6
commit c73085c
Show file tree

Hide file tree

Showing 339 changed files with 2,204 additions and 1,849 deletions.
diff --git a/everrest-assured/pom.xml b/everrest-assured/pom.xml
@@ -21,19 +21,19 @@
     </parent>
     <artifactId>everrest-assured</artifactId>
     <name>EverRest :: HTTP :: Testng listener</name>
-    <description>Testng listener that deploy mock rest services on Jetty with everrest and tested with rest-assured</description>
+    <description>Testng listener that deploy mock rest services on Jetty with Everrest and tested with rest-assured</description>
     <dependencies>
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
+            <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -59,6 +59,10 @@
             <groupId>org.everrest</groupId>
             <artifactId>everrest-groovy</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.everrest</groupId>
+            <artifactId>everrest-rest-assured-xml-path</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -79,13 +83,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -95,12 +99,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -114,4 +113,22 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>analyze</id>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <ignoredUnusedDeclaredDependency>org.everrest:everrest-rest-assured-xml-path</ignoredUnusedDeclaredDependency>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/everrest-assured/src/main/java/org/everrest/assured/EverrestJetty.java b/everrest-assured/src/main/java/org/everrest/assured/EverrestJetty.java
@@ -11,14 +11,14 @@
  */
 package org.everrest.assured;
 
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.ext.ContextResolver;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
 import java.lang.reflect.Field;
-import javax.ws.rs.Path;
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
 import org.everrest.core.Filter;
 import org.everrest.core.FilterDescriptor;
 import org.everrest.core.ObjectFactory;
@@ -143,13 +143,14 @@ private void initRestResource(ITestNGMethod... testMethods) {
               if (factory != null) {
                 everrest.addFactory(factory);
               }
-            } else if (javax.servlet.Filter.class.isAssignableFrom(field.getType())) {
+            } else if (jakarta.servlet.Filter.class.isAssignableFrom(field.getType())) {
               field.setAccessible(true);
               Object fieldInstance = field.get(instance);
               if (fieldInstance != null) {
-                httpServer.addFilter(((javax.servlet.Filter) fieldInstance), "/*");
+                httpServer.addFilter(((jakarta.servlet.Filter) fieldInstance), "/*");
               } else {
-                httpServer.addFilter((Class<? extends javax.servlet.Filter>) field.getType(), "/*");
+                httpServer.addFilter(
+                    (Class<? extends jakarta.servlet.Filter>) field.getType(), "/*");
               }
             }
           } catch (IllegalAccessException e) {

diff --git a/everrest-assured/src/main/java/org/everrest/assured/JettyHttpServer.java b/everrest-assured/src/main/java/org/everrest/assured/JettyHttpServer.java
@@ -11,11 +11,10 @@
  */
 package org.everrest.assured;
 
+import jakarta.servlet.Filter;
+import jakarta.ws.rs.core.Application;
 import java.lang.reflect.Method;
-import java.util.EventListener;
 import java.util.Random;
-import javax.servlet.Filter;
-import javax.ws.rs.core.Application;
 import org.eclipse.jetty.security.ConstraintMapping;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
 import org.eclipse.jetty.security.HashLoginService;
@@ -81,7 +80,7 @@ public void start() throws Exception {
       context = new ServletContextHandler(handler, "/", ServletContextHandler.SESSIONS);
     }
 
-    context.setEventListeners(new EventListener[] {new EverrestInitializedListener()});
+    context.addEventListener(new EverrestInitializedListener());
     ServletHolder servletHolder = new ServletHolder(new EverrestServlet());
 
     context.addServlet(servletHolder, UNSECURE_PATH_SPEC);

diff --git a/everrest-assured/src/test/java/org/everrest/assured/BookServiceTest.java b/everrest-assured/src/test/java/org/everrest/assured/BookServiceTest.java
@@ -11,7 +11,7 @@
  */
 package org.everrest.assured;
 
-import static com.jayway.restassured.RestAssured.expect;
+import static io.restassured.RestAssured.expect;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

diff --git a/everrest-assured/src/test/java/org/everrest/assured/ContextInjectionTest.java b/everrest-assured/src/test/java/org/everrest/assured/ContextInjectionTest.java
@@ -11,18 +11,18 @@
  */
 package org.everrest.assured;
 
-import static com.jayway.restassured.RestAssured.when;
+import static io.restassured.RestAssured.when;
 import static org.testng.Assert.assertEquals;
 
-import com.jayway.restassured.response.Response;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
+import io.restassured.response.Response;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.UriInfo;
 import org.mockito.testng.MockitoTestNGListener;
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;

diff --git a/everrest-assured/src/test/java/org/everrest/assured/ExceptionMapperTest.java b/everrest-assured/src/test/java/org/everrest/assured/ExceptionMapperTest.java
@@ -11,7 +11,7 @@
  */
 package org.everrest.assured;
 
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

diff --git a/everrest-assured/src/test/java/org/everrest/assured/GroovyServiceTest.java b/everrest-assured/src/test/java/org/everrest/assured/GroovyServiceTest.java
@@ -11,7 +11,7 @@
  */
 package org.everrest.assured;
 
-import static com.jayway.restassured.RestAssured.expect;
+import static io.restassured.RestAssured.expect;
 import static org.everrest.assured.EverrestJetty.JETTY_SERVER;
 
 import org.hamcrest.Matchers;

diff --git a/everrest-assured/src/test/java/org/everrest/assured/MethodInvokerFilterTest.java b/everrest-assured/src/test/java/org/everrest/assured/MethodInvokerFilterTest.java
@@ -15,10 +15,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.jayway.restassured.RestAssured;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.WebApplicationException;
+import io.restassured.RestAssured;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.WebApplicationException;
 import org.everrest.core.Filter;
 import org.everrest.core.method.MethodInvokerFilter;
 import org.everrest.core.resource.GenericResourceMethod;

diff --git a/everrest-assured/src/test/java/org/everrest/assured/ProviderTest.java b/everrest-assured/src/test/java/org/everrest/assured/ProviderTest.java
@@ -11,24 +11,24 @@
  */
 package org.everrest.assured;
 
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 
-import com.jayway.restassured.response.Response;
+import io.restassured.response.Response;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
 import org.everrest.sample.book.Book;
 import org.everrest.sample.book.BookService;
 import org.everrest.sample.book.BookStorage;

diff --git a/everrest-assured/src/test/java/org/everrest/assured/RequestFilterTest.java b/everrest-assured/src/test/java/org/everrest/assured/RequestFilterTest.java
@@ -11,17 +11,17 @@
  */
 package org.everrest.assured;
 
-import static com.jayway.restassured.RestAssured.expect;
+import static io.restassured.RestAssured.expect;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.Providers;
 import java.util.ArrayList;
 import java.util.Collection;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.Providers;
 import org.everrest.core.Filter;
 import org.everrest.core.GenericContainerRequest;
 import org.everrest.core.RequestFilter;

diff --git a/everrest-assured/src/test/java/org/everrest/assured/ResponseFilterTest.java b/everrest-assured/src/test/java/org/everrest/assured/ResponseFilterTest.java
@@ -16,13 +16,13 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.jayway.restassured.RestAssured;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.Providers;
+import io.restassured.RestAssured;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.Providers;
 import org.everrest.core.Filter;
 import org.everrest.core.GenericContainerResponse;
 import org.everrest.core.ResponseFilter;

diff --git a/everrest-assured/src/test/java/org/everrest/assured/TestSecureServices.java b/everrest-assured/src/test/java/org/everrest/assured/TestSecureServices.java
@@ -11,12 +11,12 @@
  */
 package org.everrest.assured;
 
-import static com.jayway.restassured.RestAssured.expect;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.expect;
+import static io.restassured.RestAssured.given;
 
-import javax.annotation.security.RolesAllowed;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
 import org.hamcrest.Matchers;
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;

diff --git a/everrest-assured/src/test/java/org/everrest/sample/book/BookNotFoundExceptionMapper.java b/everrest-assured/src/test/java/org/everrest/sample/book/BookNotFoundExceptionMapper.java
@@ -11,9 +11,9 @@
  */
 package org.everrest.sample.book;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
 
 @Provider
 public class BookNotFoundExceptionMapper implements ExceptionMapper<BookNotFoundException> {

diff --git a/everrest-assured/src/test/java/org/everrest/sample/book/BookService.java b/everrest-assured/src/test/java/org/everrest/sample/book/BookService.java
@@ -11,12 +11,12 @@
  */
 package org.everrest.sample.book;
 
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 import java.net.URI;
 import java.util.Collection;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
 
 /** */
 @Path("books")

diff --git a/everrest-assured/src/test/resources/a/b/GroovyResource1.groovy b/everrest-assured/src/test/resources/a/b/GroovyResource1.groovy
@@ -10,10 +10,10 @@
  *   Codenvy, S.A. - initial API and implementation
  */
 package a.b
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
 
 @Path("a")
 class GroovyResource1