Refactor getManagerFromQuery method

[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 4d13e22c30fd70d4b95dee14e13b8ae75e34e60e..b888464e1bd624267c372e70d42164ec12b34509 100644 (file)
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -201,22 +201,22 @@ public class HttpServerHandler {
     }
 
     private List<Manager> getManagerFromQuery(final Map<String, String> query) {
     }
 
     private List<Manager> getManagerFromQuery(final Map<String, String> query) {

-        List<Manager> managers;

         if (m != null) {
         if (m != null) {

-            managers = List.of(m);
-        } else {
+            return List.of(m);
+        }
+        if (c != null) {

             final var account = query.get("account");
             if (account == null || account.isEmpty()) {
             final var account = query.get("account");
             if (account == null || account.isEmpty()) {

-                managers = c.getManagers();
+                return c.getManagers();

             } else {
                 final var manager = c.getManager(account);
                 if (manager == null) {
                     return null;
                 }
             } else {
                 final var manager = c.getManager(account);
                 if (manager == null) {
                     return null;
                 }

-                managers = List.of(manager);
+                return List.of(manager);

             }
         }
             }
         }

-        return managers;
+        return List.of();

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