Merge pull request #48 from ThaminduR/addClientFns

Minor Fixes

Author: ThaminduR

src/main/java/Constants/ChatServerConstants.java

@@ -49,7 +49,7 @@ public static class ServerConstants {
 
         public static final String KIND_HEARTBEAT = "heartbeat";
         public static final String TIMESTAMP = "timestamp";
-        public static final String KIND_LEADER_STATE = "leaderstate";
+        public static final String LEADER_STATE_MERGE = "leaderstatemerge";
     }
 
     /**

src/main/java/Gossiping/Gossiping.java

@@ -32,9 +32,10 @@ public static synchronized void receiveHeartBeat(JSONObject request) throws IOEx
                 }
             } else {
                 logger.debug("Discovered server through Gossiping. Server id: " + serverId);
-                if (ServerState.getServerState().amITheLeader() && failedServerMapContains(serverId)) {
+                if (ServerState.getServerState().amITheLeader()) {
+                    logger.debug("Sending ServerState since I'm the Leader.");
                     HashMap<String, String> serializedServerState = ServerState.getServerState().getCurrentServerState();
-                    serializedServerState.put(ServerConstants.TYPE, ServerConstants.KIND_LEADER_STATE);
+                    serializedServerState.put(ServerConstants.TYPE, ServerConstants.LEADER_STATE_MERGE);
                     Collection<Server> serverAsACollection = new ArrayList<>();
                     serverAsACollection.add(ServerState.getServerState().getServerFromId(serverId));
                     Messaging.sendAndForget(new JSONObject(serializedServerState), serverAsACollection);

src/main/java/Server/ServerHandler.java

@@ -6,7 +6,6 @@
 import Constants.ChatServerConstants.ServerConstants;
 import Constants.ChatServerConstants.ServerExceptionConstants;
 import Exception.ServerException;
-import Gossiping.FailureDetector;
 import Gossiping.Gossiping;
 import Messaging.Messaging;
 import org.apache.logging.log4j.LogManager;
@@ -95,9 +94,6 @@ private void resolveServerRequest(JSONObject jsonPayload) throws IOException, Pa
                     case ServerConstants.KIND_HEARTBEAT:
                         Gossiping.receiveHeartBeat(jsonPayload);
                         break;
-                    case ServerConstants.KIND_LEADER_STATE:
-                        ServerState.getServerState().restoreServerState(jsonPayload);
-                        break;
                 }
                 break;
             case ServerConstants.TYPE_BULLY:
@@ -106,15 +102,25 @@ private void resolveServerRequest(JSONObject jsonPayload) throws IOException, Pa
                         // This server received an ELECTION message
                         logger.trace("Received bully to: " + ServerState.getServerState().getServerId() + " by: " + jsonPayload.get(ServerConstants.SERVER_ID));
                         LeaderElection.replyOKorPass(jsonPayload, serverSocket);
+                        break;
+
                     case ServerConstants.KIND_ELECTED:
                         // This server received elected message
                         // TODO
                         logger.trace("Received ELECTED to: " + ServerState.getServerState().getServerId() + " by: " + jsonPayload.get(ServerConstants.SERVER_ID));
                         LeaderElection.respondToElectedMessage();
+                        break;
+
                     case ServerConstants.KIND_COORDINATOR:
                         logger.debug("Received COORDINATOR to: " + ServerState.getServerState().getServerId() + " by: " + jsonPayload.get(ServerConstants.SERVER_ID));
                         LeaderElection.receiveCoordinator(jsonPayload);
+                        break;
                 }
+                break;
+            case ServerConstants.LEADER_STATE_MERGE:
+                logger.info("State Received from the leader.");
+                ServerState.getServerState().restoreServerState(jsonPayload);
+                break;
         }
     }
 

src/main/java/Server/ServerState.java

@@ -245,7 +245,10 @@ public void setSmallPartitionFormed(boolean smallPartitionFormed) {
     }
 
     public boolean amITheLeader() {
-        return serverId.equals(currentLeader.getId());
+        if(currentLeader!=null) {
+            return serverId.equals(currentLeader.getId());
+        }
+        return false;
     }
 
     /**
@@ -280,6 +283,7 @@ public HashMap<String, String> getCurrentServerState() throws IOException {
      */
     public void restoreServerState(JSONObject jsonObject) throws IOException, ClassNotFoundException {
 
+        logger.info("Restoring ServerState using data sent by the leader.");
         String identityString = (String) jsonObject.get("IdentityList");
         String roomString = (String) jsonObject.get("RoomList");
 
@@ -288,9 +292,11 @@ public void restoreServerState(JSONObject jsonObject) throws IOException, ClassN
             identityList.addAll(tempIdList);
         }
 
-        ConcurrentHashMap<String, Room> tempRoomList = (ConcurrentHashMap<String, Room>) deserialize(roomString);
+        ArrayList<Room> tempRoomList = (ArrayList<Room>) deserialize(roomString);
         if (roomsHashMap.isEmpty()) {
-            roomsHashMap.putAll(tempRoomList);
+            for (Room room : tempRoomList){
+                roomsHashMap.put(room.getRoomId(), room);
+            }
         }
 
         setSmallPartitionFormed(false);