Merge branch 'http-handler/encapsulation' into http-handler/encapsulation-patch

Author: Katsute

src/main/java/com/kttdevelopment/simplehttpserver/HttpSession.java

@@ -16,26 +16,11 @@ public abstract class HttpSession {
     /**
      * Creates an empty {@link HttpSession}. Applications don't use this method.
      *
-     * @see HttpSessionImpl#createHttpSession()
      * @since 02.00.00
      * @author Ktt Development
      */
     HttpSession(){ }
 
-//
-
-    /**
-     * Creates a {@link HttpSession}.
-     *
-     * @return a {@link HttpSession}
-     *
-     * @since 02.00.00
-     * @author Ktt Development
-     */
-    synchronized static HttpSession create(){
-        return HttpSessionImpl.createHttpSession();
-    }
-
 //
 
     /**

src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpHandler.java

@@ -13,7 +13,22 @@
  * @version 03.03.00
  * @author Ktt Development
  */
-public interface SimpleHttpHandler {
+
+public interface SimpleHttpHandler extends HttpHandler {
+
+    /**
+     * Encapsulates the {@link #handle(SimpleHttpExchange)} for the authenticator. This method is reserved by the server; <b>do not override this</b>, it will break the {@link #handle(SimpleHttpExchange)} method.
+     *
+     * @param exchange client information
+     * @throws IOException internal failure
+     *
+     * @since 02.00.00
+     * @author Ktt Development
+     */
+    @Override
+    default void handle(final HttpExchange exchange) throws IOException{
+        handle(SimpleHttpExchange.create(exchange));
+    }
 
     /**
      * Handlers the given request and generates a response <b>if no exceptions occur</b>.

src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpServer.java

@@ -229,7 +229,6 @@ public static SimpleHttpServer create(final int port, final int backlog) throws
      *
      * @see HttpContext
      * @see #createContext(String, HttpHandler)
-     * @see #createContext(String, SimpleHttpHandler)
      * @see #removeContext(String)
      * @see #removeContext(HttpContext)
      * @since 02.00.00
@@ -249,34 +248,13 @@ public static SimpleHttpServer create(final int port, final int backlog) throws
      * @see HttpContext
      * @see HttpHandler
      * @see #createContext(String)
-     * @see #createContext(String, SimpleHttpHandler)
      * @see #removeContext(String)
      * @see #removeContext(HttpContext)
      * @since 02.00.00
      * @author Ktt Development
      */
     public abstract HttpContext createContext(final String context, final HttpHandler handler);
 
-    /**
-     * Creates a context mapped to a specific {@link HttpHandler}.
-     *
-     * @param context the context
-     * @param handler the handler
-     * @return the http context associated with the context
-     * @throws IllegalArgumentException if the context is invalid or taken
-     * @throws NullPointerException if the context is null
-     *
-     * @see HttpContext
-     * @see SimpleHttpHandler
-     * @see #createContext(String)
-     * @see #createContext(String, HttpHandler)
-     * @see #removeContext(String)
-     * @see #removeContext(HttpContext)
-     * @since 03.03.00
-     * @author Ktt Development
-     */
-    public abstract HttpContext createContext(final String context, final SimpleHttpHandler handler);
-
     //
 
     /**
@@ -291,7 +269,6 @@ public static SimpleHttpServer create(final int port, final int backlog) throws
      * @see HttpContext
      * @see Authenticator
      * @see #createContext(String, HttpHandler, Authenticator)
-     * @see #createContext(String, SimpleHttpHandler, Authenticator)
      * @see #removeContext(String)
      * @see #removeContext(HttpContext)
      * @since 03.03.00
@@ -313,36 +290,13 @@ public static SimpleHttpServer create(final int port, final int backlog) throws
      * @see HttpHandler
      * @see Authenticator
      * @see #createContext(String, Authenticator)
-     * @see #createContext(String, SimpleHttpHandler, Authenticator)
      * @see #removeContext(String)
      * @see #removeContext(HttpContext)
      * @since 03.03.00
      * @author Ktt Development
      */
     public abstract HttpContext createContext(final String context, final HttpHandler handler, final Authenticator authenticator);
 
-    /**
-     * Creates a context mapped to a specific {@link HttpContext} with an {@link Authenticator}.
-     *
-     * @param context the context
-     * @param handler the handler
-     * @param authenticator authenticator
-     * @return the http context associated with the context
-     * @throws IllegalArgumentException if the context is invalid or taken
-     * @throws NullPointerException if the context is null
-     *
-     * @see HttpContext
-     * @see SimpleHttpHandler
-     * @see Authenticator
-     * @see #createContext(String, Authenticator)
-     * @see #createContext(String, HttpHandler, Authenticator)
-     * @see #removeContext(String)
-     * @see #removeContext(HttpContext)
-     * @since 03.03.00
-     * @author Ktt Development
-     */
-    public abstract HttpContext createContext(final String context, final SimpleHttpHandler handler, final Authenticator authenticator);
-
 //
 
     /**

src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpServerImpl.java

@@ -143,22 +143,6 @@ public synchronized final HttpContext createContext(final String path, final Htt
                 return context;
             }
 
-            @Override
-            public synchronized final HttpContext createContext(final String path, final SimpleHttpHandler handler){
-                if(!getContext(path).equals("/") && handler instanceof RootHandler)
-                    throw new IllegalArgumentException("RootHandler can only be used at the root '/' context");
-
-                final HttpHandler wrapper = exchange -> {
-                    handle(exchange);
-                    handler.handle(SimpleHttpExchange.create(exchange));
-                };
-                final HttpContext context = server.createContext(getContext(path),wrapper);
-
-                contexts.put(context,context.getHandler());
-
-                return context;
-            }
-
             //
 
             @Override
@@ -175,14 +159,6 @@ public synchronized final HttpContext createContext(final String path, final Htt
                 return context;
             }
 
-            @Override
-            public synchronized final HttpContext createContext(final String path, final SimpleHttpHandler handler, final Authenticator authenticator){
-                final HttpContext context = createContext(path,handler);
-                context.setAuthenticator(authenticator);
-                return context;
-            }
-
-
             //
 
             private String generateRandomContext(){