refactor: 🔧 Redisson Auto Configuration 제거 및 도메인 모듈 의존 제어 (#151)

* feat: pennyway domain config group 열거 타입 정의

* feat: domain config 인터페이스 및 어노테이션 정의

* feat: domain config import select 구현

* chore: redisson @configuration 제거, config group 상수 추가

* rename: distributed lock aop -> aspect

* chore: batch 모듈 redisson auth configure exclude

* chore: auto configurate 옵션 domain yml로 이전

* chore: redisson 관련 클래스 모두 @component 제거 -> 수동 bean 등록

* chore: api 모듈 domain config에 redisson 설정 추가

* test: redisson 테스트 disabled

pennyway-app-external-api/src/main/java/kr/co/pennyway/api/config/DomainConfig.java

@@ -0,0 +1,12 @@
+package kr.co.pennyway.api.config;
+
+import kr.co.pennyway.domain.common.importer.EnablePennywayDomainConfig;
+import kr.co.pennyway.domain.common.importer.PennywayDomainConfigGroup;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnablePennywayDomainConfig({
+        PennywayDomainConfigGroup.REDISSON
+})
+public class DomainConfig {
+}

pennyway-batch/src/main/resources/application.yml

@@ -20,6 +20,11 @@ spring:
     hikari:
       maximum-pool-size: 2
 
+  data:
+    redis:
+      repositories:
+        enabled: false
+
 ---
 spring:
   config:

pennyway-domain/src/main/java/kr/co/pennyway/domain/common/aop/CallTransactionFactory.java

@@ -1,9 +1,7 @@
 package kr.co.pennyway.domain.common.aop;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
 
-@Component
 @RequiredArgsConstructor
 public class CallTransactionFactory {
     private final RedissonCallNewTransaction redissonCallNewTransaction;

pennyway-domain/src/main/java/kr/co/pennyway/domain/common/aop/DistributedLockAop.java → pennyway-domain/src/main/java/kr/co/pennyway/domain/common/aop/DistributedLockAspect.java

@@ -10,7 +10,6 @@
 import org.aspectj.lang.reflect.MethodSignature;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
-import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
 
@@ -19,9 +18,8 @@
  */
 @Slf4j
 @Aspect
-@Component
 @RequiredArgsConstructor
-public class DistributedLockAop {
+public class DistributedLockAspect {
     private static final String REDISSON_LOCK_PREFIX = "LOCK:";
 
     private final RedissonClient redissonClient;

pennyway-domain/src/main/java/kr/co/pennyway/domain/common/aop/RedissonCallNewTransaction.java

@@ -2,11 +2,9 @@
 
 import lombok.RequiredArgsConstructor;
 import org.aspectj.lang.ProceedingJoinPoint;
-import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-@Component
 @RequiredArgsConstructor
 public class RedissonCallNewTransaction implements CallTransaction {
     /**

pennyway-domain/src/main/java/kr/co/pennyway/domain/common/aop/RedissonCallSameTransaction.java

@@ -2,11 +2,9 @@
 
 import lombok.RequiredArgsConstructor;
 import org.aspectj.lang.ProceedingJoinPoint;
-import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-@Component
 @RequiredArgsConstructor
 public class RedissonCallSameTransaction implements CallTransaction {
     /**

pennyway-domain/src/main/java/kr/co/pennyway/domain/common/importer/EnablePennywayDomainConfig.java

@@ -0,0 +1,15 @@
+package kr.co.pennyway.domain.common.importer;
+
+import org.springframework.context.annotation.Import;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Import(PennywayDomainConfigImportSelector.class)
+public @interface EnablePennywayDomainConfig {
+    PennywayDomainConfigGroup[] value();
+}

pennyway-domain/src/main/java/kr/co/pennyway/domain/common/importer/PennywayDomainConfig.java

@@ -0,0 +1,7 @@
+package kr.co.pennyway.domain.common.importer;
+
+/**
+ * Pennyway Domain의 Configurations를 나타내는 Marker Interface
+ */
+public interface PennywayDomainConfig {
+}

pennyway-domain/src/main/java/kr/co/pennyway/domain/common/importer/PennywayDomainConfigGroup.java

@@ -0,0 +1,13 @@
+package kr.co.pennyway.domain.common.importer;
+
+import kr.co.pennyway.domain.config.RedissonConfig;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum PennywayDomainConfigGroup {
+    REDISSON(RedissonConfig.class);
+
+    private final Class<? extends PennywayDomainConfig> configClass;
+}

pennyway-domain/src/main/java/kr/co/pennyway/domain/common/importer/PennywayDomainConfigImportSelector.java

@@ -0,0 +1,24 @@
+package kr.co.pennyway.domain.common.importer;
+
+import kr.co.pennyway.common.util.MapUtils;
+import org.springframework.context.annotation.DeferredImportSelector;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.lang.NonNull;
+
+import java.util.Arrays;
+import java.util.Map;
+
+public class PennywayDomainConfigImportSelector implements DeferredImportSelector {
+    @NonNull
+    @Override
+    public String[] selectImports(@NonNull AnnotationMetadata metadata) {
+        return Arrays.stream(getGroups(metadata))
+                .map(v -> v.getConfigClass().getName())
+                .toArray(String[]::new);
+    }
+
+    private PennywayDomainConfigGroup[] getGroups(AnnotationMetadata metadata) {
+        Map<String, Object> attributes = metadata.getAnnotationAttributes(EnablePennywayDomainConfig.class.getName());
+        return (PennywayDomainConfigGroup[]) MapUtils.getObject(attributes, "value", new PennywayDomainConfigGroup[]{});
+    }
+}

pennyway-domain/src/main/java/kr/co/pennyway/domain/config/RedissonConfig.java

@@ -1,14 +1,17 @@
 package kr.co.pennyway.domain.config;
 
+import kr.co.pennyway.domain.common.aop.CallTransactionFactory;
+import kr.co.pennyway.domain.common.aop.DistributedLockAspect;
+import kr.co.pennyway.domain.common.aop.RedissonCallNewTransaction;
+import kr.co.pennyway.domain.common.aop.RedissonCallSameTransaction;
+import kr.co.pennyway.domain.common.importer.PennywayDomainConfig;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration
-public class RedissonConfig {
+public class RedissonConfig implements PennywayDomainConfig {
     private static final String REDISSON_HOST_PREFIX = "redis://";
     private final String host;
     private final int port;
@@ -32,4 +35,24 @@ public RedissonClient redissonClient() {
                 .setPassword(password);
         return Redisson.create(config);
     }
+
+    @Bean
+    public RedissonCallNewTransaction redissonCallNewTransaction() {
+        return new RedissonCallNewTransaction();
+    }
+
+    @Bean
+    public RedissonCallSameTransaction redissonCallSameTransaction() {
+        return new RedissonCallSameTransaction();
+    }
+
+    @Bean
+    public CallTransactionFactory callTransactionFactory(RedissonCallNewTransaction redissonCallNewTransaction, RedissonCallSameTransaction redissonCallSameTransaction) {
+        return new CallTransactionFactory(redissonCallNewTransaction, redissonCallSameTransaction);
+    }
+
+    @Bean
+    public DistributedLockAspect distributedLockAspect(RedissonClient redissonClient, CallTransactionFactory callTransactionFactory) {
+        return new DistributedLockAspect(redissonClient, callTransactionFactory);
+    }
 }

pennyway-domain/src/main/resources/application-domain.yml

@@ -15,6 +15,10 @@ spring:
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PASSWORD:}
 
+  autoconfigure:
+    exclude:
+      - org.redisson.spring.starter.RedissonAutoConfigurationV2
+
 ---
 spring:
   config:

pennyway-domain/src/test/java/kr/co/pennyway/domain/common/redisson/CouponDecreaseLockTest.java

@@ -7,7 +7,6 @@
 import kr.co.pennyway.domain.domains.coupon.TestCouponDecreaseService;
 import kr.co.pennyway.domain.domains.coupon.TestCouponRepository;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Ignore;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -20,7 +19,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Ignore
 @Slf4j
 @DomainIntegrationTest
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
@@ -42,6 +40,7 @@ void setUp() {
 
     @Test
     @Order(1)
+    @Disabled
     void 쿠폰차감_분산락_적용_동시성_300명_테스트() throws InterruptedException {
         // given
         int threadCount = 300;
@@ -68,6 +67,7 @@ void setUp() {
 
     @Test
     @Order(2)
+    @Disabled
     void 쿠폰차감_분산락_미적용_동시성_300명_테스트() throws InterruptedException {
         // given
         int threadCount = 300;