Merge branch 'http-handler/temporary-handler' of https://github.com/Ktt-Development/simplehttpserver into http-handler/temporary-handler

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/HttpSessionHandler.java

@@ -56,14 +56,14 @@ public synchronized String assignSessionID(final HttpExchange exchange){
     }
 
     /**
-     * Assigns a session to the client. Session will only be saved client side if the exchange headers are sent using {@link HttpExchange#sendResponseHeaders(int, long)}.
+     * Returns the session of the client or assigns one if it does not yet have one Session will only be saved client side if the exchange headers are sent using {@link HttpExchange#sendResponseHeaders(int, long)}.
      *
      * @param exchange http exchange
      *
      * @since 03.03.00
      * @author Ktt Development
      */
-    public synchronized final void assignSession(final HttpExchange exchange){
+    public final HttpSession getSession(final HttpExchange exchange){
         final String sessionId;
         final HttpSession session;
 
@@ -136,7 +136,10 @@ public final String toString(){
                     .setHttpOnly(true)
                     .build();
             exchange.getResponseHeaders().add("Set-Cookie",out.toCookieHeaderString());
+        }else{
+            session = sessions.get(sessionId);
         }
+        return session;
     }
 
 }

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

@@ -346,19 +346,6 @@ static SimpleHttpExchange create(final HttpExchange exchange){
      */
     public abstract void setCookie(final SimpleHttpCookie cookie);
 
-//
-
-    /**
-     * Returns the http session of the exchange if one exists; if one does not exist it will create one. <b>A new session will only persist if the exchange is sent.</b>
-     *
-     * @return http session
-     *
-     * @see HttpSession
-     * @since 02.00.00
-     * @author Ktt Development
-     */
-    public abstract HttpSession getHttpSession();
-
 //
 
     /**

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

@@ -317,32 +317,11 @@ public synchronized final void setCookie(final String key, final String value){
             @Override
             public synchronized final void setCookie(final SimpleHttpCookie cookie){
                 final String cstring = cookie.toCookieHeaderString();
-                if(cstring.startsWith("__session-id="))
-                    throw new IllegalArgumentException("The cookie '__session-id' can not be set because it is reserved by the server");
                 getResponseHeaders().add("Set-Cookie",cstring);
             }
 
         //
-
-            @Override
-            public synchronized final HttpSession getHttpSession(){
-                final String sessionId;
-                final HttpSession session;
-
-                if((sessionId = cookies.get("__session-id")) == null || !HttpSession.sessions.containsKey(sessionId)){
-                    session = HttpSession.create();
-                    final SimpleHttpCookie cookie =
-                        new SimpleHttpCookie.Builder("__session-id",session.getSessionID())
-                            .setPath("/")
-                            .setHttpOnly(true)
-                            .build();
-                    getResponseHeaders().add("Set-Cookie",cookie.toCookieHeaderString()); // bypass implementation
-                }else{
-                    session = HttpSession.sessions.get(sessionId);
-                }
-                return session;
-            }
-
+            
             @Override
             public final OutputStream getOutputStream(){
                 return outputStream;

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

@@ -14,26 +14,23 @@
  * @version 03.03.00
  * @author Ktt Development
  */
-public interface SimpleHttpHandler {
-/*
+
+public interface SimpleHttpHandler extends HttpHandler {
+
     /**
-     * Encapsulates the {@link #handle(SimpleHttpExchange)} for the authenticator. Applications do not use this.
+     * 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 final void handle(final HttpExchange exchange) throws IOException{
-        final SimpleHttpExchange sxe = SimpleHttpExchange.create(exchange);
-        if(authenticate(sxe))
-            handle(sxe);
-        else
-            sxe.close();
+    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

@@ -215,6 +215,8 @@ public static SimpleHttpServer create(final int port, final int backlog) throws
 
     public abstract HttpSessionHandler getHttpSessionHandler();
 
+    public abstract HttpSession getHttpSession(final HttpExchange exchange);
+
 //
 
     /**
@@ -227,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
@@ -247,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);
-
     //
 
     /**
@@ -289,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
@@ -311,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

@@ -50,7 +50,7 @@ static SimpleHttpServer createSimpleHttpServer(final Integer port, final Integer
 
             private void handle(final HttpExchange exchange){
                 if(sessionHandler != null)
-                    sessionHandler.assignSession(exchange);
+                    sessionHandler.getSession(exchange).updateLastAccessTime();
             }
 
         //
@@ -115,9 +115,12 @@ public final HttpSessionHandler getHttpSessionHandler(){
                 return sessionHandler;
             }
 
-            //
+            @Override
+            public HttpSession getHttpSession(final HttpExchange exchange){
+                return sessionHandler.getSession(exchange);
+            }
 
-        //
+            //
 
             @Override
             public synchronized final HttpContext createContext(final String path){
@@ -140,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
@@ -172,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(){