Skip to content

Commit f220c52

Browse files
author
github-actions
committed
chore: Java 스타일 수정
1 parent 140d082 commit f220c52

File tree

9 files changed

+72
-59
lines changed

9 files changed

+72
-59
lines changed

‎backend/src/main/java/io/f1/backend/domain/game/api/RoomController.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
import org.springframework.web.bind.annotation.ResponseStatus;
1919
import org.springframework.web.bind.annotation.RestController;
2020

21-
import java.util.HashMap;
22-
import java.util.Map;
23-
2421
@RestController
2522
@RequestMapping("/rooms")
2623
@RequiredArgsConstructor

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

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,17 @@
2929
import io.f1.backend.domain.game.store.RoomRepository;
3030
import io.f1.backend.domain.quiz.app.QuizService;
3131
import io.f1.backend.domain.quiz.entity.Quiz;
32+
33+
import lombok.RequiredArgsConstructor;
34+
35+
import org.springframework.context.ApplicationEventPublisher;
36+
import org.springframework.stereotype.Service;
37+
3238
import java.time.Instant;
3339
import java.util.List;
3440
import java.util.Map;
3541
import java.util.Optional;
3642
import java.util.concurrent.atomic.AtomicLong;
37-
import lombok.RequiredArgsConstructor;
38-
import org.springframework.context.ApplicationEventPublisher;
39-
import org.springframework.stereotype.Service;
4043

4144
@Service
4245
@RequiredArgsConstructor
@@ -69,13 +72,12 @@ public RoomCreateResponse saveRoom(RoomCreateRequest request) {
6972
return new RoomCreateResponse(newId);
7073
}
7174

72-
7375
public void validateRoom(RoomValidationRequest request) {
7476

7577
Room room =
76-
roomRepository
77-
.findRoom(request.roomId())
78-
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다.-1"));
78+
roomRepository
79+
.findRoom(request.roomId())
80+
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다.-1"));
7981

8082
if (room.getState().equals(RoomState.PLAYING)) {
8183
throw new IllegalArgumentException("403 게임이 진행중입니다.");
@@ -88,17 +90,17 @@ public void validateRoom(RoomValidationRequest request) {
8890
}
8991

9092
if (room.getRoomSetting().locked()
91-
&& !room.getRoomSetting().password().equals(request.password())) {
93+
&& !room.getRoomSetting().password().equals(request.password())) {
9294
throw new IllegalArgumentException("401 비밀번호가 일치하지 않습니다.");
9395
}
9496
}
9597

9698
public RoomInitialData enterRoom(Long roomId, String sessionId) {
9799

98100
Room room =
99-
roomRepository
100-
.findRoom(roomId)
101-
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
101+
roomRepository
102+
.findRoom(roomId)
103+
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
102104

103105
Player player = createPlayer();
104106

@@ -112,19 +114,22 @@ public RoomInitialData enterRoom(Long roomId, String sessionId) {
112114
Quiz quiz = quizService.getQuizById(quizId);
113115

114116
GameSettingResponse gameSettingResponse =
115-
toGameSettingResponse(room.getGameSetting(), quiz);
117+
toGameSettingResponse(room.getGameSetting(), quiz);
116118

117119
PlayerListResponse playerListResponse = toPlayerListResponse(room);
118120

119121
return new RoomInitialData(
120-
getDestination(roomId), roomSettingResponse, gameSettingResponse, playerListResponse);
122+
getDestination(roomId),
123+
roomSettingResponse,
124+
gameSettingResponse,
125+
playerListResponse);
121126
}
122127

123128
public RoomExitData exitRoom(Long roomId, String sessionId) {
124129
Room room =
125-
roomRepository
126-
.findRoom(roomId)
127-
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
130+
roomRepository
131+
.findRoom(roomId)
132+
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
128133

129134
Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
130135

@@ -142,13 +147,18 @@ public RoomExitData exitRoom(Long roomId, String sessionId) {
142147

143148
if (room.getHost().getId().equals(removedPlayer.getId())) {
144149
Optional<String> nextHostSessionId = playerSessionMap.keySet().stream().findFirst();
145-
Player nextHost = playerSessionMap.get(nextHostSessionId.orElseThrow(
146-
() -> new IllegalArgumentException("방장 교체 불가 - 404 해당 세션 플레이어는 존재하지않습니다.")));
150+
Player nextHost =
151+
playerSessionMap.get(
152+
nextHostSessionId.orElseThrow(
153+
() ->
154+
new IllegalArgumentException(
155+
"방장 교체 불가 - 404 해당 세션 플레이어는 존재하지않습니다.")));
147156
room.updateHost(nextHost);
148157
}
149158

150-
SystemNoticeResponse systemNoticeResponse = new SystemNoticeResponse(
151-
removedPlayer.getNickname() + "님이 퇴장하셨습니다.", Instant.now());
159+
SystemNoticeResponse systemNoticeResponse =
160+
new SystemNoticeResponse(
161+
removedPlayer.getNickname() + "님이 퇴장하셨습니다.", Instant.now());
152162

153163
PlayerListResponse playerListResponse = toPlayerListResponse(room);
154164

@@ -158,15 +168,15 @@ public RoomExitData exitRoom(Long roomId, String sessionId) {
158168
public RoomListResponse getAllRooms() {
159169
List<Room> rooms = roomRepository.findAll();
160170
List<RoomResponse> roomResponses =
161-
rooms.stream()
162-
.map(
163-
room -> {
164-
Long quizId = room.getGameSetting().getQuizId();
165-
Quiz quiz = quizService.getQuizById(quizId);
166-
167-
return toRoomResponse(room, quiz);
168-
})
169-
.toList();
171+
rooms.stream()
172+
.map(
173+
room -> {
174+
Long quizId = room.getGameSetting().getQuizId();
175+
Quiz quiz = quizService.getQuizById(quizId);
176+
177+
return toRoomResponse(room, quiz);
178+
})
179+
.toList();
170180
return new RoomListResponse(roomResponses);
171181
}
172182

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import io.f1.backend.domain.game.dto.response.PlayerListResponse;
44
import io.f1.backend.domain.game.dto.response.SystemNoticeResponse;
55

6-
public record RoomExitData(String destination, PlayerListResponse playerListResponses,
7-
SystemNoticeResponse systemNoticeResponse,
8-
boolean removedRoom) {
9-
10-
}
6+
public record RoomExitData(
7+
String destination,
8+
PlayerListResponse playerListResponses,
9+
SystemNoticeResponse systemNoticeResponse,
10+
boolean removedRoom) {}

‎backend/src/main/java/io/f1/backend/domain/game/dto/response/SystemNoticeResponse.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 SystemNoticeResponse(String noticeMessage, Instant timestamp) {
6-
7-
}
5+
public record SystemNoticeResponse(String noticeMessage, Instant timestamp) {}

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public static RoomSettingResponse toRoomSettingResponse(Room room) {
3434
room.getPlayerSessionMap().size());
3535
}
3636

37-
public static GameSettingResponse toGameSettingResponse(
38-
GameSetting gameSetting, Quiz quiz) {
39-
return new GameSettingResponse(gameSetting.getRound(), gameSetting.getTimeLimit(), toQuizResponse(quiz));
37+
public static GameSettingResponse toGameSettingResponse(GameSetting gameSetting, Quiz quiz) {
38+
return new GameSettingResponse(
39+
gameSetting.getRound(), gameSetting.getTimeLimit(), toQuizResponse(quiz));
4040
}
4141

4242
public static PlayerListResponse toPlayerListResponse(Room room) {
@@ -64,6 +64,11 @@ public static RoomResponse toRoomResponse(Room room, Quiz quiz) {
6464
}
6565

6666
public static QuizResponse toQuizResponse(Quiz quiz) {
67-
return new QuizResponse(quiz.getId(), quiz.getTitle(), quiz.getDescription(), quiz.getThumbnailUrl(), quiz.getQuestions().size());
67+
return new QuizResponse(
68+
quiz.getId(),
69+
quiz.getTitle(),
70+
quiz.getDescription(),
71+
quiz.getThumbnailUrl(),
72+
quiz.getQuestions().size());
6873
}
6974
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting, Player ho
3636
this.host = host;
3737
}
3838

39-
public void updateHost(Player nextHost){
39+
public void updateHost(Player nextHost) {
4040
this.host = nextHost;
4141
}
4242
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,9 @@ public void exitRoom(@DestinationVariable Long roomId, Message<?> message) {
4747

4848
if (!roomExitData.removedRoom()) {
4949
messageSender.send(
50-
destination, MessageType.PLAYER_LIST, roomExitData.playerListResponses()
51-
);
50+
destination, MessageType.PLAYER_LIST, roomExitData.playerListResponses());
5251
messageSender.send(
53-
destination , MessageType.SYSTEM_NOTICE, roomExitData.systemNoticeResponse()
54-
);
52+
destination, MessageType.SYSTEM_NOTICE, roomExitData.systemNoticeResponse());
5553
}
5654
}
5755

‎backend/src/main/java/io/f1/backend/domain/quiz/app/QuizService.java‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,20 @@
1111
import io.f1.backend.domain.quiz.entity.Quiz;
1212
import io.f1.backend.domain.user.dao.UserRepository;
1313
import io.f1.backend.domain.user.entity.User;
14-
import java.io.IOException;
15-
import java.nio.file.Path;
16-
import java.nio.file.Paths;
17-
import java.util.List;
18-
import java.util.UUID;
14+
1915
import lombok.RequiredArgsConstructor;
16+
2017
import org.springframework.beans.factory.annotation.Value;
2118
import org.springframework.stereotype.Service;
2219
import org.springframework.transaction.annotation.Transactional;
2320
import org.springframework.web.multipart.MultipartFile;
2421

22+
import java.io.IOException;
23+
import java.nio.file.Path;
24+
import java.nio.file.Paths;
25+
import java.util.List;
26+
import java.util.UUID;
27+
2528
@Service
2629
@RequiredArgsConstructor
2730
public class QuizService {
@@ -39,7 +42,7 @@ public class QuizService {
3942

4043
@Transactional
4144
public QuizCreateResponse saveQuiz(MultipartFile thumbnailFile, QuizCreateRequest request)
42-
throws IOException {
45+
throws IOException {
4346
String thumbnailPath = defaultThumbnailPath;
4447

4548
if (thumbnailFile != null && !thumbnailFile.isEmpty()) {
@@ -91,9 +94,10 @@ private String getExtension(String filename) {
9194

9295
@Transactional(readOnly = true)
9396
public Quiz getQuizById(Long quizId) {
94-
Quiz quiz = quizRepository
95-
.findById(quizId)
96-
.orElseThrow(() -> new RuntimeException("E404002: 존재하지 않는 퀴즈입니다."));
97+
Quiz quiz =
98+
quizRepository
99+
.findById(quizId)
100+
.orElseThrow(() -> new RuntimeException("E404002: 존재하지 않는 퀴즈입니다."));
97101
quiz.getQuestions().size();
98102
return quiz;
99103
}
@@ -102,4 +106,4 @@ public Quiz getQuizById(Long quizId) {
102106
public Long getQuizMinId() {
103107
return quizRepository.getQuizMinId();
104108
}
105-
}
109+
}

‎backend/src/main/java/io/f1/backend/domain/quiz/dao/QuizRepository.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.f1.backend.domain.quiz.dao;
22

33
import io.f1.backend.domain.quiz.entity.Quiz;
4+
45
import org.springframework.data.jpa.repository.JpaRepository;
56
import org.springframework.data.jpa.repository.Query;
67

0 commit comments

Comments
 (0)