Skip to content

Commit d518908

Browse files
committed
formate code + remove todos
1 parent 6a2c543 commit d518908

8 files changed

Lines changed: 7 additions & 58 deletions

File tree

src/main/java/ClientHandler/Client.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/main/java/Consensus/Consensus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import Constants.ChatServerConstants.ServerConstants;
44
import Constants.ChatServerConstants.ServerExceptionConstants;
55
import Exception.ServerException;
6-
import Utilities.Messaging;
76
import Server.Server;
87
import Server.ServerState;
8+
import Utilities.Messaging;
99
import org.apache.logging.log4j.LogManager;
1010
import org.apache.logging.log4j.Logger;
1111
import org.json.simple.JSONObject;

src/main/java/Consensus/LeaderElection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package Consensus;
22

33
import Constants.ChatServerConstants.ServerConstants;
4-
import Utilities.Messaging;
54
import Server.Server;
65
import Server.ServerState;
6+
import Utilities.Messaging;
77
import org.apache.logging.log4j.LogManager;
88
import org.apache.logging.log4j.Logger;
99
import org.json.simple.JSONObject;

src/main/java/Exception/ServerException.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ public ServerException(String message, String code) {
88
this.code = code;
99
}
1010

11-
public ServerException(String message, Throwable throwable) {
12-
super(message, throwable);
13-
}
14-
1511
public String getCode() {
1612
return code;
1713
}

src/main/java/Gossiping/FailureDetector.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public void run() {
3737
ServerState.getServerState().setSmallPartitionFormed(true);
3838
ServerState.getServerState().purgeServerState();
3939
} else {
40-
// TODO: Larger partition needs to remove identities.
4140
// Start election()
4241
ConcurrentLinkedQueue<String> failedServersId = ServerState.getServerState().getFailedServers();
4342
if (failedServersId.size() != 0) {

src/main/java/Gossiping/Gossiping.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package Gossiping;
22

33
import Constants.ChatServerConstants.ServerConstants;
4-
import Utilities.Messaging;
54
import Server.Server;
65
import Server.ServerState;
6+
import Utilities.Messaging;
77
import Utilities.Util;
88
import org.apache.logging.log4j.LogManager;
99
import org.apache.logging.log4j.Logger;

src/main/java/Gossiping/HeartBeatSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package Gossiping;
22

33
import Constants.ChatServerConstants.ServerConstants;
4-
import Utilities.Messaging;
54
import Server.Server;
65
import Server.ServerState;
6+
import Utilities.Messaging;
77
import org.json.simple.JSONObject;
88

99
import java.util.Collection;

src/main/java/Server/ServerState.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ public class ServerState {
1919
private final ConcurrentHashMap<Long, ClientHandler> clientHandlerHashMap = new ConcurrentHashMap<>();
2020
private final ConcurrentHashMap<String, Room> roomsHashMap = new ConcurrentHashMap<>();
2121
private final ConcurrentHashMap<String, Server> serversHashmap = new ConcurrentHashMap<>(); // has all the Servers; dead and alive; except this
22-
// TODO: Change identityList into a HashMap to keep the serverIds.
23-
// unique client identifies
24-
private final ConcurrentHashMap<String, String> identityHashMap = new ConcurrentHashMap<>();
22+
private final ConcurrentHashMap<String, String> identityHashMap = new ConcurrentHashMap<>(); // unique client identifies
2523
private final ConcurrentHashMap<String, Long> heartBeatMap = new ConcurrentHashMap<>(); //store heartbeats of servers
2624
private final ConcurrentLinkedQueue<String> failedServers = new ConcurrentLinkedQueue<>(); // store failed servers
2725
private boolean smallPartitionFormed = false;
@@ -90,7 +88,7 @@ public Server getServerFromId(String serverId) {
9088
}
9189
}
9290
if (serverId.equals(this.serverId)) {
93-
return new Server(this.serverId, this.serverAddress, this.coordinationPort, this.clientsPort); //todo check coordination port or clients port
91+
return new Server(this.serverId, this.serverAddress, this.coordinationPort, this.clientsPort);
9492
}
9593
return null;
9694
}
@@ -250,7 +248,6 @@ public boolean amITheLeader() {
250248
public HashMap<String, String> getCurrentServerState() throws IOException {
251249
HashMap<String, String> serverState = new HashMap<>();
252250

253-
// TODO: change the code to reflect the datatype change in identityList.
254251
// Serialize identity list.
255252
serverState.put("IdentityMap", serialize(identityHashMap));
256253

@@ -364,9 +361,6 @@ private void removeRoomsExceptMainHall() {
364361
*/
365362
private void disconnectClients() throws IOException {
366363

367-
//TODO:
368-
//Closing the socket here might throw an SocketException in either ClientHandler or main.
369-
//Need to handle that scenario after testing.
370364
for (ClientHandler clientHandler : clientHandlerHashMap.values()) {
371365
clientHandler.forceQuitClient();
372366
}
@@ -424,7 +418,7 @@ public void removeIdentity(String identity) {
424418
public Collection<String> getIdentityByServer(String sId) {
425419
Collection<String> identities = new ArrayList<>();
426420
for (Map.Entry<String, String> entry : identityHashMap.entrySet()) {
427-
if(sId.equals(entry.getValue())){
421+
if (sId.equals(entry.getValue())) {
428422
identities.add(entry.getKey());
429423
}
430424
}

0 commit comments

Comments
 (0)