přepsani switch na map

src/jnet/server/ServerMessageParser.java

@@ -6,7 +6,9 @@ import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import java.lang.management.ManagementFactory;
 import java.net.InetSocketAddress;
+import java.util.HashMap;
 import java.util.ListIterator;
+import java.util.function.Consumer;
 import jnet.lib.LogFile;
 import jnet.lib.Message;
 import jnet.lib.PasswordHashing;
@@ -25,19 +27,43 @@ public class ServerMessageParser {
     private static final ChannelGroup channels = new DefaultChannelGroup(
             "containers", GlobalEventExecutor.INSTANCE);
 
+    private static final java.util.Map<Integer, Consumer<Message>> handlers = new HashMap<>();
+
     public ServerMessageParser(Channel currentClient) {
         this.currentClient = currentClient;
+
+        // Inicializace mapy typu zprávy na odpovídající metody
+        handlers.put(Message.CLIENT_VERSION, this::handleClientVersion);
+        handlers.put(Message.AUTH, this::handleAuth);
+        handlers.put(Message.RESTART, this::handleRestart);
+        handlers.put(Message.UPTIME, this::handleUptime);
+        handlers.put(Message.NEW_OBJECT_TYPE, this::handleNewObjectType);
+        handlers.put(Message.SET_MAP_LOCK, this::handleSetMapLock);
+        handlers.put(Message.ADD_OBJECT, this::handleAddObject);
+        handlers.put(Message.REMOVE_OBJECT, this::handleRemoveObject);
+        handlers.put(Message.MAP_REMOVE, this::handleMapRemove);
+        handlers.put(Message.MAP_ADD, this::handleMapAdd);
+        handlers.put(Message.OBJECT_MOVE, this::handleObjectMove);
+        handlers.put(Message.UPDATE_OBJECT, this::handleUpdateObject);
+        handlers.put(Message.DELETE_LOG, this::handleDeleteLog);
+        handlers.put(Message.USER, this::handleUser);
+        handlers.put(Message.USER_EDIT, this::handleUserEdit);
+        handlers.put(Message.SERVER_CONFIG, this::handleServerConfig);
+        handlers.put(Message.SNMP_OBJECT_INFO, this::handleSnmpObjectInfo);
     }
 
     public void parse(Message msg) {
-
         LogFile.printDebug("-> Message type: " + msg.getType());
 
-        ListIterator<Map> iteratorMap = Server.maps.listIterator();
+        Consumer<Message> handler = handlers.get(msg.getType());
+        if (handler != null) {
+            handler.accept(msg);
+        } else {
+            LogFile.printErr("Neznamy typ zpravy");
+        }
+    }
     
-        switch (msg.getType()) {
+    private void handleClientVersion(Message msg) {
-
-            case Message.CLIENT_VERSION:
         int client_version = (int) msg.getMsg();
         if (client_version < Server.MINIMAL_CLIENT_VERSION) {
             LogFile.printInfo("Outdated client. Sent update request (" + ((InetSocketAddress) currentClient.remoteAddress()).getHostName() + ")");
@@ -47,9 +73,9 @@ public class ServerMessageParser {
             // oodeslat pozadavek na autorizacni udaje
             send(new Message(Message.AUTH_REQUEST, null));
         }
-                break;
+    }
 
-            case Message.AUTH:
+    private void handleAuth(Message msg) {
         String[] userData = (String[]) msg.getMsg();
         String username = userData[0];
         String password = userData[1];
@@ -107,30 +133,29 @@ public class ServerMessageParser {
         } else {
             LogFile.printInfo("Authorization failed (ser: " + username + " )");
         }
-                break;
+    }
 
-            case Message.RESTART:
+    private void handleRestart(Message msg) {
         LogFile.printInfo("Prijat pozadavek na restart serveru");
         Server.restartServer();
-                break;
+    }
 
-            case Message.UPTIME:
+    private void handleUptime(Message msg) {
         long uptime = ManagementFactory.getRuntimeMXBean().getUptime();
         send(Message.UPTIME, uptime);
-                break;
+    }
 
-            case Message.NEW_OBJECT_TYPE:
+    private void handleNewObjectType(Message msg) {
         ObjectType not = (ObjectType) msg.getMsg();
         int id = Database.addObjectType(not);
         not.setId(id);
         Server.objectType.add(not);
         sendAll(new Message(Message.OBJECT_TYPE, not));
-                break;
+    }
 
-            case Message.SET_MAP_LOCK:
+    private void handleSetMapLock(Message msg) {
         int[] data_lock = (int[]) msg.getMsg();
-                while (iteratorMap.hasNext()) {
+        for (Map map : Server.maps) {
-                    Map map = iteratorMap.next();
             if (map.getId() == data_lock[0]) {
                 map.setLock((data_lock[1] == 1));
                 break;
@@ -140,9 +165,9 @@ public class ServerMessageParser {
         Database.mapLock(data_lock[1], data_lock[0]);
         // odeslani informace ostatnim 
         sendAll(new Message(Message.SET_MAP_LOCK, data_lock));
-                break;
+    }
 
-            case Message.ADD_OBJECT:
+    private void handleAddObject(Message msg) {
         MapObject mo = Database.addMapObject((MapObject) msg.getMsg());
         // pridat do seznamu
         for (Map map : Server.maps) {
@@ -160,9 +185,9 @@ public class ServerMessageParser {
             Event event_disable = Database.addEvent(mo.getId(), "Ping vypnut", Event.TYPE_PING_OFF);
             sendAll(new Message(Message.EVENT_NEW, event_disable));
         }
-                break;
+    }
 
-            case Message.REMOVE_OBJECT:
+    private void handleRemoveObject(Message msg) {
         for (Map map : Server.maps) {
             for (MapObject object : map.getObjects()) {
                 if (object.getId() == (int) msg.getMsg()) {
@@ -176,34 +201,33 @@ public class ServerMessageParser {
                 }
             }
         }
-                break;
+    }
 
-            case Message.MAP_REMOVE:
+    private void handleMapRemove(Message msg) {
-                while (iteratorMap.hasNext()) {
+        for (Map map : Server.maps) {
-                    Map map = iteratorMap.next();
             if (map.getId() == (int) msg.getMsg()) {
                 // odebere z databaze
                 Database.removeMap(map.getId());
                 // odesle informaci o odebrani objektu klientum
                 sendAll(new Message(Message.MAP_REMOVE, map.getId()));
                 // odebere ze seznamu
-                        iteratorMap.remove();
+                Server.maps.remove(map);
                 break;
             }
         }
-                break;
+    }
 
-            case Message.MAP_ADD:
+    private void handleMapAdd(Message msg) {
         Map map = new Map((String) msg.getMsg());
         // přidání mapy do databaze
         map.setId(Database.addMap(map.getName()));
         //odeslání mapy klientum
         send(new Message(Message.MAP, map));
         // pridani mapy do seznamu
-                iteratorMap.add(map);
+        Server.maps.add(map);
-                break;
+    }
 
-            case Message.OBJECT_MOVE:
+    private void handleObjectMove(Message msg) {
         int[] data = (int[]) msg.getMsg();
         // 0 = obj id
         // 2 = x
@@ -225,8 +249,9 @@ public class ServerMessageParser {
                 }
             }
         }
-                break;
+    }
-            case Message.UPDATE_OBJECT:
+
+    private void handleUpdateObject(Message msg) {
         MapObject mo_u = (MapObject) msg.getMsg();
         // zmenit v databazi
         Database.updateObject(mo_u);
@@ -254,9 +279,9 @@ public class ServerMessageParser {
 
         // preposlat zmenu klientum 
         sendAll(new Message(Message.UPDATE_OBJECT, mo_u));
-                break;
+    }
 
-            case Message.DELETE_LOG:
+    private void handleDeleteLog(Message msg) {
         int objId = (int) msg.getMsg();
         // vymaže logy v databazi
         Database.deleteObjectLog(objId);
@@ -269,9 +294,9 @@ public class ServerMessageParser {
             }
         }
         sendAll(new Message(Message.DELETE_LOG, objId));
-                break;
+    }
 
-            case Message.USER:
+    private void handleUser(Message msg) {
         User user = (User) msg.getMsg();
         user.setPassword(PasswordHashing.hash(user.getPassword()));
         //pridáni do databáze a nastaveni id
@@ -280,9 +305,9 @@ public class ServerMessageParser {
         Server.users.add(user);
         // odeslat klientum nového uživatele
         send(new Message(Message.USER, user));
-                break;
+    }
 
-            case Message.USER_EDIT:
+    private void handleUserEdit(Message msg) {
         User ue = (User) msg.getMsg();
         // upraveni v databázi
         Database.editUser(ue);
@@ -298,9 +323,9 @@ public class ServerMessageParser {
         }
         // preposlat zmenu klientum 
         sendAll(new Message(Message.USER_EDIT, ue));
-                break;
+    }
 
-            case Message.SERVER_CONFIG:
+    private void handleServerConfig(Message msg) {
         ServerConfig sc = (ServerConfig) msg.getMsg();
         // ulozeni
         Server.config.setInt("ping_repeat", sc.getPingRepeat());
@@ -311,14 +336,21 @@ public class ServerMessageParser {
         Server.config.save();
         //odeslani vsem
         sendAll(Message.SERVER_CONFIG, sc);
-                break;
-
-            default:
-                LogFile.printErr("Neznamy typ zpravy");
     }
     
+    private void handleSnmpObjectInfo(Message msg) {
+        Object[] msg_object = (Object[]) msg.getMsg();
+        String frameName = (String) msg_object[0];
+        int objId = (int) msg_object[1];
+        
     }
 
+    /**
+     * 
+     * 
+     * @param message 
+     */
+
     public void send(Message message) {
         currentClient.writeAndFlush(message);
         LogFile.printDebug("<- Message type: " + message.getType());