Skip to content

Commit e5925de

Browse files
author
github-actions
committed
chore: Java 스타일 수정
1 parent 64a478f commit e5925de

20 files changed

+70
-76
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import io.f1.backend.domain.game.dto.request.RoomValidationRequest;
66
import io.f1.backend.domain.game.dto.response.RoomCreateResponse;
77
import io.f1.backend.domain.game.dto.response.RoomListResponse;
8-
98
import io.f1.backend.domain.game.dto.response.RoomValidationResponse;
9+
1010
import jakarta.validation.Valid;
1111

1212
import lombok.RequiredArgsConstructor;

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

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import io.f1.backend.domain.game.dto.response.PlayerListResponse;
1010
import io.f1.backend.domain.game.dto.response.QuizResponse;
1111
import io.f1.backend.domain.game.dto.response.RoomCreateResponse;
12-
import io.f1.backend.domain.game.dto.response.RoomSettingResponse;
13-
import io.f1.backend.domain.game.dto.response.RoomValidationResponse;
1412
import io.f1.backend.domain.game.dto.response.RoomListResponse;
1513
import io.f1.backend.domain.game.dto.response.RoomResponse;
14+
import io.f1.backend.domain.game.dto.response.RoomSettingResponse;
15+
import io.f1.backend.domain.game.dto.response.RoomValidationResponse;
1616
import io.f1.backend.domain.game.model.GameSetting;
1717
import io.f1.backend.domain.game.model.Player;
1818
import io.f1.backend.domain.game.model.Room;
@@ -23,15 +23,13 @@
2323
import io.f1.backend.domain.user.entity.User;
2424

2525
import lombok.RequiredArgsConstructor;
26+
import lombok.extern.slf4j.Slf4j;
2627

2728
import org.springframework.stereotype.Service;
2829

2930
import java.util.List;
3031
import java.util.Map;
3132
import java.util.concurrent.atomic.AtomicLong;
32-
import lombok.RequiredArgsConstructor;
33-
import lombok.extern.slf4j.Slf4j;
34-
import org.springframework.stereotype.Service;
3533

3634
@Slf4j
3735
@Service
@@ -58,10 +56,12 @@ public RoomCreateResponse saveRoom(RoomCreateRequest request, Map<String, Object
5856

5957
public RoomValidationResponse validateRoom(RoomValidationRequest request) {
6058

61-
Room room = roomRepository.findRoom(request.roomId())
62-
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
59+
Room room =
60+
roomRepository
61+
.findRoom(request.roomId())
62+
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
6363

64-
if(room.getState().equals(RoomState.PLAYING)){
64+
if (room.getState().equals(RoomState.PLAYING)) {
6565
throw new IllegalArgumentException("403 게임이 진행중입니다.");
6666
}
6767

@@ -71,7 +71,8 @@ public RoomValidationResponse validateRoom(RoomValidationRequest request) {
7171
throw new IllegalArgumentException("403 정원이 모두 찼습니다.");
7272
}
7373

74-
if (room.getRoomSetting().locked() && !room.getRoomSetting().password().equals(request.password())) {
74+
if (room.getRoomSetting().locked()
75+
&& !room.getRoomSetting().password().equals(request.password())) {
7576
throw new IllegalArgumentException("401 비밀번호가 일치하지 않습니다.");
7677
}
7778

@@ -80,10 +81,12 @@ public RoomValidationResponse validateRoom(RoomValidationRequest request) {
8081

8182
public RoomInitialData enterRoom(Long roomId, String sessionId) {
8283

83-
Room room = roomRepository.findRoom(roomId)
84-
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
84+
Room room =
85+
roomRepository
86+
.findRoom(roomId)
87+
.orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
8588

86-
//todo security
89+
// todo security
8790
Player player = new Player(1L, "빵야빵야");
8891

8992
Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
@@ -93,16 +96,16 @@ public RoomInitialData enterRoom(Long roomId, String sessionId) {
9396
String destination = "/sub/room/" + roomId;
9497

9598
RoomSettingResponse roomSettingResponse = toRoomSettingResponse(room);
96-
//todo quiz 생성 api 완성 후 수정
97-
QuizResponse quiz = new QuizResponse(room.getGameSetting().getQuizId(), "title", "설명",
98-
"url", 10);
99-
GameSettingResponse gameSettingResponse = toGameSettingResponse(room.getGameSetting(),
100-
quiz);
99+
// todo quiz 생성 api 완성 후 수정
100+
QuizResponse quiz =
101+
new QuizResponse(room.getGameSetting().getQuizId(), "title", "설명", "url", 10);
102+
GameSettingResponse gameSettingResponse =
103+
toGameSettingResponse(room.getGameSetting(), quiz);
101104

102105
PlayerListResponse playerListResponse = toPlayerListResponse(room);
103106

104-
return new RoomInitialData(destination, roomSettingResponse, gameSettingResponse,
105-
playerListResponse);
107+
return new RoomInitialData(
108+
destination, roomSettingResponse, gameSettingResponse, playerListResponse);
106109
}
107110

108111
// todo quizService에서 퀴즈 조회 메서드로 변경

backend/src/main/java/io/f1/backend/domain/game/dto/RoomInitialData.java

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

7-
public record RoomInitialData(String destination, RoomSettingResponse roomSettingResponse,
8-
GameSettingResponse gameSettingResponse,
9-
PlayerListResponse playerListResponse) {
10-
11-
}
7+
public record RoomInitialData(
8+
String destination,
9+
RoomSettingResponse roomSettingResponse,
10+
GameSettingResponse gameSettingResponse,
11+
PlayerListResponse playerListResponse) {}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.f1.backend.domain.game.dto;
22

3-
public interface WebSocketDto <T>{
3+
public interface WebSocketDto<T> {
44
MessageType getType();
5+
56
T getMessage();
67
}
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.request;
22

3-
public record RoomValidationRequest(Long roomId, String password) {
4-
5-
}
3+
public record RoomValidationRequest(Long roomId, String password) {}

backend/src/main/java/io/f1/backend/domain/game/dto/response/DefaultWebSocketResponse.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

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 GameSettingResponse(int round, int timeLimit, QuizResponse quiz) {
4-
5-
}
3+
public record GameSettingResponse(int round, int timeLimit, QuizResponse quiz) {}

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

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

33
import java.util.List;
44

5-
public record PlayerListResponse(String host, List<PlayerResponse> players) {
6-
7-
}
5+
public record PlayerListResponse(String host, List<PlayerResponse> players) {}
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 PlayerResponse(String nickname, boolean ready) {
4-
5-
}
3+
public record PlayerResponse(String nickname, boolean ready) {}
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
package io.f1.backend.domain.game.dto.response;
22

3-
public record QuizResponse(Long quizId, String title, String description, String thumbnailUrl,
4-
int numberOfQuestion) {
5-
6-
}
3+
public record QuizResponse(
4+
Long quizId, String title, String description, String thumbnailUrl, int numberOfQuestion) {}

0 commit comments

Comments
 (0)