chore: Java 스타일 수정

github-actions · github-actions · commit 0b2689edee2e · 2025-07-19T15:50:42.000Z
diff --git a/backend/src/main/java/io/f1/backend/domain/game/app/GameService.java b/backend/src/main/java/io/f1/backend/domain/game/app/GameService.java
@@ -3,10 +3,7 @@
 import static io.f1.backend.domain.game.mapper.RoomMapper.toQuestionStartResponse;
 import static io.f1.backend.domain.quiz.mapper.QuizMapper.toGameStartResponse;
 
-import io.f1.backend.domain.game.dto.GameStartData;
 import io.f1.backend.domain.game.dto.MessageType;
-import io.f1.backend.domain.game.dto.response.GameStartResponse;
-import io.f1.backend.domain.game.dto.response.QuestionStartResponse;
 import io.f1.backend.domain.game.event.RoomUpdatedEvent;
 import io.f1.backend.domain.game.model.Player;
 import io.f1.backend.domain.game.model.Room;
@@ -21,7 +18,6 @@
 import io.f1.backend.global.exception.errorcode.GameErrorCode;
 import io.f1.backend.global.exception.errorcode.RoomErrorCode;
 
-import java.time.Instant;
 import lombok.RequiredArgsConstructor;
 
 import org.springframework.context.ApplicationEventPublisher;
@@ -44,7 +40,6 @@ public class GameService {
     private final RoomRepository roomRepository;
     private final ApplicationEventPublisher eventPublisher;
 
-
     public void gameStart(Long roomId, UserPrincipal principal) {
 
         String destination = getDestination(roomId);
@@ -69,8 +64,10 @@ public void gameStart(Long roomId, UserPrincipal principal) {
         timerService.startTimer(room, START_DELAY);
 
         messageSender.send(destination, MessageType.GAME_START, toGameStartResponse(questions));
-        messageSender.send(destination, MessageType.QUESTION_START, toQuestionStartResponse(room, START_DELAY));
-
+        messageSender.send(
+                destination,
+                MessageType.QUESTION_START,
+                toQuestionStartResponse(room, START_DELAY));
     }
 
     private boolean validateReadyStatus(Room room) {
diff --git a/backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java b/backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java
@@ -5,7 +5,6 @@
 import static io.f1.backend.domain.game.mapper.RoomMapper.toGameSettingResponse;
 import static io.f1.backend.domain.game.mapper.RoomMapper.toPlayerListResponse;
 import static io.f1.backend.domain.game.mapper.RoomMapper.toQuestionResultResponse;
-import static io.f1.backend.domain.game.mapper.RoomMapper.toQuestionStartResponse;
 import static io.f1.backend.domain.game.mapper.RoomMapper.toRankUpdateResponse;
 import static io.f1.backend.domain.game.mapper.RoomMapper.toRoomResponse;
 import static io.f1.backend.domain.game.mapper.RoomMapper.toRoomSetting;
@@ -66,7 +65,6 @@ public class RoomService {
 
     private final MessageSender messageSender;
 
-
     private static final int START_DELAY = 5;
     private static final int CONTINUE_DELAY = 3;
 
@@ -263,7 +261,7 @@ public void chat(Long roomId, String sessionId, ChatMessage chatMessage) {
         timerService.cancelTimer(room);
 
         // TODO : 게임 종료 로직 추가
-        if(!timerService.validateCurrentRound(room)) {
+        if (!timerService.validateCurrentRound(room)) {
             // 게임 종료 로직
             return;
         }
@@ -272,7 +270,6 @@ public void chat(Long roomId, String sessionId, ChatMessage chatMessage) {
 
         // 타이머 추가하기
         timerService.startTimer(room, CONTINUE_DELAY);
-
     }
 
     private Player getRemovePlayer(Room room, String sessionId, UserPrincipal principal) {
diff --git a/backend/src/main/java/io/f1/backend/domain/game/app/TimerService.java b/backend/src/main/java/io/f1/backend/domain/game/app/TimerService.java
@@ -3,17 +3,19 @@
 import static io.f1.backend.domain.game.mapper.RoomMapper.ofPlayerEvent;
 import static io.f1.backend.domain.game.mapper.RoomMapper.toQuestionResultResponse;
 import static io.f1.backend.domain.game.mapper.RoomMapper.toQuestionStartResponse;
-import static io.f1.backend.domain.game.mapper.RoomMapper.toRankUpdateResponse;
 
 import io.f1.backend.domain.game.dto.MessageType;
 import io.f1.backend.domain.game.dto.RoomEventType;
 import io.f1.backend.domain.game.model.Room;
 import io.f1.backend.domain.game.websocket.MessageSender;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
+
 import lombok.RequiredArgsConstructor;
+
 import org.springframework.stereotype.Service;
 
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
 @Service
 @RequiredArgsConstructor
 public class TimerService {
@@ -26,20 +28,31 @@ public class TimerService {
     public void startTimer(Room room, int delaySec) {
         cancelTimer(room);
         ScheduledFuture<?> timer = room.getTimer();
-        timer = room.getScheduler().schedule(() -> {
-            handleTimeout(room);
-        }, delaySec + room.getGameSetting().getTimeLimit(), TimeUnit.SECONDS);
+        timer =
+                room.getScheduler()
+                        .schedule(
+                                () -> {
+                                    handleTimeout(room);
+                                },
+                                delaySec + room.getGameSetting().getTimeLimit(),
+                                TimeUnit.SECONDS);
     }
 
     private void handleTimeout(Room room) {
 
         String destination = getDestination(room.getId());
 
-        messageSender.send(destination, MessageType.QUESTION_RESULT, toQuestionResultResponse(NONE_CORRECT_USER, room.getCurrentQuestion().getAnswer()));
-        messageSender.send(destination, MessageType.SYSTEM_NOTICE, ofPlayerEvent(NONE_CORRECT_USER, RoomEventType.TIMEOUT));
+        messageSender.send(
+                destination,
+                MessageType.QUESTION_RESULT,
+                toQuestionResultResponse(NONE_CORRECT_USER, room.getCurrentQuestion().getAnswer()));
+        messageSender.send(
+                destination,
+                MessageType.SYSTEM_NOTICE,
+                ofPlayerEvent(NONE_CORRECT_USER, RoomEventType.TIMEOUT));
 
         // TODO : 게임 종료 로직
-        if(!validateCurrentRound(room)){
+        if (!validateCurrentRound(room)) {
             // 게임 종료 로직
             // GAME_SETTING, PLAYER_LIST, GAME_RESULT, ROOM_SETTING
             return;
@@ -49,11 +62,14 @@ private void handleTimeout(Room room) {
         room.increaseCurrentRound();
 
         startTimer(room, CONTINUE_DELAY);
-        messageSender.send(destination, MessageType.QUESTION_START, toQuestionStartResponse(room, CONTINUE_DELAY));
+        messageSender.send(
+                destination,
+                MessageType.QUESTION_START,
+                toQuestionStartResponse(room, CONTINUE_DELAY));
     }
 
     public boolean validateCurrentRound(Room room) {
-        if(room.getGameSetting().getRound() != room.getCurrentRound()) {
+        if (room.getGameSetting().getRound() != room.getCurrentRound()) {
             return true;
         }
         cancelTimer(room);
@@ -64,7 +80,7 @@ public boolean validateCurrentRound(Room room) {
     public void cancelTimer(Room room) {
         // 정답 맞혔어요 ~ 타이머 캔슬 부탁
         ScheduledFuture<?> timer = room.getTimer();
-        if(timer != null && !timer.isDone()) {
+        if (timer != null && !timer.isDone()) {
             timer.cancel(false);
         }
     }
diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/GameEventType.java b/backend/src/main/java/io/f1/backend/domain/game/dto/GameEventType.java
@@ -1,5 +1,6 @@
 package io.f1.backend.domain.game.dto;
 
 public enum GameEventType {
-    START, CONTINUE
+    START,
+    CONTINUE
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/GameStartData.java b/backend/src/main/java/io/f1/backend/domain/game/dto/GameStartData.java
@@ -3,5 +3,5 @@
 import io.f1.backend.domain.game.dto.response.GameStartResponse;
 import io.f1.backend.domain.game.dto.response.QuestionStartResponse;
 
-public record GameStartData(GameStartResponse gameStartResponse, QuestionStartResponse questionStartResponse) {
-}
+public record GameStartData(
+        GameStartResponse gameStartResponse, QuestionStartResponse questionStartResponse) {}
diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/response/QuestionStartResponse.java b/backend/src/main/java/io/f1/backend/domain/game/dto/response/QuestionStartResponse.java
@@ -2,6 +2,4 @@
 
 import java.time.Instant;
 
-public record QuestionStartResponse(Long questionId, int round, Instant timestamp) {
-
-}
+public record QuestionStartResponse(Long questionId, int round, Instant timestamp) {}
diff --git a/backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java b/backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java
@@ -1,6 +1,5 @@
 package io.f1.backend.domain.game.mapper;
 
-import io.f1.backend.domain.game.dto.ChatMessage;
 import io.f1.backend.domain.game.dto.Rank;
 import io.f1.backend.domain.game.dto.RoomEventType;
 import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
@@ -115,7 +114,8 @@ public static RankUpdateResponse toRankUpdateResponse(Room room) {
 
     public static QuestionStartResponse toQuestionStartResponse(Room room, int delay) {
         return new QuestionStartResponse(
-            room.getCurrentQuestion().getId(), room.getCurrentRound(), Instant.now().plusSeconds(delay));
+                room.getCurrentQuestion().getId(),
+                room.getCurrentRound(),
+                Instant.now().plusSeconds(delay));
     }
-
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/game/model/Room.java b/backend/src/main/java/io/f1/backend/domain/game/model/Room.java
@@ -2,16 +2,16 @@
 
 import io.f1.backend.domain.question.entity.Question;
 
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
 import lombok.Getter;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 
 @Getter
 public class Room {
diff --git a/backend/src/main/java/io/f1/backend/domain/game/websocket/GameSocketController.java b/backend/src/main/java/io/f1/backend/domain/game/websocket/GameSocketController.java
@@ -6,7 +6,6 @@
 import io.f1.backend.domain.game.app.GameService;
 import io.f1.backend.domain.game.app.RoomService;
 import io.f1.backend.domain.game.dto.ChatMessage;
-
 import io.f1.backend.domain.game.dto.request.DefaultWebSocketRequest;
 import io.f1.backend.domain.user.dto.UserPrincipal;
 
@@ -49,15 +48,13 @@ public void gameStart(@DestinationVariable Long roomId, Message<?> message) {
         UserPrincipal principal = getSessionUser(message);
 
         gameService.gameStart(roomId, principal);
-
     }
 
     @MessageMapping("room/chat/{roomId}")
     public void chat(
             @DestinationVariable Long roomId,
             Message<DefaultWebSocketRequest<ChatMessage>> message) {
 
-
         roomService.chat(roomId, getSessionId(message), message.getPayload().getMessage());
     }
 
diff --git a/backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java b/backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java
@@ -52,7 +52,9 @@ class RoomServiceTests {
     @BeforeEach
     void setUp() {
         MockitoAnnotations.openMocks(this); // @Mock 어노테이션이 붙은 필드들을 초기화합니다.
-        roomService = new RoomService(timerService, quizService, roomRepository, eventPublisher, messageSender);
+        roomService =
+                new RoomService(
+                        timerService, quizService, roomRepository, eventPublisher, messageSender);
 
         SecurityContextHolder.clearContext();
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package io.f1.backend.domain.game.dto;`
`2`	`2`
`3`	`3`	`public enum GameEventType {`
`4`		`- START, CONTINUE`
	`4`	`+ START,`
	`5`	`+ CONTINUE`
`5`	`6`	`}`