Merge pull request #62 from dnd-side-project/feat/#59

Style: 코드 리펙토링

src/main/java/com/dnd/gooding/filestore/application/in/FileStoreUseCase.java

@@ -4,6 +4,7 @@
 
 public interface FileStoreUseCase {
 
-	String putFile(String key, File file);
-	void deleteFile(String key);
+    String putFile(String key, File file);
+
+    void deleteFile(String key);
 }

src/main/java/com/dnd/gooding/filestore/infra/S3ServiceStore.java

@@ -1,13 +1,11 @@
 package com.dnd.gooding.filestore.infra;
 
+import com.dnd.gooding.filestore.application.in.FileStoreUseCase;
 import java.io.File;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-
-import com.dnd.gooding.filestore.application.in.FileStoreUseCase;
-
 import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.S3Client;

src/main/java/com/dnd/gooding/mail/application/adapter/EmailSender.java

@@ -2,5 +2,5 @@
 
 public interface EmailSender {
 
-	void sendLoginSuccess(String toMail);
+    void sendLoginSuccess(String toMail);
 }

src/main/java/com/dnd/gooding/mail/exception/EmailSendException.java

@@ -1,7 +1,7 @@
 package com.dnd.gooding.mail.exception;
 
 public class EmailSendException extends RuntimeException {
-	public EmailSendException(Exception e) {
-		super(e);
-	}
+    public EmailSendException(Exception e) {
+        super(e);
+    }
 }

src/main/java/com/dnd/gooding/mail/infra/DefaultEmailEventAdapter.java

@@ -1,55 +1,52 @@
 package com.dnd.gooding.mail.infra;
 
+import com.dnd.gooding.mail.application.adapter.EmailSender;
+import com.dnd.gooding.mail.exception.EmailSendException;
 import javax.mail.internet.MimeMessage;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring5.SpringTemplateEngine;
 
-import com.dnd.gooding.mail.application.adapter.EmailSender;
-import com.dnd.gooding.mail.exception.EmailSendException;
-
-import lombok.extern.slf4j.Slf4j;
-
 @Slf4j
 @Component
 public class DefaultEmailEventAdapter implements EmailSender {
 
-	private final JavaMailSender mailSender;
-	private final SpringTemplateEngine springTemplateEngine;
-	@Value("${spring.mail.username}")
-	private String fromMail;
-
-	public DefaultEmailEventAdapter(JavaMailSender mailSender,
-		SpringTemplateEngine springTemplateEngine) {
-		this.mailSender = mailSender;
-		this.springTemplateEngine = springTemplateEngine;
-	}
-
-	@Override
-	public void sendLoginSuccess(String toMail) {
-		Context context = new Context();
-		String text = springTemplateEngine.process(EmailMetaData.LOGIN_SUCCESS_TEMPLATE, context);
-		sendMail(EmailMetaData.LOGIN_SUCCESS_TITLE, toMail, text);
-	}
-
-	private void sendMail(String subject, String toEmail, String text) {
-		try {
-			MimeMessage message = mailSender.createMimeMessage();
-			MimeMessageHelper helper = new MimeMessageHelper(message, true);
-
-			helper.setSubject(subject);
-			helper.setTo(toEmail);
-			helper.setText(text);
-			helper.setFrom(fromMail, "gooding");
-
-			mailSender.send(message);
-		} catch (Exception e) {
-			throw new EmailSendException(e);
-		}
-
-	}
+    private final JavaMailSender mailSender;
+    private final SpringTemplateEngine springTemplateEngine;
+
+    @Value("${spring.mail.username}")
+    private String fromMail;
+
+    public DefaultEmailEventAdapter(
+            JavaMailSender mailSender, SpringTemplateEngine springTemplateEngine) {
+        this.mailSender = mailSender;
+        this.springTemplateEngine = springTemplateEngine;
+    }
+
+    @Override
+    public void sendLoginSuccess(String toMail) {
+        Context context = new Context();
+        String text = springTemplateEngine.process(EmailMetaData.LOGIN_SUCCESS_TEMPLATE, context);
+        sendMail(EmailMetaData.LOGIN_SUCCESS_TITLE, toMail, text);
+    }
+
+    private void sendMail(String subject, String toEmail, String text) {
+        try {
+            MimeMessage message = mailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(message, true);
+
+            helper.setSubject(subject);
+            helper.setTo(toEmail);
+            helper.setText(text);
+            helper.setFrom(fromMail, "gooding");
+
+            mailSender.send(message);
+        } catch (Exception e) {
+            throw new EmailSendException(e);
+        }
+    }
 }

src/main/java/com/dnd/gooding/mail/infra/EmailMetaData.java

@@ -1,6 +1,6 @@
 package com.dnd.gooding.mail.infra;
 
 public class EmailMetaData {
-	static String LOGIN_SUCCESS_TEMPLATE = "login-sucess";
-	static String LOGIN_SUCCESS_TITLE = "gooding 서비스에 가입해주셔서 감사합니다.";
+    static String LOGIN_SUCCESS_TEMPLATE = "login-sucess";
+    static String LOGIN_SUCCESS_TITLE = "gooding 서비스에 가입해주셔서 감사합니다.";
 }

src/main/java/com/dnd/gooding/oauth/command/application/in/CreateOAuthUseCase.java

@@ -4,5 +4,5 @@
 
 public interface CreateOAuthUseCase {
 
-	Token create(String code);
+    Token create(String code);
 }

src/main/java/com/dnd/gooding/oauth/command/application/out/OAuthMemberPort.java

@@ -2,5 +2,5 @@
 
 public interface OAuthMemberPort {
 
-	void create(String id, String oAuthId);
+    void create(String id, String oAuthId);
 }

src/main/java/com/dnd/gooding/oauth/command/domain/repository/OAuthRepository.java

@@ -1,10 +1,9 @@
 package com.dnd.gooding.oauth.command.domain.repository;
 
-import java.util.Optional;
-import org.springframework.data.repository.Repository;
-
 import com.dnd.gooding.oauth.command.domain.OAuth;
 import com.dnd.gooding.oauth.command.domain.OAuthId;
+import java.util.Optional;
+import org.springframework.data.repository.Repository;
 
 public interface OAuthRepository extends Repository<OAuth, OAuthId> {
 

src/main/java/com/dnd/gooding/oauth/command/domain/service/CreateOAuthService.java

@@ -7,9 +7,8 @@
 import com.dnd.gooding.oauth.command.application.out.OAuthTokenPort;
 import com.dnd.gooding.oauth.command.domain.OAuth;
 import com.dnd.gooding.oauth.command.domain.OAuthId;
-import com.dnd.gooding.oauth.command.domain.repository.OAuthRepository;
 import com.dnd.gooding.oauth.command.domain.dto.OAuthMember;
-
+import com.dnd.gooding.oauth.command.domain.repository.OAuthRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,10 +23,11 @@ public class CreateOAuthService implements CreateOAuthUseCase {
 
     private final OAuthTokenPort oAuthTokenPort;
 
-    public CreateOAuthService(OAuthRepository oAuthRepository,
-        ExternalLoginPort externalLoginPort,
-        OAuthMemberPort oAuthMemberPort,
-        OAuthTokenPort oAuthTokenPort) {
+    public CreateOAuthService(
+            OAuthRepository oAuthRepository,
+            ExternalLoginPort externalLoginPort,
+            OAuthMemberPort oAuthMemberPort,
+            OAuthTokenPort oAuthTokenPort) {
         this.oAuthRepository = oAuthRepository;
         this.externalLoginPort = externalLoginPort;
         this.oAuthMemberPort = oAuthMemberPort;

src/main/java/com/dnd/gooding/oauth/infra/ExternalGoogleLoginAdapter.java

@@ -1,8 +1,8 @@
 package com.dnd.gooding.oauth.infra;
 
-import com.dnd.gooding.oauth.exception.ConnectionException;
 import com.dnd.gooding.oauth.command.domain.dto.GoogleMember;
 import com.dnd.gooding.oauth.command.domain.dto.OAuthMember;
+import com.dnd.gooding.oauth.exception.ConnectionException;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;

src/main/java/com/dnd/gooding/oauth/infra/ExternalKakaoLoginAdapter.java

@@ -1,11 +1,11 @@
 package com.dnd.gooding.oauth.infra;
 
-import com.dnd.gooding.oauth.exception.ConnectionException;
 import com.dnd.gooding.oauth.command.application.out.ExternalLoginPort;
 import com.dnd.gooding.oauth.command.domain.dto.KakaoInfo;
 import com.dnd.gooding.oauth.command.domain.dto.KakaoMember;
 import com.dnd.gooding.oauth.command.domain.dto.KakaoResponse;
 import com.dnd.gooding.oauth.command.domain.dto.OAuthMember;
+import com.dnd.gooding.oauth.exception.ConnectionException;
 import java.util.Objects;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;

src/main/java/com/dnd/gooding/oauth/ui/OAuthLoginController.java

@@ -2,7 +2,6 @@
 
 import com.dnd.gooding.common.model.Token;
 import com.dnd.gooding.oauth.command.application.in.CreateOAuthUseCase;
-
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/dnd/gooding/record/command/application/in/CreateRecordUseCase.java

@@ -1,10 +1,9 @@
 package com.dnd.gooding.record.command.application.in;
 
-import java.io.IOException;
-
 import com.dnd.gooding.record.ui.dto.request.RecordRequest;
+import java.io.IOException;
 
 public interface CreateRecordUseCase {
 
-	void create(RecordRequest recordRequest) throws IOException;
+    void create(RecordRequest recordRequest) throws IOException;
 }

src/main/java/com/dnd/gooding/record/command/application/in/DeleteRecordUseCase.java

@@ -2,5 +2,5 @@
 
 public interface DeleteRecordUseCase {
 
-	void delete(String recordNo);
+    void delete(String recordNo);
 }

src/main/java/com/dnd/gooding/record/command/application/out/RecordMemberPort.java

@@ -5,5 +5,5 @@
 
 public interface RecordMemberPort {
 
-	Recorder createRecorder(MemberId recorderMemberId);
+    Recorder createRecorder(MemberId recorderMemberId);
 }

src/main/java/com/dnd/gooding/record/command/domain/repository/RecordRepository.java

@@ -1,13 +1,12 @@
 package com.dnd.gooding.record.command.domain.repository;
 
+import com.dnd.gooding.record.command.domain.Record;
+import com.dnd.gooding.record.command.domain.RecordNo;
 import java.security.SecureRandom;
 import java.util.Date;
 import java.util.Optional;
 import org.springframework.data.repository.Repository;
 
-import com.dnd.gooding.record.command.domain.Record;
-import com.dnd.gooding.record.command.domain.RecordNo;
-
 public interface RecordRepository extends Repository<Record, RecordNo> {
 
     Optional<Record> findById(RecordNo recordNo);

src/main/java/com/dnd/gooding/record/command/domain/service/RecordService.java

@@ -26,7 +26,9 @@ public class RecordService implements CreateRecordUseCase {
     private final RecordFilePort recordFilePort;
 
     public RecordService(
-            RecordRepository recordRepository, RecordMemberPort recordMemberPort, RecordFilePort recordFilePort) {
+            RecordRepository recordRepository,
+            RecordMemberPort recordMemberPort,
+            RecordFilePort recordFilePort) {
         this.recordRepository = recordRepository;
         this.recordMemberPort = recordMemberPort;
         this.recordFilePort = recordFilePort;

src/main/java/com/dnd/gooding/record/query/application/RecordQueryService.java

@@ -1,7 +1,7 @@
 package com.dnd.gooding.record.query.application;
 
-import com.dnd.gooding.record.exception.NoRecordException;
 import com.dnd.gooding.record.command.domain.RecordNo;
+import com.dnd.gooding.record.exception.NoRecordException;
 import com.dnd.gooding.record.query.dao.ImageDataDao;
 import com.dnd.gooding.record.query.dao.RecordDataDao;
 import com.dnd.gooding.record.query.dto.ImageData;

src/main/java/com/dnd/gooding/record/ui/RecordController.java

@@ -3,7 +3,6 @@
 import com.dnd.gooding.record.command.application.in.CreateRecordUseCase;
 import com.dnd.gooding.record.command.application.in.DeleteRecordUseCase;
 import com.dnd.gooding.record.ui.dto.request.RecordRequest;
-import com.dnd.gooding.record.command.domain.service.RecordService;
 import com.dnd.gooding.token.command.domain.dto.JwtAuthentication;
 import com.dnd.gooding.user.command.domain.MemberId;
 import java.io.IOException;
@@ -21,8 +20,8 @@ public class RecordController {
     private final CreateRecordUseCase createRecordUseCase;
     private final DeleteRecordUseCase deleteRecordUseCase;
 
-    public RecordController(CreateRecordUseCase createRecordUseCase,
-        DeleteRecordUseCase deleteRecordUseCase) {
+    public RecordController(
+            CreateRecordUseCase createRecordUseCase, DeleteRecordUseCase deleteRecordUseCase) {
         this.createRecordUseCase = createRecordUseCase;
         this.deleteRecordUseCase = deleteRecordUseCase;
     }

src/main/java/com/dnd/gooding/springconfig/log/MDCCopyTaskDecorator.java

@@ -1,24 +1,23 @@
 package com.dnd.gooding.springconfig.log;
 
 import java.util.Map;
-
 import org.slf4j.MDC;
 import org.springframework.core.task.TaskDecorator;
 
 public class MDCCopyTaskDecorator implements TaskDecorator {
 
-	@Override
-	public Runnable decorate(Runnable runnable) {
-		Map<String, String> contextMap = MDC.getCopyOfContextMap();
-		return () -> {
-			try {
-				if (contextMap != null) {
-					MDC.setContextMap(contextMap);
-				}
-				runnable.run();
-			} finally {
-				MDC.clear();
-			}
-		};
-	}
+    @Override
+    public Runnable decorate(Runnable runnable) {
+        Map<String, String> contextMap = MDC.getCopyOfContextMap();
+        return () -> {
+            try {
+                if (contextMap != null) {
+                    MDC.setContextMap(contextMap);
+                }
+                runnable.run();
+            } finally {
+                MDC.clear();
+            }
+        };
+    }
 }

src/main/java/com/dnd/gooding/springconfig/security/JwtAuthenticationFilter.java

@@ -1,7 +1,7 @@
 package com.dnd.gooding.springconfig.security;
 
-import com.dnd.gooding.token.command.domain.service.TokenService;
 import com.dnd.gooding.token.command.domain.dto.JwtAuthenticationToken;
+import com.dnd.gooding.token.command.domain.service.TokenService;
 import com.dnd.gooding.util.ExtractUtil;
 import java.io.IOException;
 import javax.servlet.FilterChain;

src/main/java/com/dnd/gooding/springconfig/web/WebMvcConfig.java

@@ -1,11 +1,10 @@
 package com.dnd.gooding.springconfig.web;
 
+import com.dnd.gooding.springconfig.log.MDCLoggingInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.dnd.gooding.springconfig.log.MDCLoggingInterceptor;
-
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 

src/main/java/com/dnd/gooding/token/command/application/in/CreateTokenUseCase.java

@@ -4,6 +4,7 @@
 
 public interface CreateTokenUseCase {
 
-	String getAccessTokensByRefreshToken(String refreshToken);
-	Token createTokens(String id);
+    String getAccessTokensByRefreshToken(String refreshToken);
+
+    Token createTokens(String id);
 }

src/main/java/com/dnd/gooding/token/command/application/in/LogoutTokenUseCase.java

@@ -2,5 +2,5 @@
 
 public interface LogoutTokenUseCase {
 
-	void deleteRefreshToken(String refreshToken);
+    void deleteRefreshToken(String refreshToken);
 }

src/main/java/com/dnd/gooding/token/command/domain/repository/RefreshTokenRepository.java

@@ -1,7 +1,6 @@
 package com.dnd.gooding.token.command.domain.repository;
 
-import org.springframework.data.repository.CrudRepository;
-
 import com.dnd.gooding.token.command.domain.RefreshToken;
+import org.springframework.data.repository.CrudRepository;
 
 public interface RefreshTokenRepository extends CrudRepository<RefreshToken, String> {}