Skip to content

Commit eb725c3

Browse files
author
github-actions
committed
chore: Java 스타일 수정
1 parent e254263 commit eb725c3

File tree

8 files changed

+44
-41
lines changed

8 files changed

+44
-41
lines changed

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,21 @@
55
import io.f1.backend.domain.user.dto.AuthenticationUser;
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 {
@@ -32,10 +36,10 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
3236
String providerId = Objects.requireNonNull(oAuth2User.getAttribute("id")).toString();
3337

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

4044
httpSession.setAttribute("OAuthUser", AuthenticationUser.from(user));
4145
return new UserPrincipal(user, oAuth2User.getAttributes());
@@ -48,11 +52,11 @@ private User updateLastLogin(User user) {
4852

4953
private User createNewUser(String provider, String providerId) {
5054
User user =
51-
User.builder()
52-
.provider(provider)
53-
.providerId(providerId)
54-
.lastLogin(LocalDateTime.now())
55-
.build();
55+
User.builder()
56+
.provider(provider)
57+
.providerId(providerId)
58+
.lastLogin(LocalDateTime.now())
59+
.build();
5660

5761
Stat stat = Stat.builder().totalGames(0L).winningGames(0L).score(0L).user(user).build();
5862

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
import io.f1.backend.domain.user.dto.SignupResponseDto;
99
import io.f1.backend.domain.user.entity.User;
1010
import io.f1.backend.global.util.SecurityUtils;
11+
1112
import jakarta.servlet.http.HttpSession;
13+
1214
import lombok.RequiredArgsConstructor;
15+
1316
import org.springframework.stereotype.Service;
1417
import org.springframework.transaction.annotation.Transactional;
1518

@@ -35,8 +38,8 @@ public SignupResponseDto signup(HttpSession session, SignupRequestDto signupRequ
3538
}
3639

3740
private AuthenticationUser extractSessionUser(HttpSession session) {
38-
AuthenticationUser authenticationUser = (AuthenticationUser) session.getAttribute(
39-
"OAuthUser");
41+
AuthenticationUser authenticationUser =
42+
(AuthenticationUser) session.getAttribute("OAuthUser");
4043
if (authenticationUser == null) {
4144
throw new RuntimeException("E401001: 로그인이 필요합니다.");
4245
}
@@ -65,8 +68,9 @@ public void validateNicknameDuplicate(String nickname) {
6568
@Transactional
6669
public User updateUserNickname(Long userId, String nickname) {
6770
User user =
68-
userRepository.findById(userId)
69-
.orElseThrow(() -> new RuntimeException("E404001: 존재하지 않는 회원입니다."));
71+
userRepository
72+
.findById(userId)
73+
.orElseThrow(() -> new RuntimeException("E404001: 존재하지 않는 회원입니다."));
7074
user.updateNickname(nickname);
7175

7276
return userRepository.save(user);
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package io.f1.backend.domain.user.dto;
22

33
import io.f1.backend.domain.user.entity.User;
4+
45
import java.io.Serializable;
56

6-
public record AuthenticationUser(Long userId, String nickname, String providerId) implements
7-
Serializable {
7+
public record AuthenticationUser(Long userId, String nickname, String providerId)
8+
implements Serializable {
89

910
public static AuthenticationUser from(User user) {
10-
return new AuthenticationUser(
11-
user.getId(),
12-
user.getNickname(),
13-
user.getProviderId()
14-
);
11+
return new AuthenticationUser(user.getId(), user.getNickname(), user.getProviderId());
1512
}
1613
}
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
package io.f1.backend.domain.user.dto;
22

3-
public record SignupResponseDto(Long id, String nickname) {
4-
5-
}
3+
public record SignupResponseDto(Long id, String nickname) {}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
package io.f1.backend.domain.user.dto;
22

33
import io.f1.backend.domain.user.entity.User;
4-
import java.util.Collection;
5-
import java.util.Collections;
6-
import java.util.Map;
4+
75
import lombok.Getter;
6+
87
import org.springframework.security.core.GrantedAuthority;
98
import org.springframework.security.core.userdetails.UserDetails;
109
import org.springframework.security.oauth2.core.user.OAuth2User;
1110

11+
import java.util.Collection;
12+
import java.util.Collections;
13+
import java.util.Map;
14+
1215
@Getter
1316
public class UserPrincipal implements UserDetails, OAuth2User {
1417

backend/src/main/java/io/f1/backend/domain/user/mapper/UserMapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
public class UserMapper {
77

8-
private UserMapper() {
9-
}
8+
private UserMapper() {}
109

1110
public static SignupResponseDto toSignupResponse(User user) {
1211
return new SignupResponseDto(user.getId(), user.getNickname());

backend/src/main/java/io/f1/backend/global/config/SecurityConfig.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,8 @@ public SecurityFilterChain userFilterChain(HttpSecurity http) throws Exception {
5959
.clearAuthentication(true)
6060
.invalidateHttpSession(true)
6161
.permitAll())
62-
.sessionManagement(session ->
63-
session
64-
.sessionFixation().migrateSession()
65-
.maximumSessions(1)
66-
);
62+
.sessionManagement(
63+
session -> session.sessionFixation().migrateSession().maximumSessions(1));
6764
return http.build();
6865
}
6966
}

backend/src/main/java/io/f1/backend/global/util/SecurityUtils.java

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

33
import io.f1.backend.domain.user.dto.UserPrincipal;
44
import io.f1.backend.domain.user.entity.User;
5-
import java.util.Collections;
5+
66
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
77
import org.springframework.security.core.Authentication;
88
import org.springframework.security.core.context.SecurityContextHolder;
99

10+
import java.util.Collections;
11+
1012
public class SecurityUtils {
1113

12-
private SecurityUtils() {
13-
}
14+
private SecurityUtils() {}
1415

1516
public static void setAuthentication(User user) {
1617
UserPrincipal userPrincipal = new UserPrincipal(user, Collections.emptyMap());
1718
UsernamePasswordAuthenticationToken authentication =
18-
new UsernamePasswordAuthenticationToken(
19-
userPrincipal, null, userPrincipal.getAuthorities());
19+
new UsernamePasswordAuthenticationToken(
20+
userPrincipal, null, userPrincipal.getAuthorities());
2021
SecurityContextHolder.getContext().setAuthentication(authentication);
2122
}
2223

2324
public static UserPrincipal getCurrentUserPrincipal() {
2425
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
2526
if (authentication != null
26-
&& authentication.getPrincipal() instanceof UserPrincipal userPrincipal) {
27+
&& authentication.getPrincipal() instanceof UserPrincipal userPrincipal) {
2728
return userPrincipal;
2829
}
2930
throw new RuntimeException("E401001: 로그인이 필요합니다.");

0 commit comments

Comments
 (0)