Fix #1166: Duplicate package in component scan (#1167)

wultra · Jan 28, 2025 · 5aa0d9c · 5aa0d9c
1 parent ac7ca77
commit 5aa0d9c
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 14 deletions.
diff --git a/...src/main/java/com/wultra/app/onboardingserver/provider/innovatrics/InnovatricsConfig.java b/...src/main/java/com/wultra/app/onboardingserver/provider/innovatrics/InnovatricsConfig.java
@@ -39,7 +39,7 @@
 @ConditionalOnExpression("""
         '${enrollment-server-onboarding.presence-check.provider}' == 'innovatrics' and '${enrollment-server-onboarding.document-verification.provider}' == 'innovatrics'
         """)
-@ComponentScan(basePackages = {"com.wultra.app.onboardingserver.provider.innovatrics"})
+@ComponentScan("com.wultra.app.onboardingserver.provider.innovatrics")
 @Configuration
 @Slf4j
 class InnovatricsConfig {

diff --git a/...er-iproov/src/main/java/com/wultra/app/onboardingserver/provider/iproov/IProovConfig.java b/...er-iproov/src/main/java/com/wultra/app/onboardingserver/provider/iproov/IProovConfig.java
@@ -68,7 +68,7 @@
  * @author Lukas Lukovsky, lukas.lukovsky@wultra.com
  */
 @ConditionalOnProperty(value = "enrollment-server-onboarding.presence-check.provider", havingValue = "iproov")
-@ComponentScan(basePackages = {"com.wultra.app.onboardingserver.provider.iproov"})
+@ComponentScan("com.wultra.app.onboardingserver.provider.iproov")
 @Configuration
 @Slf4j
 class IProovConfig {

diff --git a/...java/com/wultra/app/onboardingserver/provider/iproov/IProovPresenceCheckProviderTest.java b/...java/com/wultra/app/onboardingserver/provider/iproov/IProovPresenceCheckProviderTest.java
@@ -43,7 +43,7 @@
  */
 @SpringBootTest(classes = EnrollmentServerTestApplication.class)
 @ActiveProfiles("external-service")
-@ComponentScan(basePackages = {"com.wultra.app.onboardingserver.presencecheck.iproov"})
+@ComponentScan("com.wultra.app.onboardingserver.presencecheck.iproov")
 @EnableConfigurationProperties
 @Tag("external-service")
 class IProovPresenceCheckProviderTest {

diff --git a/...vider-zenid/src/main/java/com/wultra/app/onboardingserver/provider/zenid/ZenidConfig.java b/...vider-zenid/src/main/java/com/wultra/app/onboardingserver/provider/zenid/ZenidConfig.java
@@ -40,7 +40,7 @@
  * @author Lukas Lukovsky, lukas.lukovsky@wultra.com
  */
 @ConditionalOnProperty(value = "enrollment-server-onboarding.document-verification.provider", havingValue = "zenid")
-@ComponentScan(basePackages = {"com.wultra.app.onboardingserver.provider.zenid"})
+@ComponentScan("com.wultra.app.onboardingserver.provider.zenid")
 @Configuration
 @Slf4j
 class ZenidConfig {

diff --git a/...com/wultra/app/onboardingserver/provider/zenid/ZenidDocumentVerificationProviderTest.java b/...com/wultra/app/onboardingserver/provider/zenid/ZenidDocumentVerificationProviderTest.java
@@ -53,7 +53,7 @@
  */
 @SpringBootTest(classes = EnrollmentServerTestApplication.class)
 @ActiveProfiles("external-service")
-@ComponentScan(basePackages = {"com.wultra.app.onboardingserver.docverify.zenid"})
+@ComponentScan("com.wultra.app.onboardingserver.docverify.zenid")
 @EnableConfigurationProperties
 @Tag("external-service")
 class ZenidDocumentVerificationProviderTest {

diff --git a/...main/java/com/wultra/app/onboardingserver/configuration/OnboardingAuditConfiguration.java b/...main/java/com/wultra/app/onboardingserver/configuration/OnboardingAuditConfiguration.java
@@ -30,7 +30,7 @@
  * @author Lubos Racansky, lubos.racansky@wultra.com
  */
 @Configuration
-@ComponentScan(basePackages = {"com.wultra.core.audit.base"})
+@ComponentScan("com.wultra.core.audit.base")
 public class OnboardingAuditConfiguration {
 
     private final AuditFactory auditFactory;

diff --git a/.../java/com/wultra/app/onboardingserver/configuration/PowerAuthWebServiceConfiguration.java b/.../java/com/wultra/app/onboardingserver/configuration/PowerAuthWebServiceConfiguration.java
@@ -40,7 +40,7 @@
  */
 @Configuration
 @ConfigurationProperties("ext")
-@ComponentScan(basePackages = {
+@ComponentScan({
         "com.wultra.app.onboardingserver.docverify",
         "com.wultra.app.onboardingserver.presencecheck",
         "com.wultra.security.powerauth"

diff --git a/.../onboardingserver/docverify/mock/provider/WultraMockDocumentVerificationProviderTest.java b/.../onboardingserver/docverify/mock/provider/WultraMockDocumentVerificationProviderTest.java
@@ -46,7 +46,7 @@
  */
 @SpringBootTest(classes = EnrollmentServerTestApplication.class)
 @ActiveProfiles("test")
-@ComponentScan(basePackages = {"com.wultra.app.onboardingserver.docverify.mock"})
+@ComponentScan("com.wultra.app.onboardingserver.docverify.mock")
 @EnableConfigurationProperties
 class WultraMockDocumentVerificationProviderTest {
 

diff --git a/...app/onboardingserver/presencecheck/mock/provider/WultraMockPresenceCheckProviderTest.java b/...app/onboardingserver/presencecheck/mock/provider/WultraMockPresenceCheckProviderTest.java
@@ -39,7 +39,7 @@
  */
 @SpringBootTest(classes = EnrollmentServerTestApplication.class)
 @ActiveProfiles("test")
-@ComponentScan(basePackages = "com.wultra.app.onboardingserver.presencecheck.mock")
+@ComponentScan("com.wultra.app.onboardingserver.presencecheck.mock")
 @EnableConfigurationProperties
 class WultraMockPresenceCheckProviderTest {
 

diff --git a/...main/java/com/wultra/app/enrollmentserver/configuration/EnrollmentAuditConfiguration.java b/...main/java/com/wultra/app/enrollmentserver/configuration/EnrollmentAuditConfiguration.java
@@ -30,7 +30,7 @@
  * @author Lubos Racansky, lubos.racansky@wultra.com
  */
 @Configuration
-@ComponentScan(basePackages = {"com.wultra.core.audit.base"})
+@ComponentScan("com.wultra.core.audit.base")
 public class EnrollmentAuditConfiguration {
 
     private final AuditFactory auditFactory;

diff --git a/.../java/com/wultra/app/enrollmentserver/configuration/PowerAuthWebServiceConfiguration.java b/.../java/com/wultra/app/enrollmentserver/configuration/PowerAuthWebServiceConfiguration.java
@@ -40,10 +40,7 @@
  */
 @Configuration
 @ConfigurationProperties("ext")
-@ComponentScan(basePackages = {
-        "com.wultra.security.powerauth",
-        "com.wultra.security.powerauth",
-})
+@ComponentScan("com.wultra.security.powerauth")
 public class PowerAuthWebServiceConfiguration {
 
     private static final Logger logger = LoggerFactory.getLogger(PowerAuthWebServiceConfiguration.class);