Closes #29: Upgrade to Jersey 2

docs-web-common/src/test/java/com/sismics/docs/rest/BaseJerseyTest.java

@@ -1,16 +1,27 @@
 package com.sismics.docs.rest;
 
 import java.io.File;
+import java.net.URI;
 import java.net.URLDecoder;
 
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.UriBuilder;
+
 import org.glassfish.grizzly.http.server.HttpServer;
-import org.glassfish.grizzly.http.server.StaticHttpHandler;
+import org.glassfish.grizzly.servlet.ServletRegistration;
+import org.glassfish.grizzly.servlet.WebappContext;
+import org.glassfish.jersey.servlet.ServletContainer;
+import org.glassfish.jersey.test.JerseyTest;
+import org.glassfish.jersey.test.TestProperties;
+import org.glassfish.jersey.test.external.ExternalTestContainerFactory;
+import org.glassfish.jersey.test.spi.TestContainerException;
+import org.glassfish.jersey.test.spi.TestContainerFactory;
 import org.junit.After;
 import org.junit.Before;
 
-import com.sismics.docs.rest.descriptor.JerseyTestWebAppDescriptorFactory;
 import com.sismics.docs.rest.util.ClientUtil;
-import com.sun.jersey.test.framework.JerseyTest;
+import com.sismics.util.filter.RequestContextFilter;
+import com.sismics.util.filter.TokenBasedSecurityFilter;
 
 /**
  * Base class of integration tests with Jersey.
@@ -28,12 +39,21 @@ public abstract class BaseJerseyTest extends JerseyTest {
      */
     protected ClientUtil clientUtil;
     
-    /**
-     * Constructor of BaseJerseyTest.
-     */
-    public BaseJerseyTest() {
-        super(JerseyTestWebAppDescriptorFactory.build());
-        this.clientUtil = new ClientUtil(resource());
+    @Override
+    protected TestContainerFactory getTestContainerFactory() throws TestContainerException {
+        return new ExternalTestContainerFactory();
+    }
+    
+    @Override
+    protected Application configure() {
+        enable(TestProperties.LOG_TRAFFIC);
+        enable(TestProperties.DUMP_ENTITY);
+        return new Application();
+    }
+    
+    @Override
+    protected URI getBaseUri() {
+        return UriBuilder.fromUri(super.getBaseUri()).path("docs").build();
     }
     
     @Override
@@ -41,10 +61,23 @@ public abstract class BaseJerseyTest extends JerseyTest {
     public void setUp() throws Exception {
         super.setUp();
         
+        clientUtil = new ClientUtil(target());
+        
         String httpRoot = URLDecoder.decode(new File(getClass().getResource("/").getFile()).getAbsolutePath(), "utf-8");
-        httpServer = HttpServer.createSimpleServer(httpRoot, "localhost", 9997);
-        // Disable file cache to fix https://java.net/jira/browse/GRIZZLY-1350
-        ((StaticHttpHandler) httpServer.getServerConfiguration().getHttpHandlers().keySet().iterator().next()).setFileCacheEnabled(false);
+        httpServer = HttpServer.createSimpleServer(httpRoot, "localhost", getPort());
+        WebappContext context = new WebappContext("GrizzlyContext", "/docs");
+        context.addFilter("requestContextFilter", RequestContextFilter.class)
+                .addMappingForUrlPatterns(null, "/*");
+        context.addFilter("tokenBasedSecurityFilter", TokenBasedSecurityFilter.class)
+                .addMappingForUrlPatterns(null, "/*");
+        ServletRegistration reg = context.addServlet("jerseyServlet", ServletContainer.class);
+        reg.setInitParameter("jersey.config.server.provider.packages", "com.sismics.docs.rest.resource");
+        reg.setInitParameter("jersey.config.server.provider.classnames", "org.glassfish.jersey.media.multipart.MultiPartFeature");
+        reg.setInitParameter("jersey.config.server.response.setStatusOverSendError", "true");
+        reg.setLoadOnStartup(1);
+        reg.addMapping("/*");
+        reg.setAsyncSupported(true);
+        context.deploy(httpServer);
         httpServer.start();
     }
 
@@ -52,6 +85,8 @@ public abstract class BaseJerseyTest extends JerseyTest {
     @After
     public void tearDown() throws Exception {
         super.tearDown();
-        httpServer.stop();
+        if (httpServer != null) {
+            httpServer.shutdownNow();
+        }
     }
 }

docs-web-common/src/test/java/com/sismics/docs/rest/descriptor/JerseyTestWebAppDescriptorFactory.java

@@ -1,36 +0,0 @@
-package com.sismics.docs.rest.descriptor;
-
-import com.sismics.util.filter.RequestContextFilter;
-import com.sismics.util.filter.TokenBasedSecurityFilter;
-import com.sun.jersey.test.framework.WebAppDescriptor;
-
-import java.io.File;
-
-/**
- * Jersey tests Webapp descriptor.
- * 
- * @author jtremeaux
- */
-public class JerseyTestWebAppDescriptorFactory {
-    private static String basePath = new File("src/main/webapp").getAbsolutePath();
-    
-    /**
-     * Constructs a new descriptor.
-     * 
-     * @return Descriptor
-     */
-    public static WebAppDescriptor build() {
-        // Target the base path to the Webapp resources
-        System.setProperty("user.dir", basePath);
-        System.setProperty("test", "true");
-        
-        return new WebAppDescriptor.Builder("com.sismics.docs.rest.resource")
-            .contextPath("docs")
-            .addFilter(RequestContextFilter.class, "requestContextFilter")
-            .addFilter(TokenBasedSecurityFilter.class, "tokenBasedSecurityFilter")
-            .initParam("com.sun.jersey.spi.container.ContainerRequestFilters", "com.sun.jersey.api.container.filter.LoggingFilter")
-            .initParam("com.sun.jersey.spi.container.ContainerResponseFilters", "com.sun.jersey.api.container.filter.LoggingFilter")
-            .initParam("com.sun.jersey.config.feature.logging.DisableEntitylogging", "true")
-            .build();
-    }
-}

docs-web-common/src/test/java/com/sismics/docs/rest/filter/CookieAuthenticationFilter.java

@@ -1,40 +0,0 @@
-package com.sismics.docs.rest.filter;
-
-import com.sismics.util.filter.TokenBasedSecurityFilter;
-import com.sun.jersey.api.client.ClientHandlerException;
-import com.sun.jersey.api.client.ClientRequest;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.filter.ClientFilter;
-
-import javax.ws.rs.core.Cookie;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Filter to add the authentication token into a cookie.
- *
- * @author jtremeaux
- */
-public class CookieAuthenticationFilter extends ClientFilter {
-    private String authToken;
-    
-    public CookieAuthenticationFilter(String authToken) {
-        this.authToken = authToken;
-    }
-    
-    @Override
-    public ClientResponse handle(ClientRequest request) throws ClientHandlerException {
-        Cookie cookie = new Cookie(TokenBasedSecurityFilter.COOKIE_NAME, authToken);
-        List<Object> cookieList = new ArrayList<Object>();
-        cookieList.add(cookie);
-        if (authToken != null) {
-            request.getHeaders().put("Cookie", cookieList);
-        }
-        ClientResponse response = getNext().handle(request);
-        if (response.getCookies() != null) {
-            cookieList.addAll(response.getCookies());
-        }
-        return response;
-    }
-
-}

docs-web-common/src/test/java/com/sismics/docs/rest/util/ClientUtil.java

@@ -1,15 +1,13 @@
 package com.sismics.docs.rest.util;
 
-import com.sismics.docs.rest.filter.CookieAuthenticationFilter;
-import com.sismics.util.filter.TokenBasedSecurityFilter;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-import junit.framework.Assert;
-
-import javax.ws.rs.core.MultivaluedMap;
+import javax.json.JsonObject;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Form;
 import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.core.Response;
+
+import com.sismics.util.filter.TokenBasedSecurityFilter;
 
 /**
  * REST client utilities.
@@ -17,14 +15,14 @@ import javax.ws.rs.core.NewCookie;
  * @author jtremeaux 
  */
 public class ClientUtil {
-    private WebResource resource;
+    private WebTarget resource;
     
     /**
      * Constructor of ClientUtil.
      * 
-     * @param webResource Resource corresponding to the base URI of REST resources.
+     * @param resource Resource corresponding to the base URI of REST resources.
      */
-    public ClientUtil(WebResource resource) {
+    public ClientUtil(WebTarget resource) {
         this.resource = resource;
     }
     
@@ -38,15 +36,14 @@ public class ClientUtil {
         String adminAuthenticationToken = login("admin", "admin", false);
         
         // Create the user
-        WebResource userResource = resource.path("/user");
-        userResource.addFilter(new CookieAuthenticationFilter(adminAuthenticationToken));
-        MultivaluedMap<String, String> postParams = new MultivaluedMapImpl();
-        postParams.putSingle("username", username);
-        postParams.putSingle("email", username + "@docs.com");
-        postParams.putSingle("password", "12345678");
-        postParams.putSingle("time_zone", "Asia/Tokyo");
-        ClientResponse response = userResource.put(ClientResponse.class, postParams);
-        Assert.assertEquals(Status.OK, Status.fromStatusCode(response.getStatus()));
+        Form form = new Form();
+        form.param("username", username);
+        form.param("email", username + "@docs.com");
+        form.param("password", "12345678");
+        form.param("time_zone", "Asia/Tokyo");
+        resource.path("/user").request()
+                .cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminAuthenticationToken)
+                .put(Entity.form(form), JsonObject.class);
         
         // Logout admin
         logout(adminAuthenticationToken);
@@ -61,13 +58,12 @@ public class ClientUtil {
      * @return Authentication token
      */
     public String login(String username, String password, Boolean remember) {
-        WebResource userResource = resource.path("/user/login");
-        MultivaluedMap<String, String> postParams = new MultivaluedMapImpl();
-        postParams.putSingle("username", username);
-        postParams.putSingle("password", password);
-        postParams.putSingle("remember", remember.toString());
-        ClientResponse response = userResource.post(ClientResponse.class, postParams);
-        Assert.assertEquals(Status.OK, Status.fromStatusCode(response.getStatus()));
+        Form form = new Form();
+        form.param("username", username);
+        form.param("password", password);
+        form.param("remember", remember.toString());
+        Response response = resource.path("/user/login").request()
+                .post(Entity.form(form));
         
         return getAuthenticationCookie(response);
     }
@@ -88,10 +84,9 @@ public class ClientUtil {
      * @param authenticationToken Authentication token
      */
     public void logout(String authenticationToken) {
-        WebResource userResource = resource.path("/user/logout");
-        userResource.addFilter(new CookieAuthenticationFilter(authenticationToken));
-        ClientResponse response = userResource.post(ClientResponse.class);
-        Assert.assertEquals(Status.OK, Status.fromStatusCode(response.getStatus()));
+        resource.path("/user/logout").request()
+                .cookie(TokenBasedSecurityFilter.COOKIE_NAME, authenticationToken)
+                .post(null);
     }
 
     /**
@@ -100,9 +95,9 @@ public class ClientUtil {
      * @param response Response
      * @return Authentication token
      */
-    public String getAuthenticationCookie(ClientResponse response) {
+    public String getAuthenticationCookie(Response response) {
         String authToken = null;
-        for (NewCookie cookie : response.getCookies()) {
+        for (NewCookie cookie : response.getCookies().values()) {
             if (TokenBasedSecurityFilter.COOKIE_NAME.equals(cookie.getName())) {
                 authToken = cookie.getValue();
             }