Skip to content

Commit 6a6507b

Browse files
author
github-actions
committed
chore: Java 스타일 수정
1 parent b230602 commit 6a6507b

File tree

8 files changed

+60
-35
lines changed

8 files changed

+60
-35
lines changed

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

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,18 @@
4545
import io.f1.backend.global.exception.CustomException;
4646
import io.f1.backend.global.exception.errorcode.RoomErrorCode;
4747
import io.f1.backend.global.exception.errorcode.UserErrorCode;
48+
49+
import lombok.RequiredArgsConstructor;
50+
import lombok.extern.slf4j.Slf4j;
51+
52+
import org.springframework.context.ApplicationEventPublisher;
53+
import org.springframework.stereotype.Service;
54+
4855
import java.util.List;
4956
import java.util.Map;
5057
import java.util.Optional;
5158
import java.util.concurrent.ConcurrentHashMap;
5259
import java.util.concurrent.atomic.AtomicLong;
53-
import lombok.RequiredArgsConstructor;
54-
import lombok.extern.slf4j.Slf4j;
55-
import org.springframework.context.ApplicationEventPublisher;
56-
import org.springframework.stereotype.Service;
5760

5861
@Slf4j
5962
@Service
@@ -110,7 +113,7 @@ public void enterRoom(RoomValidationRequest request) {
110113
Long userId = getCurrentUserId();
111114

112115
/* 다른 방 접속 시 기존 방은 exit 처리 - 탭 동시 로그인 시 (disconnected 리스너 작동x) */
113-
exitIfInAnotherRoom(room, getCurrentUserPrincipal() );
116+
exitIfInAnotherRoom(room, getCurrentUserPrincipal());
114117

115118
/* reconnect */
116119
if (room.hasPlayer(userId)) {
@@ -135,7 +138,7 @@ public void enterRoom(RoomValidationRequest request) {
135138
}
136139
}
137140

138-
private void exitIfInAnotherRoom(Room room,UserPrincipal userPrincipal) {
141+
private void exitIfInAnotherRoom(Room room, UserPrincipal userPrincipal) {
139142
Long userId = userPrincipal.getUserId();
140143
Long joinedRoomId = getRoomIdByUserId(userId);
141144

@@ -155,7 +158,7 @@ public void initializeRoomSocket(Long roomId, UserPrincipal principal) {
155158

156159
/* 재연결 */
157160
if (room.isPlayerInState(userId, ConnectionState.DISCONNECTED)) {
158-
changeConnectedStatus(roomId,userId, ConnectionState.CONNECTED);
161+
changeConnectedStatus(roomId, userId, ConnectionState.CONNECTED);
159162
cancelTask(userId);
160163
reconnectSendResponse(roomId, principal);
161164
return;
@@ -181,7 +184,10 @@ public void initializeRoomSocket(Long roomId, UserPrincipal principal) {
181184
userRoomRepository.addUser(player, room);
182185

183186
messageSender.sendPersonal(
184-
getUserDestination(), MessageType.GAME_SETTING, gameSettingResponse, principal.getName());
187+
getUserDestination(),
188+
MessageType.GAME_SETTING,
189+
gameSettingResponse,
190+
principal.getName());
185191

186192
messageSender.sendBroadcast(destination, MessageType.ROOM_SETTING, roomSettingResponse);
187193
messageSender.sendBroadcast(destination, MessageType.PLAYER_LIST, playerListResponse);
@@ -278,15 +284,24 @@ public void reconnectSendResponse(Long roomId, UserPrincipal principal) {
278284
PlayerListResponse playerListResponse = toPlayerListResponse(room);
279285

280286
messageSender.sendPersonal(
281-
userDestination, MessageType.ROOM_SETTING, roomSettingResponse, principal.getName());
287+
userDestination,
288+
MessageType.ROOM_SETTING,
289+
roomSettingResponse,
290+
principal.getName());
282291
messageSender.sendPersonal(
283-
userDestination, MessageType.PLAYER_LIST, playerListResponse, principal.getName());
292+
userDestination,
293+
MessageType.PLAYER_LIST,
294+
playerListResponse,
295+
principal.getName());
284296
messageSender.sendPersonal(
285-
userDestination, MessageType.GAME_SETTING, gameSettingResponse, principal.getName());
297+
userDestination,
298+
MessageType.GAME_SETTING,
299+
gameSettingResponse,
300+
principal.getName());
286301
}
287302
}
288303

289-
public void changeConnectedStatus(Long roomId,Long userId, ConnectionState newState) {
304+
public void changeConnectedStatus(Long roomId, Long userId, ConnectionState newState) {
290305
Room room = findRoom(roomId);
291306
room.updatePlayerConnectionState(userId, newState);
292307
}
@@ -295,10 +310,11 @@ public void cancelTask(Long userId) {
295310
disconnectTasks.cancelDisconnectTask(userId);
296311
}
297312

298-
public void disconnectOrExitRoom(Long roomId , UserPrincipal principal) {
313+
public void disconnectOrExitRoom(Long roomId, UserPrincipal principal) {
299314
Room room = findRoom(roomId);
300315
if (room.isPlaying()) {
301-
changeConnectedStatus(room.getId(), principal.getUserId(), ConnectionState.DISCONNECTED);
316+
changeConnectedStatus(
317+
room.getId(), principal.getUserId(), ConnectionState.DISCONNECTED);
302318
removeUserRepository(principal.getUserId(), roomId);
303319
} else {
304320
exitRoom(room.getId(), principal);

‎backend/src/main/java/io/f1/backend/domain/game/dto/response/HeartbeatResponse.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 HeartbeatResponse (String direction){
4-
5-
}
3+
public record HeartbeatResponse(String direction) {}

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@
66
import io.f1.backend.domain.game.dto.MessageType;
77
import io.f1.backend.domain.game.dto.response.HeartbeatResponse;
88
import io.f1.backend.domain.user.dto.UserPrincipal;
9-
import java.security.Principal;
10-
import java.util.Map;
11-
import java.util.concurrent.ConcurrentHashMap;
9+
1210
import lombok.RequiredArgsConstructor;
1311
import lombok.extern.slf4j.Slf4j;
12+
1413
import org.springframework.messaging.simp.user.SimpSession;
1514
import org.springframework.messaging.simp.user.SimpUser;
1615
import org.springframework.messaging.simp.user.SimpUserRegistry;
1716
import org.springframework.scheduling.annotation.Scheduled;
1817
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
1918
import org.springframework.stereotype.Component;
2019

20+
import java.security.Principal;
21+
import java.util.Map;
22+
import java.util.concurrent.ConcurrentHashMap;
23+
2124
@Slf4j
2225
@Component
2326
@RequiredArgsConstructor
@@ -40,17 +43,23 @@ public void monitorClientHeartbeat() {
4043
return;
4144
}
4245

43-
simpUserRegistry.getUsers().forEach(user ->
44-
user.getSessions().forEach(session -> handleSessionHeartbeat(user, session)));
45-
46+
simpUserRegistry
47+
.getUsers()
48+
.forEach(
49+
user ->
50+
user.getSessions()
51+
.forEach(session -> handleSessionHeartbeat(user, session)));
4652
}
4753

4854
private void handleSessionHeartbeat(SimpUser user, SimpSession session) {
4955
String sessionId = session.getId();
5056

5157
/* pong */
52-
messageSender.sendPersonal(getUserDestination(),
53-
MessageType.HEARTBEAT, new HeartbeatResponse(DIRECTION), user.getName());
58+
messageSender.sendPersonal(
59+
getUserDestination(),
60+
MessageType.HEARTBEAT,
61+
new HeartbeatResponse(DIRECTION),
62+
user.getName());
5463

5564
missedPongCounter.merge(sessionId, 1, Integer::sum);
5665
int missedCnt = missedPongCounter.get(sessionId);
@@ -60,8 +69,8 @@ private void handleSessionHeartbeat(SimpUser user, SimpSession session) {
6069

6170
Principal principal = user.getPrincipal();
6271

63-
if (principal instanceof UsernamePasswordAuthenticationToken token &&
64-
token.getPrincipal() instanceof UserPrincipal userPrincipal) {
72+
if (principal instanceof UsernamePasswordAuthenticationToken token
73+
&& token.getPrincipal() instanceof UserPrincipal userPrincipal) {
6574

6675
Long userId = userPrincipal.getUserId();
6776
Long roomId = roomService.getRoomIdByUserId(userId);
@@ -79,5 +88,4 @@ public void resetMissedPongCount(String sessionId) {
7988
public void cleanSession(String sessionId) {
8089
missedPongCounter.remove(sessionId);
8190
}
82-
8391
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import io.f1.backend.domain.game.dto.MessageType;
44
import io.f1.backend.domain.game.dto.response.DefaultWebSocketResponse;
5+
56
import lombok.RequiredArgsConstructor;
7+
68
import org.springframework.messaging.simp.SimpMessagingTemplate;
79
import org.springframework.stereotype.Component;
810

@@ -20,6 +22,6 @@ public <T> void sendBroadcast(String destination, MessageType type, T message) {
2022
public <T> void sendPersonal(
2123
String destination, MessageType type, T message, String principalName) {
2224
messagingTemplate.convertAndSendToUser(
23-
principalName, destination, new DefaultWebSocketResponse<>(type, message));
25+
principalName, destination, new DefaultWebSocketResponse<>(type, message));
2426
}
2527
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void initializeRoomSocket(@DestinationVariable Long roomId, Message<?> me
3939
public void reconnect(@DestinationVariable Long roomId, Message<?> message) {
4040

4141
UserPrincipal principal = getSessionUser(message);
42-
roomService.changeConnectedStatus(roomId,principal.getUserId(), ConnectionState.CONNECTED);
42+
roomService.changeConnectedStatus(roomId, principal.getUserId(), ConnectionState.CONNECTED);
4343
roomService.reconnectSendResponse(roomId, principal);
4444
}
4545

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import static io.f1.backend.domain.game.websocket.WebSocketUtils.getSessionId;
44

55
import io.f1.backend.domain.game.websocket.HeartbeatMonitor;
6+
67
import lombok.RequiredArgsConstructor;
8+
79
import org.springframework.messaging.Message;
810
import org.springframework.messaging.handler.annotation.MessageMapping;
911
import org.springframework.stereotype.Controller;
@@ -20,5 +22,4 @@ public void handlePong(Message<?> message) {
2022

2123
heartbeatMonitor.resetMissedPongCount(sessionId);
2224
}
23-
2425
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.f1.backend.domain.game.websocket.eventlistener;
22

3-
import static io.f1.backend.domain.game.websocket.WebSocketUtils.getSessionId;
43
import static io.f1.backend.domain.game.websocket.WebSocketUtils.getSessionUser;
54

65
import io.f1.backend.domain.game.app.RoomService;
@@ -43,14 +42,14 @@ public void handleDisconnectedListener(SessionDisconnectEvent event) {
4342

4443
Long roomId = roomService.getRoomIdByUserId(userId);
4544

46-
roomService.changeConnectedStatus(roomId,userId,ConnectionState.DISCONNECTED);
45+
roomService.changeConnectedStatus(roomId, userId, ConnectionState.DISCONNECTED);
4746

4847
taskManager.scheduleDisconnectTask(
4948
userId,
5049
() -> {
5150
if (ConnectionState.DISCONNECTED.equals(
5251
roomService.getPlayerState(userId, roomId))) {
53-
roomService.disconnectOrExitRoom(roomId,principal);
52+
roomService.disconnectOrExitRoom(roomId, principal);
5453
}
5554
});
5655
}

‎backend/src/main/java/io/f1/backend/global/config/WebSocketConfig.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.f1.backend.global.config;
22

33
import lombok.RequiredArgsConstructor;
4+
45
import org.springframework.context.annotation.Configuration;
56
import org.springframework.messaging.simp.config.ChannelRegistration;
67
import org.springframework.messaging.simp.config.MessageBrokerRegistry;
@@ -25,7 +26,7 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
2526

2627
@Override
2728
public void configureMessageBroker(MessageBrokerRegistry registry) {
28-
registry.enableSimpleBroker("/sub", "/queue").setHeartbeatValue(new long[]{0, 0});
29+
registry.enableSimpleBroker("/sub", "/queue").setHeartbeatValue(new long[] {0, 0});
2930
registry.setApplicationDestinationPrefixes("/pub");
3031

3132
registry.setUserDestinationPrefix("/user");

0 commit comments

Comments
 (0)