[chore] spotless 적용 #154

ALL-CHIVE · Aug 30, 2023 · ec2229b · ec2229b
1 parent e01c117
commit ec2229b
Show file tree

Hide file tree

Showing 28 changed files with 71 additions and 71 deletions.
diff --git a/Api/src/main/java/allchive/server/api/archiving/service/DeleteArchivingUseCase.java b/Api/src/main/java/allchive/server/api/archiving/service/DeleteArchivingUseCase.java
@@ -22,7 +22,9 @@ public class DeleteArchivingUseCase {
     private final RecycleDomainService recycleDomainService;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.ARCHIVING, identifier ={"archivingId"})
+    @DistributedLock(
+            lockType = DistributedLockType.ARCHIVING,
+            identifier = {"archivingId"})
     public void execute(Long archivingId) {
         Long userId = SecurityUtil.getCurrentUserId();
         validateExecution(archivingId, userId);

diff --git a/Api/src/main/java/allchive/server/api/archiving/service/UpdateArchivingPinUseCase.java b/Api/src/main/java/allchive/server/api/archiving/service/UpdateArchivingPinUseCase.java
@@ -1,7 +1,6 @@
 package allchive.server.api.archiving.service;
 
 
-import allchive.server.api.config.security.SecurityUtil;
 import allchive.server.core.annotation.UseCase;
 import allchive.server.domain.common.aop.distributedLock.DistributedLock;
 import allchive.server.domain.common.enums.DistributedLockType;
@@ -17,7 +16,9 @@ public class UpdateArchivingPinUseCase {
     private final ArchivingDomainService archivingDomainService;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.ARCHIVING_PIN, identifier ={"archivingId", "userId"})
+    @DistributedLock(
+            lockType = DistributedLockType.ARCHIVING_PIN,
+            identifier = {"archivingId", "userId"})
     public void execute(Long archivingId, Boolean cancel, Long userId) {
         validateExecution(archivingId, userId, cancel);
         archivingDomainService.updatePin(archivingId, userId, !cancel);

diff --git a/Api/src/main/java/allchive/server/api/archiving/service/UpdateArchivingScrapUseCase.java b/Api/src/main/java/allchive/server/api/archiving/service/UpdateArchivingScrapUseCase.java
@@ -3,7 +3,6 @@
 import static allchive.server.core.consts.AllchiveConst.MINUS_ONE;
 import static allchive.server.core.consts.AllchiveConst.PLUS_ONE;
 
-import allchive.server.api.config.security.SecurityUtil;
 import allchive.server.core.annotation.UseCase;
 import allchive.server.domain.common.aop.distributedLock.DistributedLock;
 import allchive.server.domain.common.enums.DistributedLockType;
@@ -27,7 +26,9 @@ public class UpdateArchivingScrapUseCase {
     private final ScrapValidator scrapValidator;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.ARCHIVING_SCRAP, identifier ={"archivingId", "userId"})
+    @DistributedLock(
+            lockType = DistributedLockType.ARCHIVING_SCRAP,
+            identifier = {"archivingId", "userId"})
     public void execute(Long archivingId, Boolean cancel, Long userId) {
         validateExecution(archivingId, userId, cancel);
         User user = userAdaptor.findById(userId);

diff --git a/Api/src/main/java/allchive/server/api/archiving/service/UpdateArchivingUseCase.java b/Api/src/main/java/allchive/server/api/archiving/service/UpdateArchivingUseCase.java
@@ -5,15 +5,14 @@
 import allchive.server.api.common.util.UrlUtil;
 import allchive.server.api.config.security.SecurityUtil;
 import allchive.server.core.annotation.UseCase;
-import allchive.server.domain.common.aop.distributedLock.DistributedLock;
-import allchive.server.domain.common.enums.DistributedLockType;
 import allchive.server.core.event.Event;
 import allchive.server.core.event.events.s3.S3ImageDeleteEvent;
+import allchive.server.domain.common.aop.distributedLock.DistributedLock;
+import allchive.server.domain.common.enums.DistributedLockType;
 import allchive.server.domain.domains.archiving.adaptor.ArchivingAdaptor;
 import allchive.server.domain.domains.archiving.domain.Archiving;
 import allchive.server.domain.domains.archiving.service.ArchivingDomainService;
 import allchive.server.domain.domains.archiving.validator.ArchivingValidator;
-import allchive.server.infrastructure.s3.service.S3DeleteObjectService;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,7 +25,9 @@ public class UpdateArchivingUseCase {
     private final ArchivingValidator archivingValidator;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.ARCHIVING, identifier ={"archivingId"})
+    @DistributedLock(
+            lockType = DistributedLockType.ARCHIVING,
+            identifier = {"archivingId"})
     public void execute(Long archivingId, UpdateArchivingRequest request) {
         validateExecution(archivingId);
         Archiving archiving = archivingAdaptor.findById(archivingId);

diff --git a/Api/src/main/java/allchive/server/api/auth/service/WithdrawUserUseCase.java b/Api/src/main/java/allchive/server/api/auth/service/WithdrawUserUseCase.java
@@ -49,7 +49,9 @@ public class WithdrawUserUseCase {
     private final ArchivingDomainService archivingDomainService;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.USER, identifier ={"userId"})
+    @DistributedLock(
+            lockType = DistributedLockType.USER,
+            identifier = {"userId"})
     public void execute(String appleAccessToken, String referer, Long userId) {
         User user = userAdaptor.findById(userId);
         // oauth쪽 탈퇴

diff --git a/Api/src/main/java/allchive/server/api/block/service/DeleteBlockUseCase.java b/Api/src/main/java/allchive/server/api/block/service/DeleteBlockUseCase.java
@@ -23,7 +23,9 @@ public class DeleteBlockUseCase {
     private final UserAdaptor userAdaptor;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.BLOCK, identifier ={"fromUserId, toUserId"})
+    @DistributedLock(
+            lockType = DistributedLockType.BLOCK,
+            identifier = {"fromUserId, toUserId"})
     public BlockResponse execute(BlockRequest request, Long fromUserId, Long toUserId) {
         Long userId = SecurityUtil.getCurrentUserId();
         validateExecution(userId, request);

diff --git a/Api/src/main/java/allchive/server/api/content/model/dto/request/UpdateContentRequest.java b/Api/src/main/java/allchive/server/api/content/model/dto/request/UpdateContentRequest.java
@@ -5,9 +5,8 @@
 import allchive.server.domain.domains.content.domain.enums.ContentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
-import lombok.Getter;
-
 import javax.validation.constraints.Positive;
+import lombok.Getter;
 
 @Getter
 public class UpdateContentRequest {

diff --git a/Api/src/main/java/allchive/server/api/content/service/DeleteContentUseCase.java b/Api/src/main/java/allchive/server/api/content/service/DeleteContentUseCase.java
@@ -29,7 +29,9 @@ public class DeleteContentUseCase {
     private final ArchivingAsyncDomainService archivingAsyncDomainService;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.CONTENT, identifier ={"contentId"})
+    @DistributedLock(
+            lockType = DistributedLockType.CONTENT,
+            identifier = {"contentId"})
     public void execute(Long contentId) {
         Long userId = SecurityUtil.getCurrentUserId();
         validateExecution(contentId, userId);

diff --git a/Api/src/main/java/allchive/server/api/content/service/UpdateContentUseCase.java b/Api/src/main/java/allchive/server/api/content/service/UpdateContentUseCase.java
@@ -44,7 +44,9 @@ public class UpdateContentUseCase {
     private final ArchivingAsyncDomainService archivingAsyncDomainService;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.CONTENT, identifier ={"contentId"})
+    @DistributedLock(
+            lockType = DistributedLockType.CONTENT,
+            identifier = {"contentId"})
     public void execute(Long contentId, UpdateContentRequest request) {
         validateExecution(contentId, request);
         regenerateContentTagGroup(contentId, request.getTagIds());

diff --git a/Api/src/main/java/allchive/server/api/recycle/controller/RecycleController.java b/Api/src/main/java/allchive/server/api/recycle/controller/RecycleController.java
@@ -14,9 +14,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @RestController
 @RequestMapping("/recycles")
 @RequiredArgsConstructor

diff --git a/Api/src/main/java/allchive/server/api/recycle/service/ClearDeletedObjectUseCase.java b/Api/src/main/java/allchive/server/api/recycle/service/ClearDeletedObjectUseCase.java
@@ -1,7 +1,6 @@
 package allchive.server.api.recycle.service;
 
 
-import allchive.server.api.config.security.SecurityUtil;
 import allchive.server.api.recycle.model.dto.request.ClearDeletedObjectRequest;
 import allchive.server.core.annotation.UseCase;
 import allchive.server.core.event.Event;
@@ -46,7 +45,9 @@ public class ClearDeletedObjectUseCase {
     private final ArchivingAdaptor archivingAdaptor;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.RECYCLE, identifier ={"userId"})
+    @DistributedLock(
+            lockType = DistributedLockType.RECYCLE,
+            identifier = {"userId"})
     public void execute(ClearDeletedObjectRequest request, Long userId) {
         validateExecution(userId, request);
         List<Content> contents = contentAdaptor.findAllByArchivingIds(request.getArchivingIds());

diff --git a/Api/src/main/java/allchive/server/api/recycle/service/RestoreDeletedObjectUseCase.java b/Api/src/main/java/allchive/server/api/recycle/service/RestoreDeletedObjectUseCase.java
@@ -2,7 +2,6 @@
 
 import static allchive.server.core.consts.AllchiveConst.PLUS_ONE;
 
-import allchive.server.api.config.security.SecurityUtil;
 import allchive.server.api.recycle.model.dto.request.RestoreDeletedObjectRequest;
 import allchive.server.core.annotation.UseCase;
 import allchive.server.domain.common.aop.distributedLock.DistributedLock;
@@ -30,7 +29,9 @@ public class RestoreDeletedObjectUseCase {
     private final ContentAdaptor contentAdaptor;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.RECYCLE, identifier ={"userId"})
+    @DistributedLock(
+            lockType = DistributedLockType.RECYCLE,
+            identifier = {"userId"})
     public void execute(RestoreDeletedObjectRequest request, Long userId) {
         validateExecution(request, userId);
         archivingDomainService.restoreByIdIn(request.getArchivingIds());

diff --git a/Api/src/main/java/allchive/server/api/tag/service/DeleteTagUseCase.java b/Api/src/main/java/allchive/server/api/tag/service/DeleteTagUseCase.java
@@ -22,7 +22,9 @@ public class DeleteTagUseCase {
     private final TagDomainService tagDomainService;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.TAG, identifier ={"tagId"})
+    @DistributedLock(
+            lockType = DistributedLockType.TAG,
+            identifier = {"tagId"})
     public void execute(Long tagId) {
         validateExecution(tagId);
         Tag tag = tagAdaptor.findById(tagId);

diff --git a/Api/src/main/java/allchive/server/api/tag/service/UpdateTagUseCase.java b/Api/src/main/java/allchive/server/api/tag/service/UpdateTagUseCase.java
@@ -18,7 +18,9 @@ public class UpdateTagUseCase {
     private final TagDomainService tagDomainService;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.TAG, identifier ={"tagId"})
+    @DistributedLock(
+            lockType = DistributedLockType.TAG,
+            identifier = {"tagId"})
     public void execute(Long tagId, UpdateTagRequest request) {
         validateExecution(tagId);
         tagDomainService.updateTag(tagId, request.getName());

diff --git a/Api/src/main/java/allchive/server/api/user/service/UpdateUserInfoUseCase.java b/Api/src/main/java/allchive/server/api/user/service/UpdateUserInfoUseCase.java
@@ -2,7 +2,6 @@
 
 
 import allchive.server.api.common.util.UrlUtil;
-import allchive.server.api.config.security.SecurityUtil;
 import allchive.server.api.user.model.dto.request.UpdateUserInfoRequest;
 import allchive.server.core.annotation.UseCase;
 import allchive.server.core.event.Event;
@@ -27,7 +26,9 @@ public class UpdateUserInfoUseCase {
     private final S3DeleteObjectService s3DeleteObjectService;
 
     @Transactional
-    @DistributedLock(lockType = DistributedLockType.USER, identifier ={"userId"})
+    @DistributedLock(
+            lockType = DistributedLockType.USER,
+            identifier = {"userId"})
     public void execute(UpdateUserInfoRequest request, Long userId) {
         validateExecution(userId);
         eliminateOldImage(userId, request.getImgUrl());

diff --git a/Core/src/main/java/allchive/server/core/CoreApplication.java b/Core/src/main/java/allchive/server/core/CoreApplication.java
@@ -1,7 +1,7 @@
 package allchive.server.core;
 
+
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class CoreApplication {
-}
+public class CoreApplication {}
diff --git a/Domain/src/main/java/allchive/server/domain/DomainApplication.java b/Domain/src/main/java/allchive/server/domain/DomainApplication.java
@@ -1,7 +1,7 @@
 package allchive.server.domain;
 
+
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class DomainApplication {
-}
+public class DomainApplication {}
diff --git a/Domain/src/main/java/allchive/server/domain/common/aop/distributedLock/DistributedLock.java b/Domain/src/main/java/allchive/server/domain/common/aop/distributedLock/DistributedLock.java
@@ -2,7 +2,6 @@
 
 
 import allchive.server.domain.common.enums.DistributedLockType;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...n/src/main/java/allchive/server/domain/common/aop/distributedLock/DistributedLockAop.java b/...n/src/main/java/allchive/server/domain/common/aop/distributedLock/DistributedLockAop.java
@@ -11,7 +11,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
@@ -38,10 +37,15 @@ public Object lock(final ProceedingJoinPoint joinPoint) throws Throwable {
     private String getKey(ProceedingJoinPoint joinPoint, DistributedLock distributedLock) {
         MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
         String[] methodParameterNames = methodSignature.getParameterNames();
-        return REDISSON_LOCK_PREFIX + distributedLock.lockType().getLockName() + "-" + createDynamicKey(methodParameterNames, joinPoint.getArgs(), distributedLock.identifier());
+        return REDISSON_LOCK_PREFIX
+                + distributedLock.lockType().getLockName()
+                + "-"
+                + createDynamicKey(
+                        methodParameterNames, joinPoint.getArgs(), distributedLock.identifier());
     }
 
-    private String createDynamicKey(String[] methodParameterNames, Object[] methodArgs, String[] identifiers) {
+    private String createDynamicKey(
+            String[] methodParameterNames, Object[] methodArgs, String[] identifiers) {
         List<String> resultList = new ArrayList<>();
         for (String identifier : identifiers) {
             int indexOfKey = Arrays.asList(methodParameterNames).indexOf(identifier);

diff --git a/Domain/src/main/java/allchive/server/domain/common/enums/DistributedLockType.java b/Domain/src/main/java/allchive/server/domain/common/enums/DistributedLockType.java
@@ -1,5 +1,6 @@
 package allchive.server.domain.common.enums;
 
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

diff --git a/...va/allchive/server/domain/domains/archiving/repository/ArchivingCustomRepositoryImpl.java b/...va/allchive/server/domain/domains/archiving/repository/ArchivingCustomRepositoryImpl.java
@@ -42,11 +42,7 @@ public Slice<Archiving> querySliceArchivingExceptBlock(
                                 publicStatusTrue(),
                                 categoryEq(category),
                                 deleteStatusFalse())
-                        .orderBy(
-                                scrabListDesc(archivingIdList),
-                                sorting.get(0),
-                                sorting.get(1)
-                        )
+                        .orderBy(scrabListDesc(archivingIdList), sorting.get(0), sorting.get(1))
                         .offset(pageable.getOffset())
                         .limit(pageable.getPageSize() + PLUS_ONE)
                         .fetch();
@@ -85,9 +81,7 @@ public Slice<Archiving> querySliceArchivingByIdInExceptBlockList(
                                 userIdNotIn(blockList),
                                 categoryEq(category),
                                 deleteStatusFalse())
-                        .orderBy(
-                                sorting.get(0),
-                                sorting.get(1))
+                        .orderBy(sorting.get(0), sorting.get(1))
                         .offset(pageable.getOffset())
                         .limit(pageable.getPageSize() + PLUS_ONE)
                         .fetch();
@@ -221,7 +215,7 @@ private OrderSpecifier<Long> scrapCntDesc() {
         return archiving.scrapCnt.desc();
     }
 
-    private <T> List<OrderSpecifier> createdAtAndscrapCntDescPriority(Sort sort){
+    private <T> List<OrderSpecifier> createdAtAndscrapCntDescPriority(Sort sort) {
         if (sort.equals(Sort.by("popular"))) {
             return List.of(archiving.scrapCnt.desc(), archiving.createdAt.desc());
         }

diff --git a/...in/java/allchive/server/domain/domains/archiving/service/ArchivingAsyncDomainService.java b/...in/java/allchive/server/domain/domains/archiving/service/ArchivingAsyncDomainService.java
@@ -14,7 +14,9 @@ public class ArchivingAsyncDomainService {
     private final ArchivingDomainService archivingDomainService;
 
     @Async(value = "archivingContentCntTaskExecutor")
-    @DistributedLock(lockType = DistributedLockType.ARCHIVING, identifier ={"archivingId"})
+    @DistributedLock(
+            lockType = DistributedLockType.ARCHIVING,
+            identifier = {"archivingId"})
     public void updateContentCnt(Long archivingId, ContentType contentType, int i) {
         archivingDomainService.updateContentCnt(archivingId, contentType, i);
     }

diff --git a/...rc/main/java/allchive/server/domain/domains/archiving/service/ArchivingDomainService.java b/...rc/main/java/allchive/server/domain/domains/archiving/service/ArchivingDomainService.java
@@ -1,7 +1,5 @@
 package allchive.server.domain.domains.archiving.service;
 
-import static allchive.server.core.consts.AllchiveConst.MINUS_ONE;
-import static allchive.server.core.consts.AllchiveConst.PLUS_ONE;
 
 import allchive.server.core.annotation.DomainService;
 import allchive.server.domain.domains.archiving.adaptor.ArchivingAdaptor;

diff --git a/...n/java/allchive/server/domain/domains/recycle/repository/RecycleCustomRepositoryImpl.java b/...n/java/allchive/server/domain/domains/recycle/repository/RecycleCustomRepositoryImpl.java
@@ -24,12 +24,10 @@ public List<Recycle> queryRecycleByUserIdAndArchivingIdInOrUserIdAndContentIdIn(
                 .fetch();
     }
 
-    private BooleanExpression userIdEq(
-            Long userId) {
+    private BooleanExpression userIdEq(Long userId) {
         return recycle.userId.eq(userId);
     }
 
-
     private BooleanExpression archivingIdInOrContentIdIn(
             List<Long> archivingIdList, List<Long> contentIdList) {
         return recycle.archivingId.in(archivingIdList).or(recycle.contentId.in(contentIdList));

diff --git a/Domain/src/test/java/allchive/server/domain/CalculateCurrentExecutionSupporter.java b/Domain/src/test/java/allchive/server/domain/CalculateCurrentExecutionSupporter.java
@@ -1,12 +1,12 @@
 package allchive.server.domain;
 
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.function.Executable;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.function.Executable;
 
 @Slf4j
 public class CalculateCurrentExecutionSupporter {
@@ -33,4 +33,3 @@ public static void execute(Executable executable, AtomicLong successCount)
         latch.await();
     }
 }
-
diff --git a/Domain/src/test/java/allchive/server/domain/DomainIntegrateSpringBootTest.java b/Domain/src/test/java/allchive/server/domain/DomainIntegrateSpringBootTest.java
@@ -1,11 +1,10 @@
 package allchive.server.domain;
 
 
+import java.lang.annotation.*;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 
-import java.lang.annotation.*;
-
 /** 도메인 모듈의 통합테스트의 편의성을 위해서 만든 어노테이션 -이찬진 */
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)