chore: Java 스타일 수정

Author: github-actions

backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java

@@ -31,17 +31,20 @@
 import io.f1.backend.domain.game.store.RoomRepository;
 import io.f1.backend.domain.quiz.app.QuizService;
 import io.f1.backend.domain.quiz.entity.Quiz;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
 import org.hibernate.boot.model.naming.IllegalIdentifierException;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
 @Slf4j
 @Service
 @RequiredArgsConstructor
@@ -69,7 +72,7 @@ public RoomCreateResponse saveRoom(RoomCreateRequest request) {
 
         Room room = new Room(newId, roomSetting, gameSetting, host);
 
-        room.getUserIdSessionMap().put(host.id,PENDING_SESSION_ID);
+        room.getUserIdSessionMap().put(host.id, PENDING_SESSION_ID);
 
         roomRepository.saveRoom(room);
 
@@ -85,7 +88,6 @@ public void enterRoom(RoomValidationRequest request) {
         Object lock = roomLocks.computeIfAbsent(roomId, k -> new Object());
 
         synchronized (lock) {
-
             Room room = findRoom(request.roomId());
 
             if (room.getState().equals(RoomState.PLAYING)) {
@@ -99,7 +101,7 @@ public void enterRoom(RoomValidationRequest request) {
             }
 
             if (room.getRoomSetting().locked()
-                && !room.getRoomSetting().password().equals(request.password())) {
+                    && !room.getRoomSetting().password().equals(request.password())) {
                 throw new IllegalArgumentException("401 비밀번호가 일치하지 않습니다.");
             }
 
@@ -129,26 +131,25 @@ public RoomInitialData initializeRoomSocket(Long roomId, String sessionId) {
         Quiz quiz = quizService.getQuizById(quizId);
 
         GameSettingResponse gameSettingResponse =
-            toGameSettingResponse(room.getGameSetting(), quiz);
+                toGameSettingResponse(room.getGameSetting(), quiz);
 
         PlayerListResponse playerListResponse = toPlayerListResponse(room);
 
         SystemNoticeResponse systemNoticeResponse = ofPlayerEvent(player, RoomEventType.ENTER);
 
         return new RoomInitialData(
-            getDestination(roomId),
-            roomSettingResponse,
-            gameSettingResponse,
-            playerListResponse,
-            systemNoticeResponse);
+                getDestination(roomId),
+                roomSettingResponse,
+                gameSettingResponse,
+                playerListResponse,
+                systemNoticeResponse);
     }
 
     public RoomExitData exitRoom(Long roomId, String sessionId) {
 
         Object lock = roomLocks.computeIfAbsent(roomId, k -> new Object());
 
         synchronized (lock) {
-
             Room room = findRoom(roomId);
 
             Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
@@ -157,10 +158,10 @@ public RoomExitData exitRoom(Long roomId, String sessionId) {
 
             Player removePlayer = playerSessionMap.get(sessionId);
 
-        if (removePlayer == null) {
-            room.getUserIdSessionMap().remove(getCurrentUserId());
-            throw new IllegalIdentifierException("404 세션 없음 비정상적인 퇴장 요청");
-        }
+            if (removePlayer == null) {
+                room.getUserIdSessionMap().remove(getCurrentUserId());
+                throw new IllegalIdentifierException("404 세션 없음 비정상적인 퇴장 요청");
+            }
 
             /* 방 삭제 */
             if (playerSessionMap.size() == 1 && playerSessionMap.containsKey(sessionId)) {
@@ -173,15 +174,17 @@ public RoomExitData exitRoom(Long roomId, String sessionId) {
             /* 방장 변경 */
             if (room.getHost().getId().equals(removePlayer.getId())) {
 
-                Optional<String> nextHostSessionId = playerSessionMap.keySet().stream()
-                    .filter(key -> !key.equals(sessionId)).findFirst();
+                Optional<String> nextHostSessionId =
+                        playerSessionMap.keySet().stream()
+                                .filter(key -> !key.equals(sessionId))
+                                .findFirst();
 
                 Player nextHost =
-                    playerSessionMap.get(
-                        nextHostSessionId.orElseThrow(
-                            () ->
-                                new IllegalArgumentException(
-                                    "방장 교체 불가 - 404 해당 세션 플레이어는 존재하지않습니다.")));
+                        playerSessionMap.get(
+                                nextHostSessionId.orElseThrow(
+                                        () ->
+                                                new IllegalArgumentException(
+                                                        "방장 교체 불가 - 404 해당 세션 플레이어는 존재하지않습니다.")));
 
                 room.updateHost(nextHost);
                 log.info("user_id:{} 방장 변경 완료 ", nextHost.getId());
@@ -191,7 +194,7 @@ public RoomExitData exitRoom(Long roomId, String sessionId) {
             playerSessionMap.remove(sessionId);
 
             SystemNoticeResponse systemNoticeResponse =
-                ofPlayerEvent(removePlayer, RoomEventType.EXIT);
+                    ofPlayerEvent(removePlayer, RoomEventType.EXIT);
 
             PlayerListResponse playerListResponse = toPlayerListResponse(room);
 
@@ -202,15 +205,15 @@ public RoomExitData exitRoom(Long roomId, String sessionId) {
     public RoomListResponse getAllRooms() {
         List<Room> rooms = roomRepository.findAll();
         List<RoomResponse> roomResponses =
-            rooms.stream()
-                .map(
-                    room -> {
-                        Long quizId = room.getGameSetting().getQuizId();
-                        Quiz quiz = quizService.getQuizById(quizId);
-
-                        return toRoomResponse(room, quiz);
-                    })
-                .toList();
+                rooms.stream()
+                        .map(
+                                room -> {
+                                    Long quizId = room.getGameSetting().getQuizId();
+                                    Quiz quiz = quizService.getQuizById(quizId);
+
+                                    return toRoomResponse(room, quiz);
+                                })
+                        .toList();
         return new RoomListResponse(roomResponses);
     }
 
@@ -224,9 +227,7 @@ private Player createPlayer() {
 
     private Room findRoom(Long roomId) {
         return roomRepository
-            .findRoom(roomId)
-            .orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
+                .findRoom(roomId)
+                .orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
     }
-
-
 }

backend/src/main/java/io/f1/backend/domain/game/model/Room.java

@@ -27,7 +27,7 @@ public class Room {
 
     private Map<String, Player> playerSessionMap = new ConcurrentHashMap<>();
 
-    private Map<Long,String> userIdSessionMap = new ConcurrentHashMap<>();
+    private Map<Long, String> userIdSessionMap = new ConcurrentHashMap<>();
 
     private final LocalDateTime createdAt = LocalDateTime.now();
 
@@ -36,7 +36,6 @@ public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting, Player ho
         this.roomSetting = roomSetting;
         this.gameSetting = gameSetting;
         this.host = host;
-
     }
 
     public void updateHost(Player nextHost) {

backend/src/main/java/io/f1/backend/domain/game/websocket/GameSocketController.java

@@ -25,7 +25,8 @@ public void initializeRoomSocket(@DestinationVariable Long roomId, Message<?> me
 
         String websocketSessionId = getSessionId(message);
 
-        RoomInitialData roomInitialData = roomService.initializeRoomSocket(roomId, websocketSessionId);
+        RoomInitialData roomInitialData =
+                roomService.initializeRoomSocket(roomId, websocketSessionId);
         String destination = roomInitialData.destination();
 
         messageSender.send(

backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java

@@ -13,14 +13,9 @@
 import io.f1.backend.domain.quiz.app.QuizService;
 import io.f1.backend.domain.user.entity.User;
 import io.f1.backend.global.util.SecurityUtils;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -32,22 +27,26 @@
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.core.context.SecurityContextHolder;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 @Slf4j
 @ExtendWith(MockitoExtension.class)
 class RoomServiceTests {
 
     private RoomService roomService;
 
-    @Mock
-    private RoomRepository roomRepository;
-    @Mock
-    private QuizService quizService;
-    @Mock
-    private ApplicationEventPublisher eventPublisher;
-
+    @Mock private RoomRepository roomRepository;
+    @Mock private QuizService quizService;
+    @Mock private ApplicationEventPublisher eventPublisher;
 
     @BeforeEach
-    void setUp(){
+    void setUp() {
         MockitoAnnotations.openMocks(this); // @Mock 어노테이션이 붙은 필드들을 초기화합니다.
         roomService = new RoomService(quizService, roomRepository, eventPublisher);
 
@@ -84,30 +83,33 @@ void enterRoom_synchronized() throws Exception {
             String provider = "provider +" + i;
             String providerId = "providerId" + i;
             LocalDateTime lastLogin = LocalDateTime.now();
-            executorService.submit(() -> {
-                try {
-                    User user = User.builder()
-                        .provider(provider)
-                        .provider(providerId).lastLogin(lastLogin).build();
-
-                    user.setId(userId);
-
-                    SecurityUtils.setAuthentication(user);
-
-                    roomService.enterRoom(roomValidationRequest);
-                } catch (Exception e) {
-                    //e.printStackTrace();
-                } finally {
-                    SecurityContextHolder.clearContext();
-                    countDownLatch.countDown();
-                }
-            });
+            executorService.submit(
+                    () -> {
+                        try {
+                            User user =
+                                    User.builder()
+                                            .provider(provider)
+                                            .provider(providerId)
+                                            .lastLogin(lastLogin)
+                                            .build();
+
+                            user.setId(userId);
+
+                            SecurityUtils.setAuthentication(user);
+
+                            roomService.enterRoom(roomValidationRequest);
+                        } catch (Exception e) {
+                            // e.printStackTrace();
+                        } finally {
+                            SecurityContextHolder.clearContext();
+                            countDownLatch.countDown();
+                        }
+                    });
         }
         countDownLatch.await();
         assertThat(room.getUserIdSessionMap()).hasSize(room.getRoomSetting().maxUserCount());
     }
 
-
     @Test
     @DisplayName("exitRoom_동시성_테스트")
     void exitRoom_synchronized() throws Exception {
@@ -121,22 +123,21 @@ void exitRoom_synchronized() throws Exception {
         GameSetting gameSetting = new GameSetting(quizId, 10, 60);
 
         List<Player> players = new ArrayList<>();
-        for (int i = 1; i <=threadCount; i++) {
+        for (int i = 1; i <= threadCount; i++) {
             Long id = i + 1L;
             String nickname = "nickname " + i;
 
             Player player = new Player(id, nickname);
             players.add(player);
-
         }
         Player host = players.getFirst();
         Room room = new Room(roomId, roomSetting, gameSetting, host);
 
-        for (int i = 1; i <=threadCount; i++) {
+        for (int i = 1; i <= threadCount; i++) {
             String sessionId = "sessionId" + i;
             Player player = players.get(i - 1);
-            room.getPlayerSessionMap().put(sessionId,player);
-            room.getUserIdSessionMap().put(player.getId(),sessionId);
+            room.getPlayerSessionMap().put(sessionId, player);
+            room.getUserIdSessionMap().put(player.getId(), sessionId);
         }
 
         log.info("room.getPlayerSessionMap().size() = {}", room.getPlayerSessionMap().size());
@@ -153,29 +154,30 @@ void exitRoom_synchronized() throws Exception {
             String provider = "provider +" + i;
             String providerId = "providerId" + i;
             LocalDateTime lastLogin = LocalDateTime.now();
-            executorService.submit(() -> {
-                try {
-                    User user = User.builder()
-                        .provider(provider)
-                        .provider(providerId).lastLogin(lastLogin).build();
-                    user.setId(userId);
-                    SecurityUtils.setAuthentication(user);
-
-                    log.info("userId = {}", userId);
-                    log.info("room.getHost().getId() = {}", room.getHost().getId());
-                    roomService.exitRoom(roomId, sessionId);
-                } catch (Exception e) {
-                     e.printStackTrace();
-                } finally {
-                    SecurityContextHolder.clearContext();
-                    countDownLatch.countDown();
-                }
-            });
+            executorService.submit(
+                    () -> {
+                        try {
+                            User user =
+                                    User.builder()
+                                            .provider(provider)
+                                            .provider(providerId)
+                                            .lastLogin(lastLogin)
+                                            .build();
+                            user.setId(userId);
+                            SecurityUtils.setAuthentication(user);
+
+                            log.info("userId = {}", userId);
+                            log.info("room.getHost().getId() = {}", room.getHost().getId());
+                            roomService.exitRoom(roomId, sessionId);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        } finally {
+                            SecurityContextHolder.clearContext();
+                            countDownLatch.countDown();
+                        }
+                    });
         }
         countDownLatch.await();
         assertThat(room.getUserIdSessionMap()).hasSize(1);
     }
-
-
-
-}
+}