[Style] 필드 정렬순서 재지정 (#167)

Author: Jeong-Rae

src/main/java/org/codequistify/master/application/account/controller/AuthenticationController.java

@@ -47,14 +47,13 @@
 public class AuthenticationController {
 
     private static final Logger logger = LoggerFactory.getLogger(AuthenticationController.class);
-    private final SocialSignHandlerMap handlerMap;
     private final AccountService accountService;
     private final EmailVerificationService emailVerificationService;
+    private final SocialSignHandlerMap handlerMap;
     private final PlayerQueryService playerQueryService;
-
-    private final TokenProvider tokenProvider;
     private final TokenCookieProvider tokenCookieProvider;
     private final TokenGenerator tokenGenerator;
+    private final TokenProvider tokenProvider;
 
     @GetMapping("/{provider}/url")
     @Operation(summary = "소셜 로그인 URL 발급", description = "구글/카카오/네이버/깃허브 로그인 URL을 반환")

src/main/java/org/codequistify/master/application/account/controller/EmailVerificationController.java

@@ -1,8 +1,8 @@
 package org.codequistify.master.application.account.controller;
 
 import lombok.RequiredArgsConstructor;
-import org.codequistify.master.core.domain.account.model.EmailVerificationType;
 import org.codequistify.master.application.account.service.EmailVerificationService;
+import org.codequistify.master.core.domain.account.model.EmailVerificationType;
 import org.codequistify.master.global.aspect.LogMonitoring;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -16,9 +16,13 @@
 @RequiredArgsConstructor
 public class EmailVerificationController {
     private final EmailVerificationService emailVerificationService;
+
     @GetMapping("home/auth/email/verify")
     @LogMonitoring
-    public String verifyMail(@RequestParam String email, @RequestParam String code, @RequestParam EmailVerificationType type, Model model) {
+    public String verifyMail(@RequestParam String email,
+                             @RequestParam String code,
+                             @RequestParam EmailVerificationType type,
+                             Model model) {
         if (email.isBlank() || code.isBlank() || type == null) {
             return "redirect:/home/failure";
         }

src/main/java/org/codequistify/master/application/account/service/AccountService.java

@@ -38,14 +38,13 @@
 @Service
 @RequiredArgsConstructor
 public class AccountService {
-    private final PlayerQueryService playerQueryService;
-    private final PlayerProfileService playerProfileService;
+    private final Logger logger = LoggerFactory.getLogger(AccountService.class);
+    private final PlayerJpaRepository playerJpaRepository;
     private final PlayerPasswordManager playerPasswordManager;
+    private final PlayerProfileService playerProfileService;
+    private final PlayerQueryService playerQueryService;
     private final PlayerValidator playerValidator;
     private final TokenProvider tokenProvider;
-    private final PlayerJpaRepository playerJpaRepository;
-
-    private final Logger logger = LoggerFactory.getLogger(AccountService.class);
 
     @Transactional
     @LogMonitoring

src/main/java/org/codequistify/master/application/account/service/EmailVerificationService.java

@@ -30,13 +30,12 @@
 @RequiredArgsConstructor
 public class EmailVerificationService {
 
-    private final EmailVerificationRepository emailVerificationRepository;
-    private final EmailVerificationPolicyHandler policyHandler;
+    private final EmailVerificationCodeManager codeManager;
     private final EmailMessageFactory emailMessageFactory;
     private final EmailSender emailSender;
-    private final EmailVerificationCodeManager codeManager;
+    private final EmailVerificationRepository emailVerificationRepository;
     private final Logger logger = LoggerFactory.getLogger(EmailVerificationService.class);
-
+    private final EmailVerificationPolicyHandler policyHandler;
     @Value("${mail.secret}")
     private String mailSecret;
 

src/main/java/org/codequistify/master/application/account/service/GithubSocialSignService.java

@@ -1,7 +1,10 @@
 package org.codequistify.master.application.account.service;
 
 import lombok.RequiredArgsConstructor;
-import org.codequistify.master.application.account.vo.*;
+import org.codequistify.master.application.account.vo.OAuthProfile;
+import org.codequistify.master.application.account.vo.OAuthResource;
+import org.codequistify.master.application.account.vo.OAuthToken;
+import org.codequistify.master.application.account.vo.ResourceOfGithub;
 import org.codequistify.master.application.exception.ApplicationException;
 import org.codequistify.master.core.domain.player.model.OAuthType;
 import org.codequistify.master.core.domain.player.model.Player;
@@ -28,10 +31,9 @@ public class GithubSocialSignService implements SocialSignService {
 
     private static final String LOGIN_URL_TEMPLATE =
             "https://github.com/login/oauth/authorize?client_id=%s&redirect_uri=%s&response_type=code&state=%s";
-
-    private final RestTemplate restTemplate;
     private final OAuthKey oAuthKey;
     private final PlayerRepository playerRepository;
+    private final RestTemplate restTemplate;
 
     @Override
     public String getSocialLogInURL() {

src/main/java/org/codequistify/master/application/account/service/GoogleSocialSignService.java

@@ -30,10 +30,9 @@ public class GoogleSocialSignService implements SocialSignService {
 
     private static final String LOGIN_URL_TEMPLATE =
             "https://accounts.google.com/o/oauth2/auth?client_id=%s&redirect_uri=%s&response_type=code&scope=email%%20profile";
-
-    private final RestTemplate restTemplate;
     private final OAuthKey oAuthKey;
     private final PlayerRepository playerRepository;
+    private final RestTemplate restTemplate;
 
     @Override
     public String getSocialLogInURL() {

src/main/java/org/codequistify/master/application/account/service/KakaoSocialSignService.java

@@ -31,10 +31,9 @@ public class KakaoSocialSignService implements SocialSignService {
 
     private static final String LOGIN_URL_TEMPLATE =
             "https://kauth.kakao.com/oauth/authorize?response_type=code&client_id=%s&redirect_uri=%s";
-
-    private final RestTemplate restTemplate;
     private final OAuthKey oAuthKey;
     private final PlayerRepository playerRepository;
+    private final RestTemplate restTemplate;
 
     /**
      * 카카오 소셜 로그인 주소 반환

src/main/java/org/codequistify/master/application/account/service/NaverSocialSignService.java

@@ -1,7 +1,10 @@
 package org.codequistify.master.application.account.service;
 
 import lombok.RequiredArgsConstructor;
-import org.codequistify.master.application.account.vo.*;
+import org.codequistify.master.application.account.vo.OAuthProfile;
+import org.codequistify.master.application.account.vo.OAuthResource;
+import org.codequistify.master.application.account.vo.OAuthToken;
+import org.codequistify.master.application.account.vo.ResourceOfNaver;
 import org.codequistify.master.application.exception.ApplicationException;
 import org.codequistify.master.core.domain.player.model.OAuthType;
 import org.codequistify.master.core.domain.player.model.Player;
@@ -28,10 +31,9 @@ public class NaverSocialSignService implements SocialSignService {
 
     private static final String LOGIN_URL_TEMPLATE =
             "https://nid.naver.com/oauth2.0/authorize?client_id=%s&redirect_uri=%s&response_type=code&state=%s";
-
-    private final RestTemplate restTemplate;
-    private final PlayerRepository playerRepository;
     private final OAuthKey oAuthKey;
+    private final PlayerRepository playerRepository;
+    private final RestTemplate restTemplate;
 
     /**
      * 네이버 소셜 로그인 URL 반환

src/main/java/org/codequistify/master/application/account/service/SocialSignService.java

@@ -5,7 +5,9 @@
 
 public interface SocialSignService {
     String getSocialLogInURL();
+
     Player socialLogIn(OAuthProfile oAuthProfile);
+
     Player socialSignUp(OAuthProfile oAuthProfile);
 
     OAuthProfile getOAuthProfile(String code);

src/main/java/org/codequistify/master/application/account/strategy/EmailVerificationPolicy.java

@@ -4,5 +4,6 @@
 
 public interface EmailVerificationPolicy {
     boolean supports(EmailVerificationType type);
+
     void validate(String email);
 }