Refactoring of the webserver package

NOTICE

@@ -100,6 +100,7 @@ Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) and the
 * AbstractResourceHandler.java. Copyright 1995-2013 Mort Bay Consulting Pty. Ltd.
 * ClassPathResourceHandler.java. Copyright 1995-2013 Mort Bay Consulting Pty. Ltd.
 * ExternalResourceHandler.java. Copyright 1995-2013 Mort Bay Consulting Pty. Ltd.
+* UriPath.java. Copyright 1995-2013 Mort Bay Consulting Pty. Ltd.
 
 ARJEN POUTSMA
 This product includes the following software developed by Arjen Poutsma which is licensed under the terms of the

src/main/java/spark/Access.java

@@ -18,13 +18,13 @@
 
 import spark.routematch.RouteMatch;
 
+/**
+ * Provides access to package protected methods. JUST FOR INTERNAL USE. NOT PART OF PUBLIC SPARK API.
+ */
 public final class Access {
 
     private Access() {
-    }
-
-    public static String getBody(Response response) {
-        return response.body();
+        // hidden
     }
 
     public static void changeMatch(Request request, RouteMatch match) {

src/main/java/spark/HaltException.java

@@ -48,17 +48,32 @@ public class HaltException extends RuntimeException {
 
     /**
      * @return the statusCode
+     * @deprecated replaced by {@link #statusCode()}
      */
     public int getStatusCode() {
         return statusCode;
     }
 
+    /**
+     * @return the statusCode
+     */
+    public int statusCode() {
+        return statusCode;
+    }
 
     /**
      * @return the body
+     * @deprecated replaced by {@link #body()}
      */
     public String getBody() {
         return body;
     }
 
+    /**
+     * @return the body
+     */
+    public String body() {
+        return body;
+    }
+
 }

src/main/java/spark/Spark.java

@@ -849,7 +849,7 @@ public static void halt(int status, String body) {
      * @deprecated replaced by {@link #ipAddress(String)}
      */
     public static void setIpAddress(String ipAddress) {
-        getInstance().setIpAddress(ipAddress);
+        getInstance().ipAddress(ipAddress);
     }
 
     /**
@@ -872,7 +872,7 @@ public static void ipAddress(String ipAddress) {
      * @deprecated replaced by {@link #port(int)}
      */
     public static void setPort(int port) {
-        getInstance().setPort(port);
+        getInstance().port(port);
     }
 
     /**
@@ -906,7 +906,7 @@ public static void setSecure(String keystoreFile,
                                  String keystorePassword,
                                  String truststoreFile,
                                  String truststorePassword) {
-        getInstance().setSecure(keystoreFile, keystorePassword, truststoreFile, truststorePassword);
+        getInstance().secure(keystoreFile, keystorePassword, truststoreFile, truststorePassword);
     }
 
     /**

src/main/java/spark/SparkInstance.java

@@ -29,7 +29,8 @@
 import spark.route.SimpleRouteMatcher;
 import spark.ssl.SslStores;
 import spark.staticfiles.StaticFiles;
-import spark.webserver.SparkServerFactory;
+import spark.webserver.EmbeddedServer;
+import spark.webserver.EmbeddedServers;
 
 import static java.util.Objects.requireNonNull;
 
@@ -59,14 +60,16 @@ final class SparkInstance extends Routable {
     protected int threadIdleTimeoutMillis = -1;
     protected Optional<Integer> webSocketIdleTimeoutMillis = Optional.empty();
 
-    protected SparkServer server;
+    protected EmbeddedServer server;
     protected SimpleRouteMatcher routeMatcher;
 
     private boolean servletStaticLocationSet;
     private boolean servletExternalStaticLocationSet;
 
     private CountDownLatch latch = new CountDownLatch(1);
 
+    private Object embeddedServerIdentifier = EmbeddedServers.defaultIdentifier();
+
     /**
      * Set the IP address that Spark should listen on. If not called the default
      * address is '0.0.0.0'. This has to be called before any route mapping is
@@ -255,15 +258,19 @@ public synchronized void externalStaticFileLocation(String externalFolder) {
     public synchronized void webSocket(String path, Class<?> handler) {
         requireNonNull(path, "WebSocket path cannot be null");
         requireNonNull(handler, "WebSocket handler class cannot be null");
+
         if (initialized) {
             throwBeforeRouteMappingException();
         }
+
         if (ServletFlag.isRunningFromServlet()) {
             throw new IllegalStateException("WebSockets are only supported in the embedded server");
         }
+
         if (webSocketHandlers == null) {
             webSocketHandlers = new HashMap<>();
         }
+
         webSocketHandlers.put(path, handler);
     }
 
@@ -310,7 +317,7 @@ private boolean hasMultipleHandlers() {
     public synchronized void stop() {
         if (server != null) {
             routeMatcher.clearRoutes();
-            server.stop();
+            server.extinguish();
             latch = new CountDownLatch(1);
         }
         StaticFiles.clear();
@@ -332,19 +339,21 @@ public void addFilter(String httpMethod, FilterImpl filter) {
     public synchronized void init() {
         if (!initialized) {
             routeMatcher = RouteMatcherFactory.get();
+
             if (!ServletFlag.isRunningFromServlet()) {
                 new Thread(() -> {
-                    server = SparkServerFactory.create(hasMultipleHandlers());
+
+                    server = EmbeddedServers.create(embeddedServerIdentifier, hasMultipleHandlers());
+                    server.configureWebSockets(webSocketHandlers, webSocketIdleTimeoutMillis);
+
                     server.ignite(
                             ipAddress,
                             port,
                             sslStores,
                             latch,
                             maxThreads,
                             minThreads,
-                            threadIdleTimeoutMillis,
-                            webSocketHandlers,
-                            webSocketIdleTimeoutMillis);
+                            threadIdleTimeoutMillis);
                 }).start();
             }
             initialized = true;

src/main/java/spark/resource/ClassPathResourceHandler.java

@@ -52,6 +52,7 @@ public ClassPathResourceHandler(String baseResource) {
      */
     public ClassPathResourceHandler(String baseResource, String welcomeFile) {
         Assert.notNull(baseResource);
+
         this.baseResource = baseResource;
         this.welcomeFile = welcomeFile;
     }

src/main/java/spark/resource/ExternalResourceHandler.java

@@ -19,7 +19,6 @@
 
 import java.net.MalformedURLException;
 
-import org.eclipse.jetty.util.URIUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -63,7 +62,7 @@ protected AbstractFileResolvingResource getResource(String path) throws Malforme
         }
 
         try {
-            path = URIUtil.canonicalPath(path);
+            path = UriPath.canonical(path);
 
             final String addedPath = addPaths(baseResource, path);