Removed unused import & E2E test fix attempt.

- ResourceMethodInvoker had an unused import.
- Attempted a fix for frequently failing SSL tests:
  - added better synchronisation for variables storing the test SSL-secured HTTP server instances
  - selected a safer default port for the test SSL-secured HTTP server

Change-Id: I711bb73ea7374f3d7d05fae06405e93ac197fe70
Signed-off-by: Marek Potociar <[email protected]>

Author: Marek Potociar

core-server/src/main/java/org/glassfish/jersey/server/model/ResourceMethodInvoker.java

@@ -83,7 +83,6 @@
 import org.glassfish.jersey.server.model.internal.ResourceMethodDispatcherFactory;
 import org.glassfish.jersey.server.model.internal.ResourceMethodInvocationHandlerFactory;
 import org.glassfish.jersey.server.monitoring.RequestEvent;
-import org.glassfish.jersey.server.spi.ValidationInterceptor;
 import org.glassfish.jersey.server.spi.internal.ResourceMethodDispatcher;
 import org.glassfish.jersey.server.spi.internal.ResourceMethodInvocationHandlerProvider;
 

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/Server.java

@@ -42,7 +42,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.ws.rs.core.UriBuilder;
@@ -66,20 +65,21 @@ final class Server {
 
     private static final String SERVER_TRUST_STORE = "truststore_server";
     private static final String SERVER_KEY_STORE = "keystore_server";
-    private static HttpServer webServer;
     private static final Logger LOGGER = Logger.getLogger(Server.class.getName());
 
     /**
      * Base server URI.
      */
     public static final URI BASE_URI = getBaseURI();
 
-    private Server() {
-        throw new AssertionError("Instantiation not allowed.");
+    private final HttpServer webServer;
+
+    private Server(final HttpServer webServer) {
+        this.webServer = webServer;
     }
 
     private static URI getBaseURI() {
-        return UriBuilder.fromUri("https://localhost/").port(getPort(4463)).build();
+        return UriBuilder.fromUri("https://localhost/").port(getPort(8463)).build();
     }
 
     private static int getPort(int defaultPort) {
@@ -100,8 +100,9 @@ private static int getPort(int defaultPort) {
      * Start SSL-secured HTTP test server.
      *
      * @throws IOException in case there is an error while reading server key store or trust store.
+     * @return an instance of the started SSL-secured HTTP test server.
      */
-    static void startServer() throws IOException {
+    public static Server start() throws IOException {
         final InputStream trustStore = Server.class.getResourceAsStream(SERVER_TRUST_STORE);
         final InputStream keyStore = Server.class.getResourceAsStream(SERVER_KEY_STORE);
 
@@ -118,27 +119,24 @@ static void startServer() throws IOException {
         rc.register(new LoggingFilter(LOGGER, true));
         rc.registerClasses(RootResource.class, SecurityFilter.class, AuthenticationExceptionMapper.class);
 
-        try {
-            webServer = GrizzlyHttpServerFactory.createHttpServer(
-                    getBaseURI(),
-                    rc,
-                    true,
-                    new SSLEngineConfigurator(sslContext).setClientMode(false).setNeedClientAuth(true)
-            );
+        final HttpServer grizzlyServer = GrizzlyHttpServerFactory.createHttpServer(
+                getBaseURI(),
+                rc,
+                true,
+                new SSLEngineConfigurator(sslContext).setClientMode(false).setNeedClientAuth(true)
+        );
 
-            // start Grizzly embedded server //
-            LOGGER.info("Jersey app started. Try out " + BASE_URI + "\nHit CTRL + C to stop it...");
-            webServer.start();
+        // start Grizzly embedded server //
+        LOGGER.info("Jersey app started. Try out " + BASE_URI + "\nHit CTRL + C to stop it...");
+        grizzlyServer.start();
 
-        } catch (Exception ex) {
-            LOGGER.log(Level.SEVERE, "Error while starting the server.", ex);
-        }
+        return new Server(grizzlyServer);
     }
 
     /**
      * Stop SSL-secured HTTP test server.
      */
-    static void stopServer() {
+    public void stop() {
         webServer.shutdownNow();
     }
 }

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/SslConnectorConfigurationTest.java

@@ -90,7 +90,7 @@ public class SslConnectorConfigurationTest {
      */
     @Parameterized.Parameters(name = "{index}: {0}")
     public static Iterable<Object[]> testData() {
-        return Arrays.asList(new Object[][]{
+        return Arrays.asList(new Object[][] {
                 {new HttpUrlConnectorProvider()},
                 {new GrizzlyConnectorProvider()},
                 {new JettyConnectorProvider()},
@@ -101,14 +101,29 @@ public static Iterable<Object[]> testData() {
     @Parameterized.Parameter(0)
     public ConnectorProvider connectorProvider;
 
+    private final Object serverGuard = new Object();
+    private Server server = null;
+
     @Before
     public void setUp() throws Exception {
-        Server.startServer();
+        synchronized (serverGuard) {
+            if (server != null) {
+                throw new IllegalStateException(
+                        "Test run sync issue: Another instance of the SSL-secured HTTP test server has been already started.");
+            }
+            server = Server.start();
+        }
     }
 
     @After
     public void tearDown() throws Exception {
-        Server.stopServer();
+        synchronized (serverGuard) {
+            if (server == null) {
+                throw new IllegalStateException("Test run sync issue: There is no SSL-secured HTTP test server to stop.");
+            }
+            server.stop();
+            server = null;
+        }
     }
 
     private static SSLContext getSslContext() throws IOException {