diff --git a/build.gradle.kts b/build.gradle.kts index c229fed..1a18e3a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -95,9 +95,9 @@ configurations { dependencies { - implementation("com.knecon.fforesight:keycloak-commons:0.24.0") + implementation("com.knecon.fforesight:keycloak-commons:0.25.0") implementation("com.knecon.fforesight:swagger-commons:0.5.0") - implementation("com.knecon.fforesight:tracing-commons:0.3.0") + implementation("com.knecon.fforesight:tracing-commons:0.5.0") implementation("net.logstash.logback:logstash-logback-encoder:7.4") implementation("ch.qos.logback:logback-classic") implementation("org.postgresql:postgresql:42.5.4") diff --git a/src/test/java/com/knecon/fforesight/AbstractTenantUserManagementIntegrationTest.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/AbstractTenantUserManagementIntegrationTest.java similarity index 84% rename from src/test/java/com/knecon/fforesight/AbstractTenantUserManagementIntegrationTest.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/AbstractTenantUserManagementIntegrationTest.java index 8280b82..8103e92 100644 --- a/src/test/java/com/knecon/fforesight/AbstractTenantUserManagementIntegrationTest.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/AbstractTenantUserManagementIntegrationTest.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight; +package com.knecon.fforesight.tenantusermanagement; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; @@ -16,15 +16,14 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; -import com.knecon.fforesight.feigntestclients.external.TenantsClient; -import com.knecon.fforesight.feigntestclients.internal.InternalTenantsClient; -import com.knecon.fforesight.tenantusermanagement.TenantUserManagementServiceApplication; -import com.knecon.fforesight.testcontainers.KeyCloakTestContainer; -import com.knecon.fforesight.testcontainers.MinioTestContainer; -import com.knecon.fforesight.testcontainers.RedisTestContainer; -import com.knecon.fforesight.testcontainers.SpringPostgreSQLTestContainer; -import com.knecon.fforesight.utils.TestTenantService; -import com.knecon.fforesight.utils.TokenService; +import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.TenantsClient; +import com.knecon.fforesight.tenantusermanagement.feigntestclients.internal.InternalTenantsClient; +import com.knecon.fforesight.tenantusermanagement.testcontainers.KeyCloakTestContainer; +import com.knecon.fforesight.tenantusermanagement.testcontainers.MinioTestContainer; +import com.knecon.fforesight.tenantusermanagement.testcontainers.RedisTestContainer; +import com.knecon.fforesight.tenantusermanagement.testcontainers.SpringPostgreSQLTestContainer; +import com.knecon.fforesight.tenantusermanagement.utils.TestTenantService; +import com.knecon.fforesight.tenantusermanagement.utils.TokenService; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/knecon/fforesight/feigntestclients/external/GeneralSettingsClient.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/GeneralSettingsClient.java similarity index 82% rename from src/test/java/com/knecon/fforesight/feigntestclients/external/GeneralSettingsClient.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/GeneralSettingsClient.java index da41a0b..59bc446 100644 --- a/src/test/java/com/knecon/fforesight/feigntestclients/external/GeneralSettingsClient.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/GeneralSettingsClient.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.feigntestclients.external; +package com.knecon.fforesight.tenantusermanagement.feigntestclients.external; import org.springframework.cloud.openfeign.FeignClient; diff --git a/src/test/java/com/knecon/fforesight/feigntestclients/external/SMTPConfigurationClient.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/SMTPConfigurationClient.java similarity index 82% rename from src/test/java/com/knecon/fforesight/feigntestclients/external/SMTPConfigurationClient.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/SMTPConfigurationClient.java index b312e31..8053d8c 100644 --- a/src/test/java/com/knecon/fforesight/feigntestclients/external/SMTPConfigurationClient.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/SMTPConfigurationClient.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.feigntestclients.external; +package com.knecon.fforesight.tenantusermanagement.feigntestclients.external; import org.springframework.cloud.openfeign.FeignClient; diff --git a/src/test/java/com/knecon/fforesight/feigntestclients/external/TenantsClient.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/TenantsClient.java similarity index 81% rename from src/test/java/com/knecon/fforesight/feigntestclients/external/TenantsClient.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/TenantsClient.java index aabd6c8..eced781 100644 --- a/src/test/java/com/knecon/fforesight/feigntestclients/external/TenantsClient.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/TenantsClient.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.feigntestclients.external; +package com.knecon.fforesight.tenantusermanagement.feigntestclients.external; import org.springframework.cloud.openfeign.FeignClient; diff --git a/src/test/java/com/knecon/fforesight/feigntestclients/external/UserClient.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/UserClient.java similarity index 80% rename from src/test/java/com/knecon/fforesight/feigntestclients/external/UserClient.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/UserClient.java index 90d2cc0..c9cda64 100644 --- a/src/test/java/com/knecon/fforesight/feigntestclients/external/UserClient.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/UserClient.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.feigntestclients.external; +package com.knecon.fforesight.tenantusermanagement.feigntestclients.external; import org.springframework.cloud.openfeign.FeignClient; diff --git a/src/test/java/com/knecon/fforesight/feigntestclients/external/UserPreferenceClient.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/UserPreferenceClient.java similarity index 82% rename from src/test/java/com/knecon/fforesight/feigntestclients/external/UserPreferenceClient.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/UserPreferenceClient.java index 85e958e..3dd2a42 100644 --- a/src/test/java/com/knecon/fforesight/feigntestclients/external/UserPreferenceClient.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/UserPreferenceClient.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.feigntestclients.external; +package com.knecon.fforesight.tenantusermanagement.feigntestclients.external; import org.springframework.cloud.openfeign.FeignClient; diff --git a/src/test/java/com/knecon/fforesight/feigntestclients/internal/InternalTenantsClient.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/internal/InternalTenantsClient.java similarity index 80% rename from src/test/java/com/knecon/fforesight/feigntestclients/internal/InternalTenantsClient.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/internal/InternalTenantsClient.java index cceb7ba..48a6ee8 100644 --- a/src/test/java/com/knecon/fforesight/feigntestclients/internal/InternalTenantsClient.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/internal/InternalTenantsClient.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.feigntestclients.internal; +package com.knecon.fforesight.tenantusermanagement.feigntestclients.internal; import org.springframework.cloud.openfeign.FeignClient; diff --git a/src/test/java/com/knecon/fforesight/testcontainers/KeyCloakTestContainer.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/KeyCloakTestContainer.java similarity index 97% rename from src/test/java/com/knecon/fforesight/testcontainers/KeyCloakTestContainer.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/KeyCloakTestContainer.java index 8a06122..d65a2e8 100644 --- a/src/test/java/com/knecon/fforesight/testcontainers/KeyCloakTestContainer.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/KeyCloakTestContainer.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.testcontainers; +package com.knecon.fforesight.tenantusermanagement.testcontainers; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/com/knecon/fforesight/testcontainers/MinioTestContainer.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/MinioTestContainer.java similarity index 92% rename from src/test/java/com/knecon/fforesight/testcontainers/MinioTestContainer.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/MinioTestContainer.java index 841d93d..dd5415c 100644 --- a/src/test/java/com/knecon/fforesight/testcontainers/MinioTestContainer.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/MinioTestContainer.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.testcontainers; +package com.knecon.fforesight.tenantusermanagement.testcontainers; import org.testcontainers.containers.GenericContainer; import org.testcontainers.utility.DockerImageName; diff --git a/src/test/java/com/knecon/fforesight/testcontainers/RedisTestContainer.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/RedisTestContainer.java similarity index 90% rename from src/test/java/com/knecon/fforesight/testcontainers/RedisTestContainer.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/RedisTestContainer.java index 0ca3380..5933dca 100644 --- a/src/test/java/com/knecon/fforesight/testcontainers/RedisTestContainer.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/RedisTestContainer.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.testcontainers; +package com.knecon.fforesight.tenantusermanagement.testcontainers; import org.testcontainers.containers.GenericContainer; import org.testcontainers.utility.DockerImageName; diff --git a/src/test/java/com/knecon/fforesight/testcontainers/SpringPostgreSQLTestContainer.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/SpringPostgreSQLTestContainer.java similarity index 89% rename from src/test/java/com/knecon/fforesight/testcontainers/SpringPostgreSQLTestContainer.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/SpringPostgreSQLTestContainer.java index a9b96ae..e920202 100644 --- a/src/test/java/com/knecon/fforesight/testcontainers/SpringPostgreSQLTestContainer.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/SpringPostgreSQLTestContainer.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.testcontainers; +package com.knecon.fforesight.tenantusermanagement.testcontainers; import org.testcontainers.containers.PostgreSQLContainer; diff --git a/src/test/java/com/knecon/fforesight/tests/GeneralSettingsTest.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/GeneralSettingsTest.java similarity index 85% rename from src/test/java/com/knecon/fforesight/tests/GeneralSettingsTest.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/tests/GeneralSettingsTest.java index 78085a0..249ff45 100644 --- a/src/test/java/com/knecon/fforesight/tests/GeneralSettingsTest.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/GeneralSettingsTest.java @@ -1,11 +1,11 @@ -package com.knecon.fforesight.tests; +package com.knecon.fforesight.tenantusermanagement.tests; import static org.assertj.core.api.Assertions.assertThat; import org.springframework.beans.factory.annotation.Autowired; -import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest; -import com.knecon.fforesight.feigntestclients.external.GeneralSettingsClient; +import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest; +import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.GeneralSettingsClient; import com.knecon.fforesight.tenantcommons.TenantContext; import com.knecon.fforesight.tenantusermanagement.model.GeneralConfigurationModel; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/knecon/fforesight/tests/IdentityTest.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/IdentityTest.java similarity index 77% rename from src/test/java/com/knecon/fforesight/tests/IdentityTest.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/tests/IdentityTest.java index 654949f..976818f 100644 --- a/src/test/java/com/knecon/fforesight/tests/IdentityTest.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/IdentityTest.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tests; +package com.knecon.fforesight.tenantusermanagement.tests; import static org.junit.jupiter.api.Assumptions.assumeTrue; diff --git a/src/test/java/com/knecon/fforesight/tests/RealmTest.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/RealmTest.java similarity index 84% rename from src/test/java/com/knecon/fforesight/tests/RealmTest.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/tests/RealmTest.java index 00c4c3f..35fea21 100644 --- a/src/test/java/com/knecon/fforesight/tests/RealmTest.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/RealmTest.java @@ -1,11 +1,11 @@ -package com.knecon.fforesight.tests; +package com.knecon.fforesight.tenantusermanagement.tests; import static dasniko.testcontainers.keycloak.ExtendableKeycloakContainer.MASTER_REALM; import static org.junit.jupiter.api.Assertions.assertEquals; import org.springframework.beans.factory.annotation.Autowired; -import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest; +import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest; import com.knecon.fforesight.tenantusermanagement.service.RealmService; import org.junit.jupiter.api.Test; import org.keycloak.representations.idm.RealmRepresentation; diff --git a/src/test/java/com/knecon/fforesight/tests/SMTPConfigurationTest.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/SMTPConfigurationTest.java similarity index 91% rename from src/test/java/com/knecon/fforesight/tests/SMTPConfigurationTest.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/tests/SMTPConfigurationTest.java index 620ae8a..0346819 100644 --- a/src/test/java/com/knecon/fforesight/tests/SMTPConfigurationTest.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/SMTPConfigurationTest.java @@ -1,12 +1,12 @@ -package com.knecon.fforesight.tests; +package com.knecon.fforesight.tenantusermanagement.tests; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.springframework.beans.factory.annotation.Autowired; -import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest; -import com.knecon.fforesight.feigntestclients.external.SMTPConfigurationClient; +import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest; +import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.SMTPConfigurationClient; import com.knecon.fforesight.tenantcommons.TenantContext; import com.knecon.fforesight.tenantusermanagement.model.SMTPConfiguration; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/knecon/fforesight/tests/StartupTest.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/StartupTest.java similarity index 65% rename from src/test/java/com/knecon/fforesight/tests/StartupTest.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/tests/StartupTest.java index 6c4a4a9..9dde382 100644 --- a/src/test/java/com/knecon/fforesight/tests/StartupTest.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/StartupTest.java @@ -1,11 +1,11 @@ -package com.knecon.fforesight.tests; +package com.knecon.fforesight.tenantusermanagement.tests; import static org.assertj.core.api.Assertions.assertThat; import org.springframework.beans.factory.annotation.Autowired; -import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest; -import com.knecon.fforesight.feigntestclients.internal.InternalTenantsClient; +import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest; +import com.knecon.fforesight.tenantusermanagement.feigntestclients.internal.InternalTenantsClient; import org.junit.jupiter.api.Test; public class StartupTest extends AbstractTenantUserManagementIntegrationTest { diff --git a/src/test/java/com/knecon/fforesight/tests/TenantsTest.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/TenantsTest.java similarity index 97% rename from src/test/java/com/knecon/fforesight/tests/TenantsTest.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/tests/TenantsTest.java index 0e0040c..8d2cb96 100644 --- a/src/test/java/com/knecon/fforesight/tests/TenantsTest.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/TenantsTest.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tests; +package com.knecon.fforesight.tenantusermanagement.tests; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -8,8 +8,8 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; -import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest; -import com.knecon.fforesight.feigntestclients.external.TenantsClient; +import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest; +import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.TenantsClient; import com.knecon.fforesight.tenantcommons.TenantContext; import com.knecon.fforesight.tenantcommons.model.AzureStorageConnection; import com.knecon.fforesight.tenantcommons.model.DatabaseConnection; @@ -18,7 +18,7 @@ import com.knecon.fforesight.tenantcommons.model.SearchConnection; import com.knecon.fforesight.tenantusermanagement.model.SearchConnectionRequest; import com.knecon.fforesight.tenantusermanagement.model.TenantRequest; import com.knecon.fforesight.tenantusermanagement.service.RealmService; -import com.knecon.fforesight.utils.TestTenantService; +import com.knecon.fforesight.tenantusermanagement.utils.TestTenantService; import feign.FeignException; import org.junit.jupiter.api.Test; import software.amazon.awssdk.regions.Region; diff --git a/src/test/java/com/knecon/fforesight/tests/UserPreferenceTest.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/UserPreferenceTest.java similarity index 82% rename from src/test/java/com/knecon/fforesight/tests/UserPreferenceTest.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/tests/UserPreferenceTest.java index 60ce651..27603ac 100644 --- a/src/test/java/com/knecon/fforesight/tests/UserPreferenceTest.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/UserPreferenceTest.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tests; +package com.knecon.fforesight.tenantusermanagement.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -6,8 +6,8 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest; -import com.knecon.fforesight.feigntestclients.external.UserPreferenceClient; +import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest; +import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.UserPreferenceClient; import com.knecon.fforesight.tenantcommons.TenantContext; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/knecon/fforesight/tests/UserTest.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/UserTest.java similarity index 96% rename from src/test/java/com/knecon/fforesight/tests/UserTest.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/tests/UserTest.java index aa59134..ffd2030 100644 --- a/src/test/java/com/knecon/fforesight/tests/UserTest.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/tests/UserTest.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.tests; +package com.knecon.fforesight.tenantusermanagement.tests; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -9,8 +9,8 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; -import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest; -import com.knecon.fforesight.feigntestclients.external.UserClient; +import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest; +import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.UserClient; import com.knecon.fforesight.tenantcommons.TenantContext; import com.knecon.fforesight.tenantusermanagement.model.CreateUserRequest; import com.knecon.fforesight.tenantusermanagement.model.ResetPasswordRequest; diff --git a/src/test/java/com/knecon/fforesight/utils/FeignRequestInterceptor.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/utils/FeignRequestInterceptor.java similarity index 91% rename from src/test/java/com/knecon/fforesight/utils/FeignRequestInterceptor.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/utils/FeignRequestInterceptor.java index 8a487d2..4ec16ea 100644 --- a/src/test/java/com/knecon/fforesight/utils/FeignRequestInterceptor.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/utils/FeignRequestInterceptor.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.utils; +package com.knecon.fforesight.tenantusermanagement.utils; import org.springframework.stereotype.Component; diff --git a/src/test/java/com/knecon/fforesight/utils/TenantSyncUtils.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TenantSyncUtils.java similarity index 89% rename from src/test/java/com/knecon/fforesight/utils/TenantSyncUtils.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TenantSyncUtils.java index 32ee25e..f602ab0 100644 --- a/src/test/java/com/knecon/fforesight/utils/TenantSyncUtils.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TenantSyncUtils.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.utils; +package com.knecon.fforesight.tenantusermanagement.utils; import static org.mockito.Mockito.when; @@ -13,9 +13,9 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; -import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest; -import com.knecon.fforesight.feigntestclients.external.TenantsClient; -import com.knecon.fforesight.feigntestclients.internal.InternalTenantsClient; +import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest; +import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.TenantsClient; +import com.knecon.fforesight.tenantusermanagement.feigntestclients.internal.InternalTenantsClient; import com.knecon.fforesight.tenantusermanagement.TenantUserManagementServiceApplication; import com.knecon.fforesight.tenantusermanagement.service.KeyCloakRoleManagerService; import com.knecon.fforesight.tenantusermanagement.service.RealmService; diff --git a/src/test/java/com/knecon/fforesight/utils/TestTenantService.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TestTenantService.java similarity index 94% rename from src/test/java/com/knecon/fforesight/utils/TestTenantService.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TestTenantService.java index 258680d..a48f88f 100644 --- a/src/test/java/com/knecon/fforesight/utils/TestTenantService.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TestTenantService.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.utils; +package com.knecon.fforesight.tenantusermanagement.utils; import static org.assertj.core.api.Assertions.assertThat; @@ -8,7 +8,7 @@ import java.util.UUID; import org.springframework.stereotype.Service; -import com.knecon.fforesight.feigntestclients.external.TenantsClient; +import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.TenantsClient; import com.knecon.fforesight.tenantcommons.TenantContext; import com.knecon.fforesight.tenantcommons.model.DatabaseConnection; import com.knecon.fforesight.tenantcommons.model.S3StorageConnection; @@ -16,7 +16,7 @@ import com.knecon.fforesight.tenantusermanagement.api.internal.InternalTenantsRe import com.knecon.fforesight.tenantusermanagement.model.SearchConnectionRequest; import com.knecon.fforesight.tenantusermanagement.model.TenantRequest; import com.knecon.fforesight.tenantusermanagement.model.TenantUser; -import com.knecon.fforesight.testcontainers.SpringPostgreSQLTestContainer; +import com.knecon.fforesight.tenantusermanagement.testcontainers.SpringPostgreSQLTestContainer; import lombok.RequiredArgsConstructor; import software.amazon.awssdk.regions.Region; diff --git a/src/test/java/com/knecon/fforesight/utils/TokenService.java b/src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TokenService.java similarity index 97% rename from src/test/java/com/knecon/fforesight/utils/TokenService.java rename to src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TokenService.java index 8d4ebbb..c39fcd8 100644 --- a/src/test/java/com/knecon/fforesight/utils/TokenService.java +++ b/src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TokenService.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.utils; +package com.knecon.fforesight.tenantusermanagement.utils; import java.io.InputStream; import java.io.InputStreamReader;