refactor(server): little constraint cleanups

Author: xeruf

sdk/src/server-api/sc/networking/clients/LobbyClient.java

@@ -1,5 +1,7 @@
 package sc.networking.clients;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sc.api.plugins.IGameState;
@@ -50,16 +52,16 @@ private static INetworkInterface createTcpNetwork(String host, int port) throws
   }
 
   @Override
-  protected final void onObject(ProtocolMessage o) {
-    if (o == null) {
+  protected final void onObject(ProtocolMessage message) {
+    if (message == null) {
       logger.warn("Received null message.");
       return;
     }
 
-    invokeHandlers(o);
+    invokeHandlers(message);
 
-    if (o instanceof RoomPacket) {
-      RoomPacket packet = (RoomPacket) o;
+    if (message instanceof RoomPacket) {
+      RoomPacket packet = (RoomPacket) message;
       String roomId = packet.getRoomId();
       ProtocolMessage data = packet.getData();
       if (data instanceof MementoEvent) {
@@ -73,24 +75,24 @@ protected final void onObject(ProtocolMessage o) {
       } else {
         onRoomMessage(roomId, data);
       }
-    } else if (o instanceof GamePreparedResponse) {
-      onGamePrepared((GamePreparedResponse) o);
-    } else if (o instanceof JoinedRoomResponse) {
-      onGameJoined(((JoinedRoomResponse) o).getRoomId());
-    } else if (o instanceof RoomWasJoinedEvent) {
-      onGameJoined(((RoomWasJoinedEvent) o).getRoomId());
-    } else if (o instanceof LeftGameEvent) {
-      onGameLeft(((LeftGameEvent) o).getRoomId());
-    } else if (o instanceof ObservationResponse) {
-      onGameObserved(((ObservationResponse) o).getRoomId());
-    } else if (o instanceof TestModeResponse) {
-      boolean testMode = (((TestModeResponse) o).getTestMode());
+    } else if (message instanceof GamePreparedResponse) {
+      onGamePrepared((GamePreparedResponse) message);
+    } else if (message instanceof JoinedRoomResponse) {
+      onGameJoined(((JoinedRoomResponse) message).getRoomId());
+    } else if (message instanceof RoomWasJoinedEvent) {
+      onGameJoined(((RoomWasJoinedEvent) message).getRoomId());
+    } else if (message instanceof LeftGameEvent) {
+      onGameLeft(((LeftGameEvent) message).getRoomId());
+    } else if (message instanceof ObservationResponse) {
+      onGameObserved(((ObservationResponse) message).getRoomId());
+    } else if (message instanceof TestModeResponse) {
+      boolean testMode = (((TestModeResponse) message).getTestMode());
       logger.info("TestMode was set to {} ", testMode);
-    } else if (o instanceof ProtocolErrorMessage) {
-      ProtocolErrorMessage response = (ProtocolErrorMessage) o;
+    } else if (message instanceof ProtocolErrorMessage) {
+      ProtocolErrorMessage response = (ProtocolErrorMessage) message;
       onError(null, response);
     } else {
-      onCustomObject(o);
+      onCustomObject(message);
     }
   }
 
@@ -135,11 +137,8 @@ private void onGameObserved(String roomId) {
     }
   }
 
-  private void invokeHandlers(ProtocolMessage o) {
-    if (o == null) {
-      throw new IllegalArgumentException("o was null");
-    }
-    this.asyncManager.invokeHandlers(o);
+  private void invokeHandlers(@NotNull ProtocolMessage message) {
+    this.asyncManager.invokeHandlers(message);
   }
 
   protected void onGamePrepared(GamePreparedResponse response) {
@@ -195,7 +194,7 @@ protected void onRoomMessage(String roomId, ProtocolMessage data) {
     }
   }
 
-  protected void onError(String roomId, ProtocolErrorMessage error) {
+  protected void onError(@Nullable String roomId, @NotNull ProtocolErrorMessage error) {
     logger.warn("{} (room: {})", error.getLogMessage(), roomId);
     for (ILobbyClientListener listener : this.listeners) {
       listener.onError(roomId, error);

server/test/sc/server/roles/AbstractRoleTest.java

@@ -53,8 +53,7 @@ protected MockClient connectClient(boolean administrator) {
       }
       return client;
     } catch (IOException e) {
-      Assertions.fail("Could not connect to server");
-      return null;
+      return Assertions.fail("Could not connect to server");
     }
   }
 

server/test/sc/server/roles/AdministratorTest.java

@@ -41,8 +41,7 @@ public void shouldNotBecomeAdminWithWrongPassword() {
   }
 
   protected MockClient connectAsAdmin() {
-    MockClient client = null;
-    client = connectClient();
+    final MockClient client = connectClient();
 
     Configuration.set(Configuration.PASSWORD_KEY, CORRECT_PASSWORD);