Merge pull request #31 from Gamify-IT/maintenance/fix-new-sonar-issues

fix new sonar issues
Gamify-IT · Apr 26, 2023 · cdbc13b · cdbc13b
2 parents c01e27c + 5a62d70
commit cdbc13b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/de/unistuttgart/towercrushbackend/controller/components/WebsocketListener.java b/src/main/java/de/unistuttgart/towercrushbackend/controller/components/WebsocketListener.java
@@ -122,8 +122,8 @@ private void handleDeveloperJoined() {
                     simpMessagingTemplate.convertAndSend(WebsocketListener.DEVELOPER_TOPIC, developerMessageWrapped);
                     try {
                         Thread.sleep(1000);
-                    } catch (final Exception e) {
-                        throw new RuntimeException(e); //NOSONAR
+                    } catch (final Exception e) { //NOSONAR
+                        throw new RuntimeException(e);
                     }
                 }
             });

diff --git a/src/main/java/de/unistuttgart/towercrushbackend/service/websockets/GameService.java b/src/main/java/de/unistuttgart/towercrushbackend/service/websockets/GameService.java
@@ -422,7 +422,7 @@ private void saveAndDeleteGame(final Game game) {
     private void sleep(final int sleepTime){
         try {
             Thread.sleep(sleepTime);
-        } catch (final InterruptedException e) {
+        } catch (final InterruptedException e) { //NOSONAR
             log.error("could not sleep {} seconds. Error: {}", sleepTime, e);
         }
     }

diff --git a/...st/java/de/unistuttgart/towercrushbackend/service/websockets/LobbyManagerServiceTest.java b/...st/java/de/unistuttgart/towercrushbackend/service/websockets/LobbyManagerServiceTest.java
@@ -49,7 +49,7 @@ void getLobby() {
         final Lobby result = lobbyManagerService.getLobby(TEST_LOBBY_NAME);
 
         // evaluate
-        assertEquals(result.getLobbyName(), TEST_LOBBY_NAME);
+        assertEquals(TEST_LOBBY_NAME, result.getLobbyName());
     }
 
     @Test
@@ -73,7 +73,7 @@ void addPlayer() {
         lobbyManagerService.addPlayer(TEST_LOBBY_NAME, player);
 
         // evaluate
-        assertEquals(lobby.getPlayers().size(), 1);
+        assertEquals(1, lobby.getPlayers().size());
         assertTrue(lobby.getPlayers().contains(player));
     }
 
@@ -88,7 +88,7 @@ void getLobbyFromPlayer() {
         final String result = lobbyManagerService.getLobbyFromPlayer(player.getKey());
 
         // evaluate
-        assertEquals(result, TEST_LOBBY_NAME);
+        assertEquals(TEST_LOBBY_NAME, result);
     }
 
     @Test
@@ -185,7 +185,7 @@ void getLobbies() {
         final List<Lobby> result = lobbyManagerService.getLobbies();
 
         // evaluate
-        assertEquals(result.get(0).getLobbyName(), TEST_LOBBY_NAME);
+        assertEquals(TEST_LOBBY_NAME, result.get(0).getLobbyName());
     }
 
     @Test
@@ -204,4 +204,4 @@ void startGame() {
         // evaluate
         assertTrue(lobbyManagerService.getLobby(TEST_LOBBY_NAME).isStarted());
     }
-}
+}
diff --git a/src/test/java/de/unistuttgart/towercrushbackend/service/websockets/WebsocketServiceTest.java b/src/test/java/de/unistuttgart/towercrushbackend/service/websockets/WebsocketServiceTest.java
@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class WebsocketServiceTest {
+class WebsocketServiceTest {
     private WebsocketService websocketService;
 
     @BeforeEach