diff --git a/src/main/java/com/knecon/fforesight/lifecyclecommons/LifecycleAspect.java b/src/main/java/com/knecon/fforesight/lifecyclecommons/LifecycleAspect.java index ce99212..7e7315d 100644 --- a/src/main/java/com/knecon/fforesight/lifecyclecommons/LifecycleAspect.java +++ b/src/main/java/com/knecon/fforesight/lifecyclecommons/LifecycleAspect.java @@ -18,8 +18,7 @@ public class LifecycleAspect { private final LifecycleManager lifecycleManager; - @Value("${aspect.base-package}") - private String basePackage; + private final LifecycleProperties lifecycleProperties; @Around("@annotation(org.springframework.amqp.rabbit.annotation.RabbitListener) || " @@ -31,7 +30,7 @@ public class LifecycleAspect { public Object checkLifecycle(ProceedingJoinPoint joinPoint) throws Throwable { String targetClassName = joinPoint.getTarget().getClass().getPackageName(); - if (!targetClassName.startsWith(basePackage)) { + if (!targetClassName.startsWith(lifecycleProperties.getBasePackage())) { return joinPoint.proceed(); } diff --git a/src/main/java/com/knecon/fforesight/lifecyclecommons/LifecycleAutoconfiguration.java b/src/main/java/com/knecon/fforesight/lifecyclecommons/LifecycleAutoconfiguration.java new file mode 100644 index 0000000..520db48 --- /dev/null +++ b/src/main/java/com/knecon/fforesight/lifecyclecommons/LifecycleAutoconfiguration.java @@ -0,0 +1,12 @@ +package com.knecon.fforesight.lifecyclecommons; + +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@EnableConfigurationProperties(LifecycleProperties.class) +@ComponentScan(basePackageClasses = {LifecycleManager.class, LifecycleAspect.class}) +public class LifecycleAutoconfiguration { + +} diff --git a/src/main/java/com/knecon/fforesight/lifecyclecommons/LifecycleProperties.java b/src/main/java/com/knecon/fforesight/lifecyclecommons/LifecycleProperties.java new file mode 100644 index 0000000..0c786ce --- /dev/null +++ b/src/main/java/com/knecon/fforesight/lifecyclecommons/LifecycleProperties.java @@ -0,0 +1,12 @@ +package com.knecon.fforesight.lifecyclecommons; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +import lombok.Data; + +@Data +@ConfigurationProperties("lifecycle") +public class LifecycleProperties { + + private String basePackage; +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f67e16a..8114757 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,2 +1,2 @@ -aspect: +lifecycle: base-package: com.knecon \ No newline at end of file diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index f67e16a..8114757 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -1,2 +1,2 @@ -aspect: +lifecycle: base-package: com.knecon \ No newline at end of file