Skip to content

Commit fccf956

Browse files
committed
refactor: checkstyle 오류 제거
1 parent 3411772 commit fccf956

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

src/main/java/com/example/log4u/common/oauth2/dto/CustomOAuth2User.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,20 @@
77
import org.springframework.security.core.GrantedAuthority;
88
import org.springframework.security.oauth2.core.user.OAuth2User;
99

10+
import com.example.log4u.domain.user.dto.UserCreateRequestDto;
1011
import com.example.log4u.domain.user.entity.User;
1112

12-
import lombok.Getter;
13-
1413
public class CustomOAuth2User implements OAuth2User {
1514
private final UserCreateRequestDto userCreateRequestDto;
1615

1716
public CustomOAuth2User(UserCreateRequestDto userCreateRequestDto) {
1817
this.userCreateRequestDto = userCreateRequestDto;
1918
}
2019

21-
public CustomOAuth2User(User user){
20+
public CustomOAuth2User(User user) {
2221
this.userCreateRequestDto = UserCreateRequestDto.fromEntity(user);
2322
}
2423

25-
2624
@Override
2725
public Map<String, Object> getAttributes() {
2826
return Map.of();
@@ -40,11 +38,15 @@ public String getName() {
4038
return userCreateRequestDto.name();
4139
}
4240

43-
public String getRole() { return userCreateRequestDto.role();}
41+
public String getRole() {
42+
return userCreateRequestDto.role();
43+
}
4444

4545
public String getProviderId() {
4646
return userCreateRequestDto.providerId();
4747
}
4848

49-
public Long getUserId() { return userCreateRequestDto.userId(); }
49+
public Long getUserId() {
50+
return userCreateRequestDto.userId();
51+
}
5052
}

src/main/java/com/example/log4u/common/oauth2/service/CustomOAuth2UserService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.example.log4u.common.oauth2.dto.KakaoResponseDto;
1414
import com.example.log4u.common.oauth2.dto.NaverResponseDto;
1515
import com.example.log4u.common.oauth2.dto.OAuth2Response;
16-
import com.example.log4u.common.oauth2.dto.UserCreateRequestDto;
16+
import com.example.log4u.domain.user.dto.UserCreateRequestDto;
1717
import com.example.log4u.domain.user.entity.User;
1818
import com.example.log4u.domain.user.repository.UserRepository;
1919

@@ -34,6 +34,7 @@ public class CustomOAuth2UserService extends DefaultOAuth2UserService {
3434
@Override
3535
public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
3636
OAuth2User oAuth2User = super.loadUser(userRequest);
37+
// registrationId = 소셜 로그인 타입
3738
String registrationId = userRequest.getClientRegistration().getRegistrationId();
3839

3940
// 정보 가공

src/main/java/com/example/log4u/domain/user/controller/UserController.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.example.log4u.domain.user.controller;
22

3-
43
import org.springframework.security.core.annotation.AuthenticationPrincipal;
54
import org.springframework.web.bind.annotation.GetMapping;
65
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,8 +17,8 @@ public class UserController {
1817
@GetMapping("")
1918
public String modifyUserProfile(
2019
@AuthenticationPrincipal CustomOAuth2User customOAuth2User
21-
){
22-
log.info("테스트 GET DATA user = " + customOAuth2User.getUserId() );
20+
) {
21+
log.info("테스트 GET DATA user = " + customOAuth2User.getUserId());
2322
return "test";
2423
}
2524
}

src/main/java/com/example/log4u/domain/user/service/UserService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public class UserService {
1414
private final UserRepository userRepository;
1515

16-
public User getUserById(Long userId){
16+
public User getUserById(Long userId) {
1717
return userRepository.findById(userId).orElseThrow(
1818
UserNotFoundException::new
1919
);

src/main/resources/application.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ spring:
118118
scope:
119119
- profile
120120
- email
121-
-
121+
122122
kakao:
123123
client-name: kakao
124124
client-id: ${kakao.client-id}
@@ -130,6 +130,7 @@ spring:
130130
- profile_nickname
131131
- profile_image
132132
- account_email
133+
-
133134
provider:
134135
naver:
135136
authorization-uri: https://nid.naver.com/oauth2.0/authorize

0 commit comments

Comments
 (0)