Skip to content

Commit 53fa387

Browse files
author
github-actions
committed
chore: Java 스타일 수정
1 parent 22cb370 commit 53fa387

File tree

15 files changed

+113
-83
lines changed

15 files changed

+113
-83
lines changed

backend/src/main/java/io/f1/backend/domain/stat/entity/Stat.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import jakarta.persistence.Id;
1212
import jakarta.persistence.JoinColumn;
1313
import jakarta.persistence.OneToOne;
14+
1415
import lombok.AccessLevel;
1516
import lombok.Builder;
1617
import lombok.NoArgsConstructor;

backend/src/main/java/io/f1/backend/domain/user/api/SignupController.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
import io.f1.backend.domain.user.app.UserService;
44
import io.f1.backend.domain.user.dto.SignupRequestDto;
55
import io.f1.backend.domain.user.dto.SignupResponseDto;
6+
67
import jakarta.servlet.http.HttpSession;
8+
79
import lombok.RequiredArgsConstructor;
10+
811
import org.springframework.http.HttpStatus;
912
import org.springframework.http.ResponseEntity;
1013
import org.springframework.web.bind.annotation.PostMapping;
@@ -19,7 +22,7 @@ public class SignupController {
1922

2023
@PostMapping("/signup")
2124
public ResponseEntity<SignupResponseDto> completeSignup(
22-
@RequestBody SignupRequestDto signupRequest, HttpSession httpSession) {
25+
@RequestBody SignupRequestDto signupRequest, HttpSession httpSession) {
2326
SignupResponseDto response = userService.signup(httpSession, signupRequest);
2427
return ResponseEntity.status(HttpStatus.CREATED).body(response);
2528
}

backend/src/main/java/io/f1/backend/domain/user/app/CustomOAuthUserService.java

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,21 @@
55
import io.f1.backend.domain.user.dto.SessionUser;
66
import io.f1.backend.domain.user.dto.UserPrincipal;
77
import io.f1.backend.domain.user.entity.User;
8+
89
import jakarta.servlet.http.HttpSession;
9-
import java.time.LocalDateTime;
10-
import java.util.Objects;
10+
1111
import lombok.RequiredArgsConstructor;
12+
1213
import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
1314
import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
1415
import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
1516
import org.springframework.security.oauth2.core.user.OAuth2User;
1617
import org.springframework.stereotype.Service;
1718
import org.springframework.transaction.annotation.Transactional;
1819

20+
import java.time.LocalDateTime;
21+
import java.util.Objects;
22+
1923
@Service
2024
@RequiredArgsConstructor
2125
public class CustomOAuthUserService extends DefaultOAuth2UserService {
@@ -31,9 +35,11 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
3135
String provider = userRequest.getClientRegistration().getRegistrationId();
3236
String providerId = Objects.requireNonNull(oAuth2User.getAttribute("id")).toString();
3337

34-
User user = userRepository.findByProviderAndProviderId(provider, providerId)
35-
.map(this::updateLastLogin)
36-
.orElseGet(() -> createNewUser(provider, providerId));
38+
User user =
39+
userRepository
40+
.findByProviderAndProviderId(provider, providerId)
41+
.map(this::updateLastLogin)
42+
.orElseGet(() -> createNewUser(provider, providerId));
3743

3844
httpSession.setAttribute("OAuthUser", new SessionUser(user));
3945
return new UserPrincipal(user, oAuth2User.getAttributes());
@@ -45,18 +51,14 @@ private User updateLastLogin(User user) {
4551
}
4652

4753
private User createNewUser(String provider, String providerId) {
48-
User user = User.builder()
49-
.provider(provider)
50-
.providerId(providerId)
51-
.lastLogin(LocalDateTime.now())
52-
.build();
54+
User user =
55+
User.builder()
56+
.provider(provider)
57+
.providerId(providerId)
58+
.lastLogin(LocalDateTime.now())
59+
.build();
5360

54-
Stat stat = Stat.builder()
55-
.totalGames(0L)
56-
.winningGames(0L)
57-
.score(0L)
58-
.user(user)
59-
.build();
61+
Stat stat = Stat.builder().totalGames(0L).winningGames(0L).score(0L).user(user).build();
6062

6163
user.initStat(stat);
6264
return userRepository.save(user);

backend/src/main/java/io/f1/backend/domain/user/app/UserService.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
import io.f1.backend.domain.user.dto.SignupResponseDto;
77
import io.f1.backend.domain.user.entity.User;
88
import io.f1.backend.global.util.SecurityUtils;
9+
910
import jakarta.servlet.http.HttpSession;
11+
1012
import lombok.RequiredArgsConstructor;
13+
1114
import org.springframework.stereotype.Service;
1215
import org.springframework.transaction.annotation.Transactional;
1316

@@ -59,8 +62,8 @@ private void validateDuplicateNickname(String nickname) {
5962
}
6063

6164
private User updateUserNickname(Long userId, String nickname) {
62-
User user = userRepository.findById(userId)
63-
.orElseThrow(() -> new RuntimeException("사용자 없음"));
65+
User user =
66+
userRepository.findById(userId).orElseThrow(() -> new RuntimeException("사용자 없음"));
6467
user.updateNickname(nickname);
6568

6669
return userRepository.save(user);

backend/src/main/java/io/f1/backend/domain/user/app/handler/CustomAuthenticationEntryPoint.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,24 @@
22

33
import jakarta.servlet.http.HttpServletRequest;
44
import jakarta.servlet.http.HttpServletResponse;
5-
import java.io.IOException;
5+
66
import org.springframework.security.core.AuthenticationException;
77
import org.springframework.security.web.AuthenticationEntryPoint;
88
import org.springframework.stereotype.Component;
99

10+
import java.io.IOException;
11+
1012
@Component
1113
public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint {
1214

1315
@Override
14-
public void commence(HttpServletRequest request, HttpServletResponse response,
15-
AuthenticationException authException) throws IOException {
16+
public void commence(
17+
HttpServletRequest request,
18+
HttpServletResponse response,
19+
AuthenticationException authException)
20+
throws IOException {
1621
response.setContentType("application/json;charset=UTF-8");
1722
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); // 401
1823
response.getWriter().write("{\"error\": \"Unauthorized\"}");
1924
}
20-
}
25+
}

backend/src/main/java/io/f1/backend/domain/user/app/handler/OAuthLogoutSuccessHandler.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import jakarta.servlet.http.HttpServletRequest;
44
import jakarta.servlet.http.HttpServletResponse;
5+
56
import org.springframework.security.core.Authentication;
67
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
78
import org.springframework.stereotype.Component;
@@ -10,8 +11,10 @@
1011
public class OAuthLogoutSuccessHandler implements LogoutSuccessHandler {
1112

1213
@Override
13-
public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response,
14-
Authentication authentication) {
14+
public void onLogoutSuccess(
15+
HttpServletRequest request,
16+
HttpServletResponse response,
17+
Authentication authentication) {
1518
response.setStatus(HttpServletResponse.SC_NO_CONTENT); // 204
1619
}
1720
}
Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,42 @@
11
package io.f1.backend.domain.user.app.handler;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
4+
45
import io.f1.backend.domain.user.dto.UserPrincipal;
6+
57
import jakarta.servlet.http.HttpServletRequest;
68
import jakarta.servlet.http.HttpServletResponse;
7-
import jakarta.servlet.http.HttpSession;
8-
import java.io.IOException;
9-
import java.util.Map;
9+
1010
import lombok.RequiredArgsConstructor;
11+
1112
import org.springframework.security.core.Authentication;
1213
import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
1314
import org.springframework.stereotype.Component;
1415

16+
import java.io.IOException;
17+
import java.util.Map;
18+
1519
@Component
1620
@RequiredArgsConstructor
1721
public class OAuthSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
1822

1923
private final ObjectMapper objectMapper;
2024

2125
@Override
22-
public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
23-
Authentication authentication) throws IOException {
26+
public void onAuthenticationSuccess(
27+
HttpServletRequest request, HttpServletResponse response, Authentication authentication)
28+
throws IOException {
2429
UserPrincipal principal = (UserPrincipal) authentication.getPrincipal();
2530
response.setContentType("application/json;charset=UTF-8");
2631

2732
if (principal.getUserNickname() == null) {
2833
// 닉네임 설정 필요 → 202 Accepted
2934
response.setStatus(HttpServletResponse.SC_ACCEPTED);
30-
objectMapper.writeValue(response.getWriter(), Map.of(
31-
"message", "닉네임을 설정하세요."
32-
));
35+
objectMapper.writeValue(response.getWriter(), Map.of("message", "닉네임을 설정하세요."));
3336
} else {
3437
// 정상 로그인 → 200 OK
3538
response.setStatus(HttpServletResponse.SC_OK);
36-
objectMapper.writeValue(response.getWriter(), Map.of(
37-
"message", "로그인 성공"
38-
));
39+
objectMapper.writeValue(response.getWriter(), Map.of("message", "로그인 성공"));
3940
}
4041
}
4142
}

backend/src/main/java/io/f1/backend/domain/user/dao/UserRepository.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package io.f1.backend.domain.user.dao;
22

33
import io.f1.backend.domain.user.entity.User;
4-
import java.util.Optional;
4+
55
import org.springframework.data.jpa.repository.JpaRepository;
66
import org.springframework.stereotype.Repository;
77

8+
import java.util.Optional;
9+
810
@Repository
911
public interface UserRepository extends JpaRepository<User, Long> {
1012

backend/src/main/java/io/f1/backend/domain/user/dto/SessionUser.java

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

33
import io.f1.backend.domain.user.entity.User;
4+
5+
import lombok.Getter;
6+
47
import java.io.Serializable;
58
import java.time.LocalDateTime;
6-
import lombok.Getter;
79

810
@Getter
911
public class SessionUser implements Serializable {
@@ -19,4 +21,4 @@ public SessionUser(User user) {
1921
this.providerId = user.getProviderId();
2022
this.lastLogin = user.getLastLogin();
2123
}
22-
}
24+
}

backend/src/main/java/io/f1/backend/domain/user/dto/SignupRequestDto.java

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

33
import jakarta.validation.constraints.NotBlank;
44

5-
public record SignupRequestDto(@NotBlank(message = "닉네임을 입력하세요") String nickname) {
6-
7-
}
5+
public record SignupRequestDto(@NotBlank(message = "닉네임을 입력하세요") String nickname) {}

0 commit comments

Comments
 (0)