chore - #13 공백 컨벤션에 맞춤

Team-HMH · Jan 8, 2024 · 1b0d8f7 · 1b0d8f7
1 parent 1380799
commit 1b0d8f7
Show file tree

Hide file tree

Showing 32 changed files with 42 additions and 83 deletions.
diff --git a/src/main/java/sopt/org/HMH/HealthCheckApiController.java b/src/main/java/sopt/org/HMH/HealthCheckApiController.java
@@ -3,9 +3,11 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 @RequestMapping("/health")
 @RestController
 public class HealthCheckApiController {
+
     @GetMapping
     public String healthCheck() {
         return "hmh server ok!";

diff --git a/src/main/java/sopt/org/HMH/HmhApplication.java b/src/main/java/sopt/org/HMH/HmhApplication.java
@@ -11,5 +11,4 @@ public class HmhApplication {
     public static void main(String[] args) {
         SpringApplication.run(HmhApplication.class, args);
     }
-
 }
diff --git a/src/main/java/sopt/org/HMH/domain/user/controller/UserController.java b/src/main/java/sopt/org/HMH/domain/user/controller/UserController.java
@@ -9,8 +9,8 @@
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 import sopt.org.HMH.domain.user.domain.exception.UserSuccess;
-import sopt.org.HMH.domain.user.dto.request.SocialLoginRequestDto;
-import sopt.org.HMH.domain.user.dto.response.LoginResponseDto;
+import sopt.org.HMH.domain.user.dto.request.SocialLoginRequest;
+import sopt.org.HMH.domain.user.dto.response.LoginResponse;
 import sopt.org.HMH.domain.user.service.UserService;
 import sopt.org.HMH.global.auth.jwt.JwtProvider;
 import sopt.org.HMH.global.auth.jwt.TokenDto;
@@ -23,9 +23,9 @@ public class UserController {
     private final UserService userService;
 
     @PostMapping("/login")
-    public ResponseEntity<ApiResponse<LoginResponseDto>> login(
+    public ResponseEntity<ApiResponse<LoginResponse>> login(
             @RequestHeader("Authorization") String socialAccessToken,
-            @RequestBody SocialLoginRequestDto request
+            @RequestBody SocialLoginRequest request
     ) {
         return ResponseEntity
                 .status(UserSuccess.LOGIN_SUCCESS.getHttpStatus())
@@ -48,5 +48,4 @@ public ResponseEntity<ApiResponse<?>> logout(Principal principal) {
                 .status(UserSuccess.LOGOUT_SUCCESS.getHttpStatus())
                 .body(ApiResponse.success(UserSuccess.LOGOUT_SUCCESS));
     }
-
 }
diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/User.java b/src/main/java/sopt/org/HMH/domain/user/domain/User.java
@@ -23,6 +23,7 @@
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @Builder
 public class User extends BaseTimeEntity {
+
     @Id
     @Column(name = "user_id")
     @GeneratedValue(strategy = GenerationType.IDENTITY)

diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserError.java b/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserError.java
@@ -6,6 +6,7 @@
 
 @AllArgsConstructor
 public enum UserError implements ErrorBase {
+
     // 400 BAD REQUEST
     INVALID_USER(HttpStatus.BAD_REQUEST, "Principle 객체가 없습니다."),
 
@@ -15,11 +16,11 @@ public enum UserError implements ErrorBase {
 
     // 404 NOT FOUND
     NOT_FOUND_USER(HttpStatus.NOT_FOUND, "User를 찾을 수 없습니다."),
-    NOT_SIGNUP_USER(HttpStatus.NOT_FOUND, "회원가입된 유저가 아닙니다. 회원가입을 진행해주세요.")
-    ;
+    NOT_SIGNUP_USER(HttpStatus.NOT_FOUND, "회원가입된 유저가 아닙니다. 회원가입을 진행해주세요.");
 
     private final HttpStatus status;
     private final String errorMessage;
+
     @Override
     public int getHttpStatusCode() {
         return this.status.value();

diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserException.java b/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserException.java
@@ -1,9 +1,9 @@
 package sopt.org.HMH.domain.user.domain.exception;
 
-import sopt.org.HMH.global.auth.jwt.exception.JwtError;
 import sopt.org.HMH.global.common.exception.base.ExceptionBase;
 
 public class UserException extends ExceptionBase {
+
     public UserException(UserError errorBase) {
         super(errorBase);
     }

diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserSuccess.java b/src/main/java/sopt/org/HMH/domain/user/domain/exception/UserSuccess.java
@@ -6,6 +6,7 @@
 
 @AllArgsConstructor
 public enum UserSuccess implements SuccessBase {
+
     LOGIN_SUCCESS(HttpStatus.OK, "로그인에 성공했습니다."),
     REISSUE_SUCCESS(HttpStatus.OK, "Access 토큰 재발급에 성공했습니다."),
     LOGOUT_SUCCESS(HttpStatus.OK, "로그아웃에 성공했습니다."),
@@ -28,5 +29,4 @@ public HttpStatus getHttpStatus() {
     public String getSuccessMessage() {
         return this.successMessage;
     }
-
 }
diff --git a/src/main/java/sopt/org/HMH/domain/user/dto/request/SocialLoginRequestDto.java b/src/main/java/sopt/org/HMH/domain/user/dto/request/SocialLoginRequestDto.java
diff --git a/src/main/java/sopt/org/HMH/domain/user/dto/response/LoginResponseDto.java b/src/main/java/sopt/org/HMH/domain/user/dto/response/LoginResponseDto.java
diff --git a/src/main/java/sopt/org/HMH/domain/user/service/UserService.java b/src/main/java/sopt/org/HMH/domain/user/service/UserService.java
@@ -6,8 +6,8 @@
 import sopt.org.HMH.domain.user.domain.User;
 import sopt.org.HMH.domain.user.domain.exception.UserError;
 import sopt.org.HMH.domain.user.domain.exception.UserException;
-import sopt.org.HMH.domain.user.dto.request.SocialLoginRequestDto;
-import sopt.org.HMH.domain.user.dto.response.LoginResponseDto;
+import sopt.org.HMH.domain.user.dto.request.SocialLoginRequest;
+import sopt.org.HMH.domain.user.dto.response.LoginResponse;
 import sopt.org.HMH.domain.user.repository.UserRepository;
 import sopt.org.HMH.global.auth.jwt.JwtProvider;
 import sopt.org.HMH.global.auth.jwt.TokenDto;
@@ -27,7 +27,7 @@ public class UserService {
     private final KakaoLoginService kakaoLoginService;
 
     @Transactional
-    public LoginResponseDto login(String socialAccessToken, SocialLoginRequestDto request) {
+    public LoginResponse login(String socialAccessToken, SocialLoginRequest request) {
         socialAccessToken = parseTokenString(socialAccessToken);
         SocialPlatform socialPlatform = request.getSocialPlatform();
         Long socialId = getUserIdBySocialAccessToken(socialPlatform, socialAccessToken);
@@ -40,7 +40,7 @@ public LoginResponseDto login(String socialAccessToken, SocialLoginRequestDto re
 
         TokenDto tokenDto = jwtProvider.issueToken(new UserAuthentication(loginUser.getId(), null, null));
 
-        return LoginResponseDto.of(loginUser, tokenDto);
+        return LoginResponse.of(loginUser, tokenDto);
     }
 
     @Transactional

diff --git a/src/main/java/sopt/org/HMH/global/auth/jwt/JwtProvider.java b/src/main/java/sopt/org/HMH/global/auth/jwt/JwtProvider.java
@@ -177,7 +177,6 @@ public static Long getUserFromPrincipal(Principal principal) {
         if (isNull(principal)) {
             throw new JwtException(JwtError.EMPTY_PRINCIPLE_EXCEPTION);
         }
-
         return Long.valueOf(principal.getName());
     }
 }
diff --git a/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtError.java b/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtError.java
@@ -19,12 +19,11 @@ public enum JwtError implements ErrorBase {
     // 403 FORBIDDEN
 
     // 404 NOT FOUND
-    NOT_FOUND_REFRESH_TOKEN_ERROR(HttpStatus.NOT_FOUND, "존재하지 않는 리프레시 토큰입니다.")
-
-    ;
+    NOT_FOUND_REFRESH_TOKEN_ERROR(HttpStatus.NOT_FOUND, "존재하지 않는 리프레시 토큰입니다.");
 
     private final HttpStatus status;
     private final String errorMessage;
+
     @Override
     public int getHttpStatusCode() {
         return this.status.value();

diff --git a/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtException.java b/src/main/java/sopt/org/HMH/global/auth/jwt/exception/JwtException.java
@@ -3,6 +3,7 @@
 import sopt.org.HMH.global.common.exception.base.ExceptionBase;
 
 public class JwtException extends ExceptionBase {
+
     public JwtException(JwtError errorBase) {
         super(errorBase);
     }

diff --git a/src/main/java/sopt/org/HMH/global/auth/redis/RefreshToken.java b/src/main/java/sopt/org/HMH/global/auth/redis/RefreshToken.java
@@ -1,5 +1,6 @@
 package sopt.org.HMH.global.auth.redis;
 
+import java.util.concurrent.TimeUnit;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -8,8 +9,6 @@
 import org.springframework.data.redis.core.RedisHash;
 import org.springframework.data.redis.core.TimeToLive;
 
-import java.util.concurrent.TimeUnit;
-
 @Getter
 @RedisHash(value = "refresh")
 @Builder
@@ -19,7 +18,6 @@ public class RefreshToken {
 
     @Id
     private String refreshToken;
-
     private Long userId;
 
     @TimeToLive(unit = TimeUnit.SECONDS)

diff --git a/src/main/java/sopt/org/HMH/global/auth/security/CustomJwtAuthenticationEntryPoint.java b/src/main/java/sopt/org/HMH/global/auth/security/CustomJwtAuthenticationEntryPoint.java
@@ -3,12 +3,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;
-
-import java.io.IOException;
 import sopt.org.HMH.global.auth.jwt.exception.JwtError;
 import sopt.org.HMH.global.common.response.ApiResponse;
 
@@ -22,7 +21,8 @@ public class CustomJwtAuthenticationEntryPoint implements AuthenticationEntryPoi
     private final ObjectMapper objectMapper = new ObjectMapper();
 
     @Override
-    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException {
+    public void commence(HttpServletRequest request, HttpServletResponse response,
+                         AuthenticationException authException) throws IOException {
         setResponse(response);
     }
 

diff --git a/src/main/java/sopt/org/HMH/global/auth/security/UserAuthentication.java b/src/main/java/sopt/org/HMH/global/auth/security/UserAuthentication.java
@@ -1,13 +1,13 @@
 package sopt.org.HMH.global.auth.security;
 
+import java.util.Collection;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 
-import java.util.Collection;
-
 public class UserAuthentication extends UsernamePasswordAuthenticationToken {
 
-    public UserAuthentication(Object principal, Object credentials, Collection<? extends GrantedAuthority> authorities) {
+    public UserAuthentication(Object principal, Object credentials,
+                              Collection<? extends GrantedAuthority> authorities) {
         super(principal, credentials, authorities);
     }
 }
diff --git a/src/main/java/sopt/org/HMH/global/auth/social/SocialPlatform.java b/src/main/java/sopt/org/HMH/global/auth/social/SocialPlatform.java
@@ -7,6 +7,7 @@
 @Getter
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public enum SocialPlatform {
+
     KAKAO("kakao"),
     ;
 

diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoAccessTokenResponse.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoAccessTokenResponse.java
@@ -1,8 +1,10 @@
 package sopt.org.HMH.global.auth.social.kakao.fegin;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @ToString
 @Getter

diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoApiClient.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoApiClient.java
@@ -1,7 +1,7 @@
 package sopt.org.HMH.global.auth.social.kakao.fegin;
 
-import org.springframework.http.HttpHeaders;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import sopt.org.HMH.global.auth.social.kakao.response.KakaoUserResponse;

diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoLoginService.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/fegin/KakaoLoginService.java
@@ -1,7 +1,6 @@
 package sopt.org.HMH.global.auth.social.kakao.fegin;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import sopt.org.HMH.domain.user.domain.User;
@@ -33,5 +32,4 @@ public void updateUserInfoByKakao(User loginUser, String socialAccessToken) {
         loginUser.updateSocialInfo(userResponse.getKakaoAccount().getProfile().getNickname(),
                 userResponse.getKakaoAccount().getProfile().getProfileImageUrl());
     }
-
 }
diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoAccount.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoAccount.java
@@ -1,8 +1,10 @@
 package sopt.org.HMH.global.auth.social.kakao.response;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @ToString
 @Getter

diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserProfile.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserProfile.java
@@ -1,7 +1,5 @@
 package sopt.org.HMH.global.auth.social.kakao.response;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserResponse.java b/src/main/java/sopt/org/HMH/global/auth/social/kakao/response/KakaoUserResponse.java
@@ -1,7 +1,5 @@
 package sopt.org.HMH.global.auth.social.kakao.response;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/src/main/java/sopt/org/HMH/global/common/domain/BaseTimeEntity.java b/src/main/java/sopt/org/HMH/global/common/domain/BaseTimeEntity.java
@@ -18,5 +18,4 @@ public abstract class BaseTimeEntity {
 
     @LastModifiedDate
     private LocalDateTime updatedAt;
-
 }
diff --git a/src/main/java/sopt/org/HMH/global/common/exception/GlobalError.java b/src/main/java/sopt/org/HMH/global/common/exception/GlobalError.java
@@ -26,5 +26,4 @@ public HttpStatus getHttpStatus() {
     public String getErrorMessage() {
         return this.errorMessage;
     }
-
 }
diff --git a/src/main/java/sopt/org/HMH/global/common/exception/GlobalSuccess.java b/src/main/java/sopt/org/HMH/global/common/exception/GlobalSuccess.java
@@ -26,5 +26,4 @@ public HttpStatus getHttpStatus() {
     public String getSuccessMessage() {
         return this.successMessage;
     }
-
 }
diff --git a/src/main/java/sopt/org/HMH/global/common/exception/base/ErrorBase.java b/src/main/java/sopt/org/HMH/global/common/exception/base/ErrorBase.java
@@ -3,6 +3,7 @@
 import org.springframework.http.HttpStatus;
 
 public interface ErrorBase extends RootEnum {
+
     int getHttpStatusCode();
 
     HttpStatus getHttpStatus();

diff --git a/src/main/java/sopt/org/HMH/global/common/exception/base/ExceptionBase.java b/src/main/java/sopt/org/HMH/global/common/exception/base/ExceptionBase.java
@@ -4,6 +4,7 @@
  * 하위 도메인 예외는 본 Exception 클래스를 상속 받습니다.
  */
 public abstract class ExceptionBase extends RuntimeException {
+
     private static final String ERROR_MESSAGE_HEADER = "ERROR : ";
 
     private final ErrorBase errorBase;

diff --git a/src/main/java/sopt/org/HMH/global/common/exception/base/SuccessBase.java b/src/main/java/sopt/org/HMH/global/common/exception/base/SuccessBase.java
@@ -3,10 +3,10 @@
 import org.springframework.http.HttpStatus;
 
 public interface SuccessBase extends RootEnum {
+
     int getHttpStatusCode();
 
     HttpStatus getHttpStatus();
 
     String getSuccessMessage();
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,5 +11,4 @@ public class HmhApplication { @@
         public static void main(String[] args) {
             SpringApplication.run(HmhApplication.class, args);
         }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,5 +18,4 @@ public abstract class BaseTimeEntity {

		@LastModifiedDate
		private LocalDateTime updatedAt;

		}