Skip to content

Commit 1e83572

Browse files
author
github-actions
committed
chore: Java 스타일 수정
1 parent 9ab7281 commit 1e83572

File tree

10 files changed

+116
-106
lines changed

10 files changed

+116
-106
lines changed

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

Lines changed: 47 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,18 @@
4141
import io.f1.backend.global.exception.CustomException;
4242
import io.f1.backend.global.exception.errorcode.QuestionErrorCode;
4343
import io.f1.backend.global.exception.errorcode.RoomErrorCode;
44+
45+
import lombok.RequiredArgsConstructor;
46+
import lombok.extern.slf4j.Slf4j;
47+
48+
import org.springframework.context.ApplicationEventPublisher;
49+
import org.springframework.stereotype.Service;
50+
4451
import java.util.List;
4552
import java.util.Map;
4653
import java.util.Optional;
4754
import java.util.concurrent.ConcurrentHashMap;
4855
import java.util.concurrent.atomic.AtomicLong;
49-
import lombok.RequiredArgsConstructor;
50-
import lombok.extern.slf4j.Slf4j;
51-
import org.springframework.context.ApplicationEventPublisher;
52-
import org.springframework.stereotype.Service;
5356

5457
@Slf4j
5558
@Service
@@ -107,7 +110,7 @@ public void enterRoom(RoomValidationRequest request) {
107110
}
108111

109112
if (room.getRoomSetting().locked()
110-
&& !room.getRoomSetting().password().equals(request.password())) {
113+
&& !room.getRoomSetting().password().equals(request.password())) {
111114
throw new CustomException(RoomErrorCode.WRONG_PASSWORD);
112115
}
113116

@@ -141,19 +144,19 @@ public RoomInitialData initializeRoomSocket(Long roomId, String sessionId) {
141144
Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
142145

143146
GameSettingResponse gameSettingResponse =
144-
toGameSettingResponse(room.getGameSetting(), quiz);
147+
toGameSettingResponse(room.getGameSetting(), quiz);
145148

146149
PlayerListResponse playerListResponse = toPlayerListResponse(room);
147150

148-
SystemNoticeResponse systemNoticeResponse = ofPlayerEvent(player.getNickname(),
149-
RoomEventType.ENTER);
151+
SystemNoticeResponse systemNoticeResponse =
152+
ofPlayerEvent(player.getNickname(), RoomEventType.ENTER);
150153

151154
return new RoomInitialData(
152-
getDestination(roomId),
153-
roomSettingResponse,
154-
gameSettingResponse,
155-
playerListResponse,
156-
systemNoticeResponse);
155+
getDestination(roomId),
156+
roomSettingResponse,
157+
gameSettingResponse,
158+
playerListResponse,
159+
systemNoticeResponse);
157160
}
158161

159162
public RoomExitData exitRoom(Long roomId, String sessionId) {
@@ -181,7 +184,7 @@ public RoomExitData exitRoom(Long roomId, String sessionId) {
181184
removePlayer(room, sessionId, removePlayer);
182185

183186
SystemNoticeResponse systemNoticeResponse =
184-
ofPlayerEvent(removePlayer.nickname, RoomEventType.EXIT);
187+
ofPlayerEvent(removePlayer.nickname, RoomEventType.EXIT);
185188

186189
PlayerListResponse playerListResponse = toPlayerListResponse(room);
187190

@@ -192,15 +195,15 @@ public RoomExitData exitRoom(Long roomId, String sessionId) {
192195
public RoomListResponse getAllRooms() {
193196
List<Room> rooms = roomRepository.findAll();
194197
List<RoomResponse> roomResponses =
195-
rooms.stream()
196-
.map(
197-
room -> {
198-
Long quizId = room.getGameSetting().getQuizId();
199-
Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
200-
201-
return toRoomResponse(room, quiz);
202-
})
203-
.toList();
198+
rooms.stream()
199+
.map(
200+
room -> {
201+
Long quizId = room.getGameSetting().getQuizId();
202+
Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
203+
204+
return toRoomResponse(room, quiz);
205+
})
206+
.toList();
204207
return new RoomListResponse(roomResponses);
205208
}
206209

@@ -209,10 +212,12 @@ public RoundResult chatInPlaying(Long roomId, String sessionId, AnswerMessage ch
209212

210213
String destination = getDestination(roomId);
211214

212-
Question question = room.getQuestions().stream()
213-
.filter(q -> q.getId().equals(chatMessage.questionId()))
214-
.findFirst().orElseThrow(() -> new CustomException(
215-
QuestionErrorCode.QUESTION_NOT_FOUND));
215+
Question question =
216+
room.getQuestions().stream()
217+
.filter(q -> q.getId().equals(chatMessage.questionId()))
218+
.findFirst()
219+
.orElseThrow(
220+
() -> new CustomException(QuestionErrorCode.QUESTION_NOT_FOUND));
216221

217222
ChatMessage broadCastChat = toChatMessage(chatMessage);
218223

@@ -224,11 +229,13 @@ public RoundResult chatInPlaying(Long roomId, String sessionId, AnswerMessage ch
224229

225230
room.increasePlayerCorrectCount(sessionId);
226231

227-
return RoundResult.builder().destination(destination)
228-
.questionResult(toQuestionResultResponse(chatMessage, answer))
229-
.rankUpdate(toRankUpdateResponse(room))
230-
.systemNotice(ofPlayerEvent(chatMessage.nickname(), RoomEventType.ENTER))
231-
.chat(broadCastChat).build();
232+
return RoundResult.builder()
233+
.destination(destination)
234+
.questionResult(toQuestionResultResponse(chatMessage, answer))
235+
.rankUpdate(toRankUpdateResponse(room))
236+
.systemNotice(ofPlayerEvent(chatMessage.nickname(), RoomEventType.ENTER))
237+
.chat(broadCastChat)
238+
.build();
232239
}
233240

234241
private Player getRemovePlayer(Room room, String sessionId) {
@@ -250,8 +257,8 @@ private Player createPlayer() {
250257

251258
private Room findRoom(Long roomId) {
252259
return roomRepository
253-
.findRoom(roomId)
254-
.orElseThrow(() -> new CustomException(RoomErrorCode.ROOM_NOT_FOUND));
260+
.findRoom(roomId)
261+
.orElseThrow(() -> new CustomException(RoomErrorCode.ROOM_NOT_FOUND));
255262
}
256263

257264
private boolean isLastPlayer(Room room, String sessionId) {
@@ -271,14 +278,14 @@ private void changeHost(Room room, String hostSessionId) {
271278
Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
272279

273280
Optional<String> nextHostSessionId =
274-
playerSessionMap.keySet().stream()
275-
.filter(key -> !key.equals(hostSessionId))
276-
.findFirst();
281+
playerSessionMap.keySet().stream()
282+
.filter(key -> !key.equals(hostSessionId))
283+
.findFirst();
277284

278285
Player nextHost =
279-
playerSessionMap.get(
280-
nextHostSessionId.orElseThrow(
281-
() -> new CustomException(RoomErrorCode.SOCKET_SESSION_NOT_FOUND)));
286+
playerSessionMap.get(
287+
nextHostSessionId.orElseThrow(
288+
() -> new CustomException(RoomErrorCode.SOCKET_SESSION_NOT_FOUND)));
282289

283290
room.updateHost(nextHost);
284291
log.info("user_id:{} 방장 변경 완료 ", nextHost.getId());

‎backend/src/main/java/io/f1/backend/domain/game/dto/ChatMessage.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22

33
import java.time.Instant;
44

5-
public record ChatMessage ( String nickname, String message, Instant timestamp) {
6-
7-
}
5+
public record ChatMessage(String nickname, String message, Instant timestamp) {}

‎backend/src/main/java/io/f1/backend/domain/game/dto/Rank.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
package io.f1.backend.domain.game.dto;
22

3-
public record Rank(String nickName, int correctCount) {
4-
5-
}
3+
public record Rank(String nickName, int correctCount) {}

‎backend/src/main/java/io/f1/backend/domain/game/dto/RoundResult.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.f1.backend.domain.game.dto.response.QuestionResultResponse;
44
import io.f1.backend.domain.game.dto.response.RankUpdateResponse;
55
import io.f1.backend.domain.game.dto.response.SystemNoticeResponse;
6+
67
import lombok.Builder;
78
import lombok.Getter;
89

@@ -15,23 +16,23 @@ public class RoundResult {
1516
ChatMessage chat;
1617

1718
@Builder
18-
public RoundResult(String destination,QuestionResultResponse questionResult, RankUpdateResponse rankUpdate,
19-
SystemNoticeResponse systemNotice, ChatMessage chat) {
19+
public RoundResult(
20+
String destination,
21+
QuestionResultResponse questionResult,
22+
RankUpdateResponse rankUpdate,
23+
SystemNoticeResponse systemNotice,
24+
ChatMessage chat) {
2025
this.questionResult = questionResult;
2126
this.rankUpdate = rankUpdate;
2227
this.systemNotice = systemNotice;
2328
this.chat = chat;
2429
}
2530

26-
public boolean hasChat(){
31+
public boolean hasChat() {
2732
return chat != null;
2833
}
2934

3035
public boolean hasOnlyChat() {
31-
return chat != null
32-
&& questionResult == null
33-
&& rankUpdate == null
34-
&& systemNotice == null;
36+
return chat != null && questionResult == null && rankUpdate == null && systemNotice == null;
3537
}
36-
3738
}

‎backend/src/main/java/io/f1/backend/domain/game/dto/request/AnswerMessage.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22

33
import java.time.Instant;
44

5-
public record AnswerMessage (String nickname, String message, Instant timestamp, Long questionId) {
6-
7-
}
5+
public record AnswerMessage(String nickname, String message, Instant timestamp, Long questionId) {}

‎backend/src/main/java/io/f1/backend/domain/game/dto/request/DefaultWebSocketRequest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.f1.backend.domain.game.dto.MessageType;
44
import io.f1.backend.domain.game.dto.WebSocketDto;
5+
56
import lombok.AllArgsConstructor;
67
import lombok.Getter;
78

‎backend/src/main/java/io/f1/backend/domain/game/dto/response/QuestionResultResponse.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
package io.f1.backend.domain.game.dto.response;
22

3-
public record QuestionResultResponse(Long questionId, String correctUser, String answer) {
4-
5-
}
3+
public record QuestionResultResponse(Long questionId, String correctUser, String answer) {}

‎backend/src/main/java/io/f1/backend/domain/game/dto/response/RankUpdateResponse.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package io.f1.backend.domain.game.dto.response;
22

3-
43
import io.f1.backend.domain.game.dto.Rank;
5-
import java.util.List;
64

7-
public record RankUpdateResponse(List<Rank> rank) {
5+
import java.util.List;
86

9-
}
7+
public record RankUpdateResponse(List<Rank> rank) {}

‎backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class RoomMapper {
3030

3131
public static RoomSetting toRoomSetting(RoomCreateRequest request) {
3232
return new RoomSetting(
33-
request.roomName(), request.maxUserCount(), request.locked(), request.password());
33+
request.roomName(), request.maxUserCount(), request.locked(), request.password());
3434
}
3535

3636
public static GameSetting toGameSetting(Quiz quiz) {
@@ -39,47 +39,47 @@ public static GameSetting toGameSetting(Quiz quiz) {
3939

4040
public static RoomSettingResponse toRoomSettingResponse(Room room) {
4141
return new RoomSettingResponse(
42-
room.getRoomSetting().roomName(),
43-
room.getRoomSetting().maxUserCount(),
44-
room.getPlayerSessionMap().size());
42+
room.getRoomSetting().roomName(),
43+
room.getRoomSetting().maxUserCount(),
44+
room.getPlayerSessionMap().size());
4545
}
4646

4747
public static GameSettingResponse toGameSettingResponse(GameSetting gameSetting, Quiz quiz) {
4848
return new GameSettingResponse(
49-
gameSetting.getRound(), gameSetting.getTimeLimit(), toQuizResponse(quiz));
49+
gameSetting.getRound(), gameSetting.getTimeLimit(), toQuizResponse(quiz));
5050
}
5151

5252
public static PlayerListResponse toPlayerListResponse(Room room) {
5353
List<PlayerResponse> playerResponseList =
54-
room.getPlayerSessionMap().values().stream()
55-
.map(player -> new PlayerResponse(player.getNickname(), false))
56-
.toList();
54+
room.getPlayerSessionMap().values().stream()
55+
.map(player -> new PlayerResponse(player.getNickname(), false))
56+
.toList();
5757

5858
return new PlayerListResponse(room.getHost().getNickname(), playerResponseList);
5959
}
6060

6161
public static RoomResponse toRoomResponse(Room room, Quiz quiz) {
6262
return new RoomResponse(
63-
room.getId(),
64-
room.getRoomSetting().roomName(),
65-
room.getRoomSetting().maxUserCount(),
66-
room.getPlayerSessionMap().size(),
67-
room.getRoomSetting().locked(),
68-
room.getState().name(),
69-
quiz.getTitle(),
70-
quiz.getDescription(),
71-
quiz.getCreator().getNickname(),
72-
quiz.getQuestions().size(),
73-
quiz.getThumbnailUrl());
63+
room.getId(),
64+
room.getRoomSetting().roomName(),
65+
room.getRoomSetting().maxUserCount(),
66+
room.getPlayerSessionMap().size(),
67+
room.getRoomSetting().locked(),
68+
room.getState().name(),
69+
quiz.getTitle(),
70+
quiz.getDescription(),
71+
quiz.getCreator().getNickname(),
72+
quiz.getQuestions().size(),
73+
quiz.getThumbnailUrl());
7474
}
7575

7676
public static QuizResponse toQuizResponse(Quiz quiz) {
7777
return new QuizResponse(
78-
quiz.getId(),
79-
quiz.getTitle(),
80-
quiz.getDescription(),
81-
quiz.getThumbnailUrl(),
82-
quiz.getQuestions().size());
78+
quiz.getId(),
79+
quiz.getTitle(),
80+
quiz.getDescription(),
81+
quiz.getThumbnailUrl(),
82+
quiz.getQuestions().size());
8383
}
8484

8585
public static SystemNoticeResponse ofPlayerEvent(String nickname, RoomEventType roomEventType) {
@@ -89,22 +89,24 @@ public static SystemNoticeResponse ofPlayerEvent(String nickname, RoomEventType
8989
} else if (roomEventType == RoomEventType.EXIT) {
9090
message = " 님이 퇴장하셨습니다";
9191
}
92-
return new SystemNoticeResponse(nickname+ message, Instant.now());
92+
return new SystemNoticeResponse(nickname + message, Instant.now());
9393
}
9494

9595
public static ChatMessage toChatMessage(AnswerMessage answerMessage) {
96-
return new ChatMessage(answerMessage.nickname(), answerMessage.message(),
97-
answerMessage.timestamp());
96+
return new ChatMessage(
97+
answerMessage.nickname(), answerMessage.message(), answerMessage.timestamp());
9898
}
9999

100-
public static QuestionResultResponse toQuestionResultResponse(AnswerMessage chatMessage,
101-
String answer) {
100+
public static QuestionResultResponse toQuestionResultResponse(
101+
AnswerMessage chatMessage, String answer) {
102102
return new QuestionResultResponse(chatMessage.questionId(), chatMessage.nickname(), answer);
103103
}
104104

105105
public static RankUpdateResponse toRankUpdateResponse(Room room) {
106-
return new RankUpdateResponse(room.getPlayerSessionMap().values().stream()
107-
.sorted(Comparator.comparing(Player::getCorrectCount).reversed())
108-
.map(player -> new Rank(player.getNickname(), player.getCorrectCount())).toList());
106+
return new RankUpdateResponse(
107+
room.getPlayerSessionMap().values().stream()
108+
.sorted(Comparator.comparing(Player::getCorrectCount).reversed())
109+
.map(player -> new Rank(player.getNickname(), player.getCorrectCount()))
110+
.toList());
109111
}
110112
}

0 commit comments

Comments
 (0)