JERSEY-2501: Jersey 2.8 breaks JerseyTest unit tests under TestNG

JERSEY-2502: JdkHttpServerFactory does not return HttpsServer when https:// URI is used.

 - ability to run TestNG tests in parallel (see JerseyTestNg and TestNgState)
 - find first available port for container if 0 is passed as the port
 - added some parallel TestNG tests
 - updated documentation

Change-Id: I6be235f40b01a055d64ed1ac6279e98f431d085d
Signed-off-by: Michal Gajdos <[email protected]>

Author: Michal Gajdos

containers/jdk-http/src/main/java/org/glassfish/jersey/jdkhttp/JdkHttpServerFactory.java

@@ -53,6 +53,7 @@
 import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
 
 /**
@@ -100,7 +101,7 @@ public static HttpServer createHttpServer(final URI uri, final ResourceConfig co
         return createHttpServer(uri, new JdkHttpHandlerContainer(configuration), start);
     }
 
-    private static HttpServer createHttpServer(final URI uri, final JdkHttpHandlerContainer handler, boolean start) {
+    private static HttpServer createHttpServer(final URI uri, final JdkHttpHandlerContainer handler, final boolean start) {
 
         if (uri == null) {
             throw new IllegalArgumentException(LocalizationMessages.ERROR_CONTAINER_URI_NULL());
@@ -120,79 +121,156 @@ private static HttpServer createHttpServer(final URI uri, final JdkHttpHandlerCo
             throw new IllegalArgumentException(LocalizationMessages.ERROR_CONTAINER_URI_PATH_START(uri));
         }
 
-        final int port = (uri.getPort() == -1) ? 80 : uri.getPort();
+        final boolean isHttp = scheme.equalsIgnoreCase("http");
+        final int port = (uri.getPort() == -1)
+                ? (isHttp ? 80 : 143)
+                : uri.getPort();
+
         final HttpServer server;
         try {
-            server = (scheme.equalsIgnoreCase("http"))
+            server = isHttp
                     ? HttpServer.create(new InetSocketAddress(port), 0)
                     : HttpsServer.create(new InetSocketAddress(port), 0);
-        } catch (IOException ioe) {
+        } catch (final IOException ioe) {
             throw new ProcessingException(LocalizationMessages.ERROR_CONTAINER_EXCEPTION_IO(), ioe);
         }
 
         server.setExecutor(Executors.newCachedThreadPool());
         server.createContext(path, handler);
 
-        final HttpServer wrapper = new HttpServer() {
+        final HttpServer wrapper = isHttp
+                ? createHttpServerWrapper(server, handler)
+                : createHttpsServerWrapper((HttpsServer) server, handler);
+
+        if (start) {
+            wrapper.start();
+        }
+
+        return wrapper;
+    }
+
+    private static HttpServer createHttpsServerWrapper(final HttpsServer delegate, final JdkHttpHandlerContainer handler) {
+        return new HttpsServer() {
+
+            @Override
+            public void setHttpsConfigurator(final HttpsConfigurator httpsConfigurator) {
+                delegate.setHttpsConfigurator(httpsConfigurator);
+            }
+
+            @Override
+            public HttpsConfigurator getHttpsConfigurator() {
+                return delegate.getHttpsConfigurator();
+            }
 
             @Override
-            public void bind(InetSocketAddress inetSocketAddress, int i) throws IOException {
-                server.bind(inetSocketAddress, i);
+            public void bind(final InetSocketAddress inetSocketAddress, final int i) throws IOException {
+                delegate.bind(inetSocketAddress, i);
             }
 
             @Override
             public void start() {
-                server.start();
+                delegate.start();
                 handler.onServerStart();
             }
 
             @Override
-            public void setExecutor(Executor executor) {
-                server.setExecutor(executor);
+            public void setExecutor(final Executor executor) {
+                delegate.setExecutor(executor);
             }
 
             @Override
             public Executor getExecutor() {
-                return server.getExecutor();
+                return delegate.getExecutor();
             }
 
             @Override
-            public void stop(int i) {
+            public void stop(final int i) {
                 handler.onServerStop();
-                server.stop(i);
+                delegate.stop(i);
             }
 
             @Override
-            public HttpContext createContext(String s, HttpHandler httpHandler) {
-                return server.createContext(s, httpHandler);
+            public HttpContext createContext(final String s, final HttpHandler httpHandler) {
+                return delegate.createContext(s, httpHandler);
             }
 
             @Override
-            public HttpContext createContext(String s) {
-                return server.createContext(s);
+            public HttpContext createContext(final String s) {
+                return delegate.createContext(s);
             }
 
             @Override
-            public void removeContext(String s) throws IllegalArgumentException {
-                server.removeContext(s);
+            public void removeContext(final String s) throws IllegalArgumentException {
+                delegate.removeContext(s);
             }
 
             @Override
-            public void removeContext(HttpContext httpContext) {
-                server.removeContext(httpContext);
+            public void removeContext(final HttpContext httpContext) {
+                delegate.removeContext(httpContext);
             }
 
             @Override
             public InetSocketAddress getAddress() {
-                return server.getAddress();
+                return delegate.getAddress();
             }
         };
+    }
 
-        if (start) {
-            wrapper.start();
-        }
+    private static HttpServer createHttpServerWrapper(final HttpServer delegate, final JdkHttpHandlerContainer handler) {
+        return new HttpServer() {
 
-        return wrapper;
+            @Override
+            public void bind(final InetSocketAddress inetSocketAddress, final int i) throws IOException {
+                delegate.bind(inetSocketAddress, i);
+            }
+
+            @Override
+            public void start() {
+                delegate.start();
+                handler.onServerStart();
+            }
+
+            @Override
+            public void setExecutor(final Executor executor) {
+                delegate.setExecutor(executor);
+            }
+
+            @Override
+            public Executor getExecutor() {
+                return delegate.getExecutor();
+            }
+
+            @Override
+            public void stop(final int i) {
+                handler.onServerStop();
+                delegate.stop(i);
+            }
+
+            @Override
+            public HttpContext createContext(final String s, final HttpHandler httpHandler) {
+                return delegate.createContext(s, httpHandler);
+            }
+
+            @Override
+            public HttpContext createContext(final String s) {
+                return delegate.createContext(s);
+            }
+
+            @Override
+            public void removeContext(final String s) throws IllegalArgumentException {
+                delegate.removeContext(s);
+            }
+
+            @Override
+            public void removeContext(final HttpContext httpContext) {
+                delegate.removeContext(httpContext);
+            }
+
+            @Override
+            public InetSocketAddress getAddress() {
+                return delegate.getAddress();
+            }
+        };
     }
 
     /**

containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/BasicJdkHttpServerTest.java

@@ -0,0 +1,100 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package org.glassfish.jersey.jdkhttp;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.UriBuilder;
+
+import org.glassfish.jersey.server.ResourceConfig;
+
+import org.junit.After;
+import org.junit.Test;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsServer;
+
+/**
+ * Jdk Http Server basic tests.
+ *
+ * @author Michal Gajdos (michal.gajdos at oracle.com)
+ */
+public class BasicJdkHttpServerTest extends AbstractJdkHttpServerTester {
+
+    private HttpServer server;
+
+    @Path("/test")
+    public static class TestResource {
+
+        @GET
+        public String get() {
+            return "test";
+        }
+    }
+
+    @Test
+    public void testCreateHttpServer() throws Exception {
+        server = JdkHttpServerFactory.createHttpServer(
+                UriBuilder.fromUri("http://localhost/").port(getPort()).build(), new ResourceConfig(TestResource.class));
+
+        assertThat(server, instanceOf(HttpServer.class));
+        assertThat(server, not(instanceOf(HttpsServer.class)));
+    }
+
+    @Test
+    public void testCreateHttpsServer() throws Exception {
+        server = JdkHttpServerFactory.createHttpServer(
+                UriBuilder.fromUri("https://localhost/").port(getPort()).build(), new ResourceConfig(TestResource.class));
+
+        assertThat(server, instanceOf(HttpsServer.class));
+    }
+
+    @After
+    public void tearDown() {
+        if (server != null) {
+            server.stop(3);
+            server = null;
+        }
+    }
+}