code optimizations

Author: Katsute

src/main/java/dev/katsute/simplehttpserver/ContextUtility.java

@@ -22,6 +22,8 @@
 
 abstract class ContextUtility {
 
+    private ContextUtility(){ }
+
     // replace consecutive slashes and back slashes with a single forward slash
     @SuppressWarnings("RegExpRedundantEscape")
     private static final Pattern forwardSlash = Pattern.compile("\\/{2,}|\\\\+");

src/main/java/dev/katsute/simplehttpserver/FileRecord.java

@@ -43,7 +43,7 @@ public final String getContentType(){
     }
 
     public final byte[] getBytes(){
-        return Arrays.copyOf(bytes, bytes.length);
+        return Arrays.copyOf(bytes, bytes.length); // dereference
     }
 
 }

src/main/java/dev/katsute/simplehttpserver/HttpSessionHandler.java

@@ -40,12 +40,12 @@ public HttpSessionHandler(final String cookie){
 
     public synchronized String assignSessionID(final HttpExchange exchange){
         String id;
-        do id = UUID.randomUUID().toString();
+        do id = UUID.randomUUID().toString(); // assign session ID
         while(sessions.containsKey(id));
         return id;
     }
 
-    private String getSetSession(final Headers headers){
+    private String getSetSession(final Headers headers){ // get session that will be set by cookie
         if(headers.containsKey("Set-Cookie"))
            for(final String value : headers.get("Set-Cookie"))
                if(value.startsWith(cookie + "="))
@@ -54,7 +54,7 @@ private String getSetSession(final Headers headers){
     }
 
     public final HttpSession getSession(final HttpExchange exchange){
-        final String sessionId;
+        final String sessionID;
         final HttpSession session;
 
         @SuppressWarnings("SpellCheckingInspection")
@@ -70,10 +70,10 @@ public final HttpSession getSession(final HttpExchange exchange){
         }
 
         final String setSession = getSetSession(exchange.getResponseHeaders());
-        sessionId = setSession != null ? setSession : cookies.get(cookie);
+        sessionID = setSession != null ? setSession : cookies.get(cookie); // use session that will be written or session from cookie
 
         synchronized(this){
-            if(!sessions.containsKey(sessionId)){
+            if(!sessions.containsKey(sessionID)){
                 session = new HttpSession() {
                     private final String sessionID;
                     private final long creationTime;
@@ -117,7 +117,7 @@ public synchronized final void update(){
                 exchange.getResponseHeaders().add("Set-Cookie", OUT.toString());
                 sessions.put(session.getSessionID(), session);
             }else{
-                session = sessions.get(sessionId);
+                session = sessions.get(sessionID);
             }
         }
         return session;

src/main/java/dev/katsute/simplehttpserver/SimpleHttpExchange.java

@@ -31,7 +31,7 @@ public abstract class SimpleHttpExchange extends HttpExchange {
     SimpleHttpExchange(){ }
 
     static SimpleHttpExchange create(final HttpExchange exchange){
-        return null;
+        return new SimpleHttpExchangeImpl(exchange);
     }
 
     //

src/main/java/dev/katsute/simplehttpserver/SimpleHttpServer.java

@@ -27,15 +27,15 @@ public abstract class SimpleHttpServer extends HttpServer implements HttpServerE
     SimpleHttpServer(){ }
 
     public static SimpleHttpServer create() throws IOException {
-        return SimpleHttpServerImpl.createHttpServer(null, null);
+        return new SimpleHttpServerImpl(null, null);
     }
 
     public static SimpleHttpServer create(final int port) throws IOException {
-        return SimpleHttpServerImpl.createHttpServer(port, null);
+        return new SimpleHttpServerImpl(port, null);
     }
 
     public static SimpleHttpServer create(final int port, final int backlog) throws IOException {
-        return SimpleHttpServerImpl.createHttpServer(port, backlog);
+        return new SimpleHttpServerImpl(port, backlog);
     }
 
     //

src/main/java/dev/katsute/simplehttpserver/SimpleHttpServerImpl.java

@@ -34,10 +34,6 @@ final class SimpleHttpServerImpl extends SimpleHttpServer {
 
     private final Map<HttpContext, HttpHandler> contexts = Collections.synchronizedMap(new HashMap<>());
 
-    static SimpleHttpServer createHttpServer(final Integer port, final Integer backlog) throws IOException{
-        return new SimpleHttpServerImpl(port, backlog);
-    }
-
     SimpleHttpServerImpl(final Integer port, final Integer backlog) throws IOException{
         if(port != null)
             server.bind(new InetSocketAddress(port), backlog != null ? backlog : 0);

src/main/java/dev/katsute/simplehttpserver/SimpleHttpsServer.java

@@ -27,17 +27,19 @@ public abstract class SimpleHttpsServer extends HttpsServer implements HttpServe
     SimpleHttpsServer(){ }
 
     public static SimpleHttpsServer create() throws IOException {
-        return SimpleHttpsServerImpl.createHttpsServer(null, null);
+        return new SimpleHttpsServerImpl(null, null);
     }
 
     public static SimpleHttpsServer create(final int port) throws IOException {
-        return SimpleHttpsServerImpl.createHttpsServer(port, null);
+        return new SimpleHttpsServerImpl(port, null);
     }
 
     public static SimpleHttpsServer create(final int port, final int backlog) throws IOException {
-        return SimpleHttpsServerImpl.createHttpsServer(port, backlog);
+        return new SimpleHttpsServerImpl(port, backlog);
     }
 
+    //
+
     public abstract HttpsServer getHttpsServer();
 
 }

src/main/java/dev/katsute/simplehttpserver/SimpleHttpsServerImpl.java

@@ -32,11 +32,7 @@ final class SimpleHttpsServerImpl extends SimpleHttpsServer {
 
     private HttpSessionHandler sessionHandler;
 
-    private final Map<HttpContext, HttpHandler> contexts = Collections.synchronizedMap(new HashMap<>());
-
-    static SimpleHttpsServer createHttpsServer(final Integer port, final Integer backlog) throws IOException{
-        return new SimpleHttpsServerImpl(port, backlog);
-    }
+    private final Map<HttpContext,HttpHandler> contexts = Collections.synchronizedMap(new HashMap<>());
 
     SimpleHttpsServerImpl(final Integer port, final Integer backlog) throws IOException{
         if(port != null)

src/main/java/dev/katsute/simplehttpserver/handler/RootHandler.java

@@ -22,13 +22,12 @@
 
 public class RootHandler extends PredicateHandler {
 
-    public RootHandler(final HttpHandler handlerIfTrue, final HttpHandler handlerIfFalse){
+    public RootHandler(final HttpHandler index, final HttpHandler other){
         super(
             exchange -> exchange.getRequestURI().getPath().equals("/"),
-            handlerIfTrue,
-            handlerIfFalse
+            index,
+            other
         );
     }
 
-
 }

src/main/java/dev/katsute/simplehttpserver/handler/SSEHandler.java

@@ -66,12 +66,12 @@ public final void handle(final SimpleHttpExchange exchange) throws IOException{
         }catch(final NumberFormatException | NullPointerException ignored){ }
 
         exchange.send(HttpURLConnection.HTTP_OK);
-        for(int index = latest; index < queue.size(); index++){
+        for(int index = latest; index < queue.size(); index++){ // write latest events
             exchange.getResponseBody().write(queue.get(index).toString(eventID.get()).getBytes(StandardCharsets.UTF_8));
             exchange.getResponseBody().flush();
         }
 
-        listeners.add(exchange.getResponseBody());
+        listeners.add(exchange.getResponseBody()); // track events
     }
 
     public synchronized final void push(final String data){
@@ -82,11 +82,13 @@ public synchronized final void push(final String data, final int retry, final St
         eventID.addAndGet(1);
         final EventStreamRecord record = new EventStreamRecord(retry, event, data);
         queue.add(record);
-        for(final OutputStream OUT : listeners){
+        for(final OutputStream OUT : listeners){ // push events to all clients
             try{
                 OUT.write(record.toString(eventID.get()).getBytes(StandardCharsets.UTF_8));
                 OUT.flush();
-            }catch(final IOException ignored){ }
+            }catch(final IOException ignored){ // internal error or closed
+                listeners.remove(OUT); // remove from tracking
+            }
         }
     }