Refactor DaemonCommand

[signal-cli] / src / main / java / org / asamk / signal / http / HttpServerHandler.java

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index 6f8b182686f897123927e7dd99f44065d61d3ca9..c9c8fa16bfe604d9cc19af567383dcc968eac4a6 100644 (file)
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -56,7 +56,7 @@ public class HttpServerHandler implements AutoCloseable {
         if (server != null) {
             throw new AssertionError("HttpServerHandler already initialized");
         }
         if (server != null) {
             throw new AssertionError("HttpServerHandler already initialized");
         }

-        logger.info("Starting server on " + address.toString());
+        logger.debug("Starting HTTP server on {}", address);

 
         server = HttpServer.create(address, 0);
         server.setExecutor(Executors.newCachedThreadPool());
 
         server = HttpServer.create(address, 0);
         server.setExecutor(Executors.newCachedThreadPool());


@@ -66,6 +66,21 @@ public class HttpServerHandler implements AutoCloseable {
         server.createContext("/api/v1/check", this::handleCheckEndpoint);
 
         server.start();
         server.createContext("/api/v1/check", this::handleCheckEndpoint);
 
         server.start();

+        logger.info("Started HTTP server on {}", address);
+    }
+
+    @Override
+    public void close() {
+        if (server != null) {
+            shutdown.set(true);
+            synchronized (this) {
+                this.notifyAll();
+            }
+            // Increase this delay when https://bugs.openjdk.org/browse/JDK-8304065 is fixed
+            server.stop(2);
+            server = null;
+            shutdown.set(false);
+        }

     }
 
     private void sendResponse(int status, Object response, HttpExchange httpExchange) throws IOException {
     }
 
     private void sendResponse(int status, Object response, HttpExchange httpExchange) throws IOException {


@@ -221,7 +236,7 @@ public class HttpServerHandler implements AutoCloseable {
                 return List.of(manager);
             }
         }
                 return List.of(manager);
             }
         }

-        return List.of();
+        throw new AssertionError("Unreachable state");

     }
 
     private List<Pair<Manager, Manager.ReceiveMessageHandler>> subscribeReceiveHandlers(
     }
 
     private List<Pair<Manager, Manager.ReceiveMessageHandler>> subscribeReceiveHandlers(


@@ -246,20 +261,6 @@ public class HttpServerHandler implements AutoCloseable {
         m.removeReceiveHandler(handler);
     }
 
         m.removeReceiveHandler(handler);
     }
 

-    @Override
-    public void close() {
-        if (server != null) {
-            shutdown.set(true);
-            synchronized (this) {
-                this.notifyAll();
-            }
-            // Increase this delay when https://bugs.openjdk.org/browse/JDK-8304065 is fixed
-            server.stop(2);
-            server = null;
-            shutdown.set(false);
-        }
-    }
-

     private interface Callable {
 
         void call();
     private interface Callable {
 
         void call();