From 0272021981732127970927285f34e45179bcfd1c Mon Sep 17 00:00:00 2001 From: Yurii Luchkiv Date: Mon, 27 May 2024 11:45:00 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=E2=80=94=20Migrate:=20ApplicationFramework?= =?UTF-8?q?Properties=20->=20tech1-framework-domain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + pom.xml | 1 - sonar-project.properties | 2 -- .../ApplicationBaseSecurityJwtWebsockets.java | 2 +- .../tasks/HardwareBackPressureTimerTask.java | 2 +- .../impl/WssMessagingTemplateImpl.java | 2 +- ...licationBaseSecurityJwtWebsocketsTest.java | 2 +- .../SecurityHandshakeHandlerTest.java | 4 +-- .../impl/WssMessagingTemplateImplTest.java | 2 +- .../base/BaseCurrentSessionAssistant.java | 2 +- .../ApplicationBaseSecurityJwt.java | 2 +- .../ApplicationBaseSecurityJwtMvc.java | 2 +- .../base/security/jwt/crons/SessionsCron.java | 2 +- .../essense/AbstractEssenceConstructor.java | 2 +- .../SecurityJwtIncidentPublisherImpl.java | 2 +- .../logging/AdvancedRequestLoggingFilter.java | 2 +- .../AbstractBaseInvitationCodesService.java | 2 +- .../services/impl/UsersEmailsServiceImpl.java | 2 +- .../startup/DefaultStartupEventListener.java | 2 +- .../facade/impl/TokensProviderImpl.java | 2 +- .../providers/TokenCookiesProvider.java | 2 +- .../providers/TokenHeadersProvider.java | 2 +- .../jwt/utils/impl/HttpRequestUtilsImpl.java | 2 +- .../utils/impl/SecurityJwtTokenUtilsImpl.java | 2 +- .../jwt/utils/impl/UserEmailUtilsImpl.java | 2 +- ...tBaseInvitationCodesRequestsValidator.java | 2 +- .../base/BaseCurrentSessionAssistantTest.java | 2 +- .../ApplicationBaseSecurityJwtMvcTest.java | 6 ++--- .../security/jwt/crons/SessionsCronTest.java | 2 +- .../AbstractEssenceConstructorTest.java | 2 +- .../SecurityJwtIncidentPublisherImplTest.java | 2 +- .../AdvancedRequestLoggingFilterTest.java | 2 +- ...seSecurityInvitationCodesResourceTest.java | 2 +- ...bstractBaseInvitationCodesServiceTest.java | 6 ++--- .../AbstractBaseUsersSessionsServiceTest.java | 6 ++--- .../impl/UsersEmailsServiceImplTest.java | 2 +- .../DefaultStartupEventListenerTest.java | 2 +- .../TestsApplicationPropertiesMocked.java | 2 +- .../TestsApplicationValidatorsContext.java | 4 +-- .../runners/AbstractResourcesRunner1.java | 4 +-- .../facade/impl/TokensProviderImplTest.java | 2 +- .../providers/TokenCookiesProviderTest.java | 6 ++--- .../providers/TokenHeadersProviderTest.java | 6 ++--- .../utils/impl/HttpRequestUtilsImplTest.java | 6 ++--- .../impl/SecurityJwtTokenUtilsImplTest.java | 6 ++--- .../utils/impl/UserEmailUtilsImplTest.java | 6 ++--- ...eInvitationCodesRequestsValidatorTest.java | 2 +- .../jwt/configurations/ApplicationMongo.java | 2 +- .../essence/MongoBaseEssenceConstructor.java | 2 +- .../MongoBaseInvitationCodesService.java | 2 +- ...oBaseInvitationCodesRequestsValidator.java | 2 +- .../configurations/ApplicationMongoTest.java | 6 ++--- .../MongoBaseEssenceConstructorTest.java | 6 ++--- .../b2b/mongodb/server/Application.java | 2 +- .../server/startup/StartupEventListener.java | 2 +- .../PostgresBaseEssenceConstructor.java | 2 +- .../PostgresBaseInvitationCodesService.java | 2 +- ...sBaseInvitationCodesRequestsValidator.java | 2 +- .../ApplicationPostgresRepositoriesTest.java | 4 +-- .../ApplicationPostgresTest.java | 4 +-- .../PostgresBaseEssenceConstructorTest.java | 6 ++--- ...gresTestsApplicationValidatorsContext.java | 4 +-- .../b2b/postgres/server/Application.java | 2 +- .../server/startup/StartupEventListener.java | 2 +- .../async/ApplicationAsync.java | 2 +- .../events/ApplicationEvents.java | 2 +- .../configurations/mvc/ApplicationMVC.java | 2 +- .../server/ApplicationSpringBootServer.java | 2 +- .../async/ApplicationAsyncTest.java | 6 ++--- .../events/ApplicationEventsTest.java | 4 +-- .../jasypt/ApplicationJasyptTest.java | 4 +-- .../mvc/ApplicationMvc1Test.java | 2 +- .../mvc/ApplicationMvc2Test.java | 2 +- .../mvc/ApplicationMvc3Test.java | 2 +- .../ApplicationSpringBootServerTest.java | 4 +-- .../ApplicationFrameworkProperties.java | 2 +- ...meworkPropertiesTestsHardcodedContext.java | 5 ++-- .../ApplicationFrameworkPropertiesTest.java | 6 ++--- .../configurations/ApplicationEmails.java | 2 +- .../services/impl/EmailServiceImpl.java | 2 +- .../configurations/ApplicationEmailsTest.java | 6 ++--- .../services/impl/EmailServiceImplTest.java | 2 +- .../ApplicationHardwareMonitoring.java | 2 +- .../impl/HardwareMonitoringStoreImpl.java | 2 +- .../ApplicationHardwareMonitoringTest.java | 4 +-- .../impl/HardwareMonitoringStoreImplTest.java | 6 ++--- .../ApplicationAsyncIncidents.java | 2 +- .../ApplicationEventsIncidents.java | 2 +- .../configurations/ApplicationIncidents.java | 2 +- .../ApplicationAsyncIncidentsTest.java | 6 ++--- .../ApplicationEventsIncidentsTest.java | 4 +-- .../ApplicationIncidents1Test.java | 2 +- .../ApplicationIncidents2Test.java | 2 +- .../impl/IncidentPublisherImplTest.java | 2 +- tech1-framework-properties/pom.xml | 25 ------------------- .../src/test/resources/logback-test.xml | 23 ----------------- tech1-framework-utilities/pom.xml | 2 +- .../impl/UserAgentDetailsUtilityImpl.java | 3 +-- .../configurations/ApplicationUtilities.java | 2 +- .../impl/GeoCountryFlagUtilityImpl.java | 2 +- .../impl/MindMaxGeoLocationUtilityImpl.java | 2 +- .../resources/actuator/BaseInfoResource.java | 2 +- .../impl/UserAgentDetailsUtilityImplTest.java | 6 ++--- .../impl/GeoCountryFlagUtilityImplTest.java | 6 ++--- ...PAPIGeoLocationUtilityImplConsoleTest.java | 6 ++--- .../actuator/BaseInfoResourceTest.java | 6 ++--- 106 files changed, 154 insertions(+), 206 deletions(-) rename {tech1-framework-properties/src/main/java/io/tech1/framework => tech1-framework-domain/src/main/java/io/tech1/framework/domain}/properties/ApplicationFrameworkProperties.java (96%) rename tech1-framework-properties/src/main/java/io/tech1/framework/properties/tests/contexts/ApplicationFrameworkPropertiesContext.java => tech1-framework-domain/src/main/java/io/tech1/framework/domain/properties/ApplicationFrameworkPropertiesTestsHardcodedContext.java (88%) rename {tech1-framework-properties/src/test/java/io/tech1/framework => tech1-framework-domain/src/test/java/io/tech1/framework/domain}/properties/ApplicationFrameworkPropertiesTest.java (80%) delete mode 100644 tech1-framework-properties/pom.xml delete mode 100644 tech1-framework-properties/src/test/resources/logback-test.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 2214d05f8..79ee9a457 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,3 @@ ### Changelog [v2.8.4] — Migrate: ops b2b-****-server in docker +— Migrate: ApplicationFrameworkProperties -> tech1-framework-domain diff --git a/pom.xml b/pom.xml index 5269b4367..062ab3db9 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,6 @@ tech1-framework-domain tech1-framework-utilities - tech1-framework-properties tech1-framework-feign-clients tech1-framework-configurations tech1-framework-emails diff --git a/sonar-project.properties b/sonar-project.properties index d890873d4..24312f7f3 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -30,7 +30,6 @@ sonar.sourceEncoding=UTF-8 # Modules sonar.modules=tech1-framework-domain,\ tech1-framework-utilities,\ - tech1-framework-properties,\ tech1-framework-configurations,\ tech1-framework-emails,\ tech1-framework-hardware,\ @@ -43,7 +42,6 @@ sonar.modules=tech1-framework-domain,\ tech1-framework-b2b-postgres-server tech1-framework-domain.sonar.projectName=tech1-framework-domain tech1-framework-utilities.sonar.projectName=tech1-framework-utilities -tech1-framework-properties.sonar.projectName=tech1-framework-properties tech1-framework-configurations.sonar.projectName=tech1-framework-configurations tech1-framework-emails.sonar.projectName=tech1-framework-emails tech1-framework-hardware.sonar.projectName=tech1-framework-hardware diff --git a/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/configurations/ApplicationBaseSecurityJwtWebsockets.java b/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/configurations/ApplicationBaseSecurityJwtWebsockets.java index d435cce11..062670aa9 100644 --- a/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/configurations/ApplicationBaseSecurityJwtWebsockets.java +++ b/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/configurations/ApplicationBaseSecurityJwtWebsockets.java @@ -3,7 +3,7 @@ import io.tech1.framework.b2b.base.security.jwt.websockets.handshakes.CsrfInterceptorHandshake; import io.tech1.framework.b2b.base.security.jwt.websockets.handshakes.SecurityHandshakeHandler; import io.tech1.framework.domain.base.PropertyId; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/tasks/HardwareBackPressureTimerTask.java b/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/tasks/HardwareBackPressureTimerTask.java index 1a288a9ab..5c5f47a13 100644 --- a/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/tasks/HardwareBackPressureTimerTask.java +++ b/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/tasks/HardwareBackPressureTimerTask.java @@ -6,7 +6,7 @@ import io.tech1.framework.domain.time.SchedulerConfiguration; import io.tech1.framework.hardware.monitoring.store.HardwareMonitoringStore; import io.tech1.framework.incidents.events.publishers.IncidentPublisher; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/tempate/impl/WssMessagingTemplateImpl.java b/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/tempate/impl/WssMessagingTemplateImpl.java index 31e0d5d1a..077b90dea 100644 --- a/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/tempate/impl/WssMessagingTemplateImpl.java +++ b/tech1-framework-b2b-base-security-jwt-websockets/src/main/java/io/tech1/framework/b2b/base/security/jwt/websockets/tempate/impl/WssMessagingTemplateImpl.java @@ -4,7 +4,7 @@ import io.tech1.framework.b2b.base.security.jwt.websockets.tempate.WssMessagingTemplate; import io.tech1.framework.domain.base.Username; import io.tech1.framework.incidents.events.publishers.IncidentPublisher; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/configurations/ApplicationBaseSecurityJwtWebsocketsTest.java b/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/configurations/ApplicationBaseSecurityJwtWebsocketsTest.java index 5a7136bc4..f3f874df8 100644 --- a/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/configurations/ApplicationBaseSecurityJwtWebsocketsTest.java +++ b/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/configurations/ApplicationBaseSecurityJwtWebsocketsTest.java @@ -6,7 +6,7 @@ import io.tech1.framework.domain.properties.configs.MvcConfigs; import io.tech1.framework.domain.properties.configs.SecurityJwtWebsocketsConfigs; import io.tech1.framework.domain.properties.configs.mvc.CorsConfigs; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/handshakes/SecurityHandshakeHandlerTest.java b/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/handshakes/SecurityHandshakeHandlerTest.java index e8d065d90..a13a06bfb 100644 --- a/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/handshakes/SecurityHandshakeHandlerTest.java +++ b/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/handshakes/SecurityHandshakeHandlerTest.java @@ -7,7 +7,7 @@ import io.tech1.framework.b2b.base.security.jwt.tokens.facade.TokensProvider; import io.tech1.framework.domain.base.Username; import io.tech1.framework.domain.exceptions.tokens.*; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -52,7 +52,7 @@ private static Stream determineUserExceptionTest() { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/template/impl/WssMessagingTemplateImplTest.java b/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/template/impl/WssMessagingTemplateImplTest.java index 267f6feb0..d833aeb9b 100644 --- a/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/template/impl/WssMessagingTemplateImplTest.java +++ b/tech1-framework-b2b-base-security-jwt-websockets/src/test/java/io/tech1/framework/b2b/base/security/jwt/websockets/template/impl/WssMessagingTemplateImplTest.java @@ -7,7 +7,7 @@ import io.tech1.framework.domain.properties.configs.SecurityJwtWebsocketsConfigs; import io.tech1.framework.domain.properties.configs.security.jwt.websockets.*; import io.tech1.framework.incidents.events.publishers.IncidentPublisher; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/assistants/current/base/BaseCurrentSessionAssistant.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/assistants/current/base/BaseCurrentSessionAssistant.java index aeea7633e..eff0bce49 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/assistants/current/base/BaseCurrentSessionAssistant.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/assistants/current/base/BaseCurrentSessionAssistant.java @@ -14,7 +14,7 @@ import io.tech1.framework.domain.base.Username; import io.tech1.framework.domain.exceptions.tokens.AccessTokenNotFoundException; import io.tech1.framework.hardware.monitoring.store.HardwareMonitoringStore; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwt.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwt.java index aed8f528d..ec901b5be 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwt.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwt.java @@ -9,7 +9,7 @@ import io.tech1.framework.domain.base.PropertyId; import io.tech1.framework.emails.configurations.ApplicationEmails; import io.tech1.framework.incidents.configurations.ApplicationIncidents; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import io.tech1.framework.utilities.configurations.ApplicationUtilities; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwtMvc.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwtMvc.java index 90b1de8a6..65ce88208 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwtMvc.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwtMvc.java @@ -2,7 +2,7 @@ import io.tech1.framework.b2b.base.security.jwt.annotations.AbstractFrameworkBaseSecurityResource; import io.tech1.framework.configurations.mvc.ApplicationMVC; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/crons/SessionsCron.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/crons/SessionsCron.java index d58555d01..8001f60e7 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/crons/SessionsCron.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/crons/SessionsCron.java @@ -4,7 +4,7 @@ import io.tech1.framework.b2b.base.security.jwt.sessions.SessionRegistry; import io.tech1.framework.domain.crons.AbstractBaseCron; import io.tech1.framework.incidents.events.publishers.IncidentPublisher; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/essense/AbstractEssenceConstructor.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/essense/AbstractEssenceConstructor.java index def2ea06d..3f99492bb 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/essense/AbstractEssenceConstructor.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/essense/AbstractEssenceConstructor.java @@ -2,7 +2,7 @@ import io.tech1.framework.b2b.base.security.jwt.repositories.InvitationCodesRepository; import io.tech1.framework.b2b.base.security.jwt.repositories.UsersRepository; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/events/publishers/impl/SecurityJwtIncidentPublisherImpl.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/events/publishers/impl/SecurityJwtIncidentPublisherImpl.java index 56bc85b2c..e7954e5df 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/events/publishers/impl/SecurityJwtIncidentPublisherImpl.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/events/publishers/impl/SecurityJwtIncidentPublisherImpl.java @@ -7,7 +7,7 @@ import io.tech1.framework.incidents.domain.registration.IncidentRegistration1Failure; import io.tech1.framework.incidents.domain.session.IncidentSessionExpired; import io.tech1.framework.incidents.domain.session.IncidentSessionRefreshed; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/filters/logging/AdvancedRequestLoggingFilter.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/filters/logging/AdvancedRequestLoggingFilter.java index 37aa7c7a4..fe5be67ec 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/filters/logging/AdvancedRequestLoggingFilter.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/filters/logging/AdvancedRequestLoggingFilter.java @@ -3,7 +3,7 @@ import io.tech1.framework.b2b.base.security.jwt.utils.HttpRequestUtils; import io.tech1.framework.b2b.base.security.jwt.utils.SecurityPrincipalUtils; import io.tech1.framework.domain.http.cache.CachedBodyHttpServletRequest; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseInvitationCodesService.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseInvitationCodesService.java index 636685033..72a7d246b 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseInvitationCodesService.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseInvitationCodesService.java @@ -6,7 +6,7 @@ import io.tech1.framework.b2b.base.security.jwt.repositories.InvitationCodesRepository; import io.tech1.framework.b2b.base.security.jwt.services.BaseInvitationCodesService; import io.tech1.framework.domain.base.Username; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/services/impl/UsersEmailsServiceImpl.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/services/impl/UsersEmailsServiceImpl.java index 06f6d3bb2..5748f24f2 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/services/impl/UsersEmailsServiceImpl.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/services/impl/UsersEmailsServiceImpl.java @@ -12,7 +12,7 @@ import io.tech1.framework.domain.tuples.Tuple3; import io.tech1.framework.emails.domain.EmailHTML; import io.tech1.framework.emails.services.EmailService; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/startup/DefaultStartupEventListener.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/startup/DefaultStartupEventListener.java index 5ba52416e..bde366f5b 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/startup/DefaultStartupEventListener.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/startup/DefaultStartupEventListener.java @@ -3,7 +3,7 @@ import io.tech1.framework.b2b.base.security.jwt.essense.AbstractEssenceConstructor; import io.tech1.framework.domain.enums.Status; import io.tech1.framework.domain.enums.Toggle; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/facade/impl/TokensProviderImpl.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/facade/impl/TokensProviderImpl.java index 05c9c0b93..de9687a75 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/facade/impl/TokensProviderImpl.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/facade/impl/TokensProviderImpl.java @@ -10,7 +10,7 @@ import io.tech1.framework.domain.exceptions.tokens.AccessTokenNotFoundException; import io.tech1.framework.domain.exceptions.tokens.CsrfTokenNotFoundException; import io.tech1.framework.domain.exceptions.tokens.RefreshTokenNotFoundException; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenCookiesProvider.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenCookiesProvider.java index 122455631..1c275179c 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenCookiesProvider.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenCookiesProvider.java @@ -8,7 +8,7 @@ import io.tech1.framework.domain.exceptions.tokens.AccessTokenNotFoundException; import io.tech1.framework.domain.exceptions.tokens.CsrfTokenNotFoundException; import io.tech1.framework.domain.exceptions.tokens.RefreshTokenNotFoundException; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenHeadersProvider.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenHeadersProvider.java index fef2dcbe3..18539f21a 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenHeadersProvider.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenHeadersProvider.java @@ -7,7 +7,7 @@ import io.tech1.framework.domain.exceptions.tokens.AccessTokenNotFoundException; import io.tech1.framework.domain.exceptions.tokens.CsrfTokenNotFoundException; import io.tech1.framework.domain.exceptions.tokens.RefreshTokenNotFoundException; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/HttpRequestUtilsImpl.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/HttpRequestUtilsImpl.java index d30dc188a..20416ee13 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/HttpRequestUtilsImpl.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/HttpRequestUtilsImpl.java @@ -2,7 +2,7 @@ import io.tech1.framework.b2b.base.security.jwt.utils.HttpRequestUtils; import io.tech1.framework.domain.http.cache.CachedBodyHttpServletRequest; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/SecurityJwtTokenUtilsImpl.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/SecurityJwtTokenUtilsImpl.java index 02fa66194..d240347df 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/SecurityJwtTokenUtilsImpl.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/SecurityJwtTokenUtilsImpl.java @@ -11,7 +11,7 @@ import io.tech1.framework.b2b.base.security.jwt.utils.SecurityJwtTokenUtils; import io.tech1.framework.domain.base.PropertyId; import io.tech1.framework.domain.properties.base.TimeAmount; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImpl.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImpl.java index 2aa5dff7d..d5eafd64a 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImpl.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImpl.java @@ -4,7 +4,7 @@ import io.tech1.framework.b2b.base.security.jwt.utils.UserEmailUtils; import io.tech1.framework.domain.base.Username; import io.tech1.framework.domain.http.requests.UserRequestMetadata; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ResourceLoader; diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/validators/abtracts/AbstractBaseInvitationCodesRequestsValidator.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/validators/abtracts/AbstractBaseInvitationCodesRequestsValidator.java index 1ca926ca0..833e36176 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/validators/abtracts/AbstractBaseInvitationCodesRequestsValidator.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/validators/abtracts/AbstractBaseInvitationCodesRequestsValidator.java @@ -5,7 +5,7 @@ import io.tech1.framework.b2b.base.security.jwt.repositories.InvitationCodesRepository; import io.tech1.framework.b2b.base.security.jwt.validators.BaseInvitationCodesRequestsValidator; import io.tech1.framework.domain.base.Username; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.AccessLevel; import lombok.AllArgsConstructor; import org.springframework.security.access.AccessDeniedException; diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/assistants/current/base/BaseCurrentSessionAssistantTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/assistants/current/base/BaseCurrentSessionAssistantTest.java index 89846864f..194cc59f3 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/assistants/current/base/BaseCurrentSessionAssistantTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/assistants/current/base/BaseCurrentSessionAssistantTest.java @@ -16,7 +16,7 @@ import io.tech1.framework.domain.properties.configs.HardwareMonitoringConfigs; import io.tech1.framework.domain.tuples.TuplePresence; import io.tech1.framework.hardware.monitoring.store.HardwareMonitoringStore; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwtMvcTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwtMvcTest.java index 34c7bba80..eff4a9d0a 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwtMvcTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwtMvcTest.java @@ -2,8 +2,8 @@ import io.tech1.framework.b2b.base.security.jwt.tests.classes.ClassAnnotatedAbstractFrameworkBaseSecurityResource; import io.tech1.framework.b2b.base.security.jwt.tests.classes.ClassNotAnnotatedAbstractFrameworkBaseSecurityResource; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -33,7 +33,7 @@ class ApplicationBaseSecurityJwtMvcTest { @Configuration @Import( - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class ) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/crons/SessionsCronTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/crons/SessionsCronTest.java index 6ef4c64ba..7a6163f97 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/crons/SessionsCronTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/crons/SessionsCronTest.java @@ -7,7 +7,7 @@ import io.tech1.framework.domain.properties.configs.SecurityJwtConfigs; import io.tech1.framework.domain.properties.configs.security.jwt.SessionConfigs; import io.tech1.framework.incidents.events.publishers.IncidentPublisher; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/essence/AbstractEssenceConstructorTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/essence/AbstractEssenceConstructorTest.java index 10d095088..eb4224e34 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/essence/AbstractEssenceConstructorTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/essence/AbstractEssenceConstructorTest.java @@ -7,7 +7,7 @@ import io.tech1.framework.domain.base.Username; import io.tech1.framework.domain.properties.base.DefaultUser; import io.tech1.framework.domain.properties.configs.SecurityJwtConfigs; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/event/publishers/impl/SecurityJwtIncidentPublisherImplTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/event/publishers/impl/SecurityJwtIncidentPublisherImplTest.java index 2221552c0..e01655e43 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/event/publishers/impl/SecurityJwtIncidentPublisherImplTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/event/publishers/impl/SecurityJwtIncidentPublisherImplTest.java @@ -10,7 +10,7 @@ import io.tech1.framework.incidents.domain.registration.IncidentRegistration1Failure; import io.tech1.framework.incidents.domain.session.IncidentSessionExpired; import io.tech1.framework.incidents.domain.session.IncidentSessionRefreshed; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/filters/logging/AdvancedRequestLoggingFilterTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/filters/logging/AdvancedRequestLoggingFilterTest.java index 842916b53..0644de707 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/filters/logging/AdvancedRequestLoggingFilterTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/filters/logging/AdvancedRequestLoggingFilterTest.java @@ -6,7 +6,7 @@ import io.tech1.framework.domain.http.cache.CachedBodyServletInputStream; import io.tech1.framework.domain.properties.configs.SecurityJwtConfigs; import io.tech1.framework.domain.properties.configs.security.jwt.LoggingConfigs; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/resources/BaseSecurityInvitationCodesResourceTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/resources/BaseSecurityInvitationCodesResourceTest.java index c12055d26..1868924cb 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/resources/BaseSecurityInvitationCodesResourceTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/resources/BaseSecurityInvitationCodesResourceTest.java @@ -10,7 +10,7 @@ import io.tech1.framework.b2b.base.security.jwt.tests.runners.AbstractResourcesRunner1; import io.tech1.framework.b2b.base.security.jwt.validators.BaseInvitationCodesRequestsValidator; import io.tech1.framework.domain.base.Username; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseInvitationCodesServiceTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseInvitationCodesServiceTest.java index fec01a9ae..8ecccb30d 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseInvitationCodesServiceTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseInvitationCodesServiceTest.java @@ -4,8 +4,8 @@ import io.tech1.framework.b2b.base.security.jwt.domain.identifiers.InvitationCodeId; import io.tech1.framework.b2b.base.security.jwt.repositories.InvitationCodesRepository; import io.tech1.framework.domain.base.Username; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -31,7 +31,7 @@ class AbstractBaseInvitationCodesServiceTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseUsersSessionsServiceTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseUsersSessionsServiceTest.java index ac7fd05da..7bd30b5ee 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseUsersSessionsServiceTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/abstracts/AbstractBaseUsersSessionsServiceTest.java @@ -21,8 +21,8 @@ import io.tech1.framework.domain.tests.constants.TestsFlagsConstants; import io.tech1.framework.domain.tuples.TuplePresence; import io.tech1.framework.domain.tuples.TupleToggle; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import io.tech1.framework.utilities.utils.UserMetadataUtils; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; @@ -92,7 +92,7 @@ private static Stream renewUserRequestMetadataArgs() { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/impl/UsersEmailsServiceImplTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/impl/UsersEmailsServiceImplTest.java index 9e6bfbe6f..cf2150923 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/impl/UsersEmailsServiceImplTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/services/impl/UsersEmailsServiceImplTest.java @@ -11,7 +11,7 @@ import io.tech1.framework.domain.properties.configs.SecurityJwtConfigs; import io.tech1.framework.emails.domain.EmailHTML; import io.tech1.framework.emails.services.EmailService; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/startup/DefaultStartupEventListenerTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/startup/DefaultStartupEventListenerTest.java index 8c1a80f2f..d5a7b125c 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/startup/DefaultStartupEventListenerTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/startup/DefaultStartupEventListenerTest.java @@ -7,7 +7,7 @@ import io.tech1.framework.domain.properties.configs.SecurityJwtConfigs; import io.tech1.framework.domain.properties.configs.security.jwt.AuthoritiesConfigs; import io.tech1.framework.domain.properties.configs.security.jwt.EssenceConfigs; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/contexts/TestsApplicationPropertiesMocked.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/contexts/TestsApplicationPropertiesMocked.java index 7e4da381e..d61bcfe02 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/contexts/TestsApplicationPropertiesMocked.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/contexts/TestsApplicationPropertiesMocked.java @@ -1,7 +1,7 @@ package io.tech1.framework.b2b.base.security.jwt.tests.contexts; import io.tech1.framework.domain.properties.configs.MvcConfigs; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/contexts/TestsApplicationValidatorsContext.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/contexts/TestsApplicationValidatorsContext.java index a506389ca..d326b7c4c 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/contexts/TestsApplicationValidatorsContext.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/contexts/TestsApplicationValidatorsContext.java @@ -6,7 +6,7 @@ import io.tech1.framework.b2b.base.security.jwt.repositories.UsersRepository; import io.tech1.framework.b2b.base.security.jwt.repositories.UsersSessionsRepository; import io.tech1.framework.incidents.events.publishers.IncidentPublisher; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -15,7 +15,7 @@ @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) public class TestsApplicationValidatorsContext { diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/runners/AbstractResourcesRunner1.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/runners/AbstractResourcesRunner1.java index 3ca0e6dd4..b8dd89d07 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/runners/AbstractResourcesRunner1.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tests/runners/AbstractResourcesRunner1.java @@ -2,7 +2,7 @@ import io.tech1.framework.b2b.base.security.jwt.configurations.ApplicationBaseSecurityJwtMvc; import io.tech1.framework.b2b.base.security.jwt.tests.contexts.TestsApplicationResourcesContext; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +14,7 @@ @ExtendWith({ SpringExtension.class }) @ContextConfiguration(classes = { ApplicationBaseSecurityJwtMvc.class, - ApplicationFrameworkPropertiesContext.class, + ApplicationFrameworkPropertiesTestsHardcodedContext.class, TestsApplicationResourcesContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/facade/impl/TokensProviderImplTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/facade/impl/TokensProviderImplTest.java index 44f077f30..42e8d0be4 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/facade/impl/TokensProviderImplTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/facade/impl/TokensProviderImplTest.java @@ -13,7 +13,7 @@ import io.tech1.framework.domain.properties.base.TimeAmount; import io.tech1.framework.domain.properties.configs.SecurityJwtConfigs; import io.tech1.framework.domain.properties.configs.security.jwt.*; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenCookiesProviderTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenCookiesProviderTest.java index 0ccc4c3e4..7fd216a80 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenCookiesProviderTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenCookiesProviderTest.java @@ -5,8 +5,8 @@ import io.tech1.framework.domain.exceptions.tokens.AccessTokenNotFoundException; import io.tech1.framework.domain.exceptions.tokens.CsrfTokenNotFoundException; import io.tech1.framework.domain.exceptions.tokens.RefreshTokenNotFoundException; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -54,7 +54,7 @@ private static Stream readRequestRefreshTokenArgs() { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenHeadersProviderTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenHeadersProviderTest.java index 697a54bb1..f4774f09b 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenHeadersProviderTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/tokens/providers/TokenHeadersProviderTest.java @@ -7,8 +7,8 @@ import io.tech1.framework.domain.exceptions.tokens.RefreshTokenNotFoundException; import io.tech1.framework.domain.properties.configs.security.jwt.JwtTokensConfigs; import io.tech1.framework.domain.utilities.random.RandomUtility; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -35,7 +35,7 @@ class TokenHeadersProviderTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/HttpRequestUtilsImplTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/HttpRequestUtilsImplTest.java index 618a0440d..35a6eec3c 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/HttpRequestUtilsImplTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/HttpRequestUtilsImplTest.java @@ -3,8 +3,8 @@ import io.tech1.framework.b2b.base.security.jwt.utils.HttpRequestUtils; import io.tech1.framework.domain.http.cache.CachedBodyHttpServletRequest; import io.tech1.framework.domain.http.cache.CachedPayload; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -62,7 +62,7 @@ private static Stream authenticationRefreshTokenEndpointCases() { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/SecurityJwtTokenUtilsImplTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/SecurityJwtTokenUtilsImplTest.java index 46d48b10d..aa600a525 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/SecurityJwtTokenUtilsImplTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/SecurityJwtTokenUtilsImplTest.java @@ -8,8 +8,8 @@ import io.tech1.framework.b2b.base.security.jwt.utils.SecurityJwtTokenUtils; import io.tech1.framework.domain.base.Username; import io.tech1.framework.domain.properties.base.TimeAmount; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Disabled; @@ -116,7 +116,7 @@ private static Stream versionsTests() { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImplTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImplTest.java index ed65558e6..68f1396c1 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImplTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/utils/impl/UserEmailUtilsImplTest.java @@ -5,8 +5,8 @@ import io.tech1.framework.domain.base.Username; import io.tech1.framework.domain.http.requests.UserRequestMetadata; import io.tech1.framework.domain.utilities.time.LocalDateTimeUtility; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; @@ -38,7 +38,7 @@ class UserEmailUtilsImplTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/validators/abstracts/AbstractBaseInvitationCodesRequestsValidatorTest.java b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/validators/abstracts/AbstractBaseInvitationCodesRequestsValidatorTest.java index ad683348b..e15b89bc9 100644 --- a/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/validators/abstracts/AbstractBaseInvitationCodesRequestsValidatorTest.java +++ b/tech1-framework-b2b-base-security-jwt/src/test/java/io/tech1/framework/b2b/base/security/jwt/validators/abstracts/AbstractBaseInvitationCodesRequestsValidatorTest.java @@ -9,7 +9,7 @@ import io.tech1.framework.b2b.base.security.jwt.validators.abtracts.AbstractBaseInvitationCodesRequestsValidator; import io.tech1.framework.domain.base.Username; import io.tech1.framework.domain.tuples.TuplePresence; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/configurations/ApplicationMongo.java b/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/configurations/ApplicationMongo.java index f7b050906..8b772de3b 100644 --- a/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/configurations/ApplicationMongo.java +++ b/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/configurations/ApplicationMongo.java @@ -5,7 +5,7 @@ import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; import io.tech1.framework.domain.base.PropertyId; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/essence/MongoBaseEssenceConstructor.java b/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/essence/MongoBaseEssenceConstructor.java index b50123d94..91827523f 100644 --- a/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/essence/MongoBaseEssenceConstructor.java +++ b/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/essence/MongoBaseEssenceConstructor.java @@ -6,7 +6,7 @@ import io.tech1.framework.b2b.mongodb.security.jwt.repositories.MongoInvitationCodesRepository; import io.tech1.framework.b2b.mongodb.security.jwt.repositories.MongoUsersRepository; import io.tech1.framework.domain.properties.base.DefaultUser; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/services/MongoBaseInvitationCodesService.java b/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/services/MongoBaseInvitationCodesService.java index 636532ab3..320536d0c 100644 --- a/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/services/MongoBaseInvitationCodesService.java +++ b/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/services/MongoBaseInvitationCodesService.java @@ -2,7 +2,7 @@ import io.tech1.framework.b2b.base.security.jwt.services.abstracts.AbstractBaseInvitationCodesService; import io.tech1.framework.b2b.mongodb.security.jwt.repositories.MongoInvitationCodesRepository; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/validators/MongoBaseInvitationCodesRequestsValidator.java b/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/validators/MongoBaseInvitationCodesRequestsValidator.java index 9079a58ae..d4e8be112 100644 --- a/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/validators/MongoBaseInvitationCodesRequestsValidator.java +++ b/tech1-framework-b2b-mongodb-security-jwt/src/main/java/io/tech1/framework/b2b/mongodb/security/jwt/validators/MongoBaseInvitationCodesRequestsValidator.java @@ -2,7 +2,7 @@ import io.tech1.framework.b2b.base.security.jwt.validators.abtracts.AbstractBaseInvitationCodesRequestsValidator; import io.tech1.framework.b2b.mongodb.security.jwt.repositories.MongoInvitationCodesRepository; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/tech1-framework-b2b-mongodb-security-jwt/src/test/java/io/tech1/framework/b2b/mongodb/security/jwt/configurations/ApplicationMongoTest.java b/tech1-framework-b2b-mongodb-security-jwt/src/test/java/io/tech1/framework/b2b/mongodb/security/jwt/configurations/ApplicationMongoTest.java index 543e3506d..0259e089a 100644 --- a/tech1-framework-b2b-mongodb-security-jwt/src/test/java/io/tech1/framework/b2b/mongodb/security/jwt/configurations/ApplicationMongoTest.java +++ b/tech1-framework-b2b-mongodb-security-jwt/src/test/java/io/tech1/framework/b2b/mongodb/security/jwt/configurations/ApplicationMongoTest.java @@ -1,7 +1,7 @@ package io.tech1.framework.b2b.mongodb.security.jwt.configurations; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -26,7 +26,7 @@ class ApplicationMongoTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-mongodb-security-jwt/src/test/java/io/tech1/framework/b2b/mongodb/security/jwt/essence/MongoBaseEssenceConstructorTest.java b/tech1-framework-b2b-mongodb-security-jwt/src/test/java/io/tech1/framework/b2b/mongodb/security/jwt/essence/MongoBaseEssenceConstructorTest.java index bf64a25ba..48e802cfe 100644 --- a/tech1-framework-b2b-mongodb-security-jwt/src/test/java/io/tech1/framework/b2b/mongodb/security/jwt/essence/MongoBaseEssenceConstructorTest.java +++ b/tech1-framework-b2b-mongodb-security-jwt/src/test/java/io/tech1/framework/b2b/mongodb/security/jwt/essence/MongoBaseEssenceConstructorTest.java @@ -4,8 +4,8 @@ import io.tech1.framework.b2b.mongodb.security.jwt.repositories.MongoInvitationCodesRepository; import io.tech1.framework.b2b.mongodb.security.jwt.repositories.MongoUsersRepository; import io.tech1.framework.domain.properties.base.DefaultUser; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -34,7 +34,7 @@ class MongoBaseEssenceConstructorTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-mongodb-server/src/main/java/io/tech1/framework/b2b/mongodb/server/Application.java b/tech1-framework-b2b-mongodb-server/src/main/java/io/tech1/framework/b2b/mongodb/server/Application.java index 67c8fada6..b7f6f7c4b 100644 --- a/tech1-framework-b2b-mongodb-server/src/main/java/io/tech1/framework/b2b/mongodb/server/Application.java +++ b/tech1-framework-b2b-mongodb-server/src/main/java/io/tech1/framework/b2b/mongodb/server/Application.java @@ -1,7 +1,7 @@ package io.tech1.framework.b2b.mongodb.server; import io.tech1.framework.b2b.mongodb.server.properties.ApplicationProperties; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/tech1-framework-b2b-mongodb-server/src/main/java/io/tech1/framework/b2b/mongodb/server/startup/StartupEventListener.java b/tech1-framework-b2b-mongodb-server/src/main/java/io/tech1/framework/b2b/mongodb/server/startup/StartupEventListener.java index 29c3af342..70025ff4d 100644 --- a/tech1-framework-b2b-mongodb-server/src/main/java/io/tech1/framework/b2b/mongodb/server/startup/StartupEventListener.java +++ b/tech1-framework-b2b-mongodb-server/src/main/java/io/tech1/framework/b2b/mongodb/server/startup/StartupEventListener.java @@ -3,7 +3,7 @@ import io.tech1.framework.b2b.base.security.jwt.essense.AbstractEssenceConstructor; import io.tech1.framework.b2b.base.security.jwt.startup.DefaultStartupEventListener; import io.tech1.framework.incidents.events.publishers.IncidentPublisher; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/essence/PostgresBaseEssenceConstructor.java b/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/essence/PostgresBaseEssenceConstructor.java index b43e4d1eb..39f8fc59b 100644 --- a/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/essence/PostgresBaseEssenceConstructor.java +++ b/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/essence/PostgresBaseEssenceConstructor.java @@ -6,7 +6,7 @@ import io.tech1.framework.b2b.postgres.security.jwt.repositories.PostgresInvitationCodesRepository; import io.tech1.framework.b2b.postgres.security.jwt.repositories.PostgresUsersRepository; import io.tech1.framework.domain.properties.base.DefaultUser; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/services/PostgresBaseInvitationCodesService.java b/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/services/PostgresBaseInvitationCodesService.java index a9a7b246e..a0b83f85f 100644 --- a/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/services/PostgresBaseInvitationCodesService.java +++ b/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/services/PostgresBaseInvitationCodesService.java @@ -2,7 +2,7 @@ import io.tech1.framework.b2b.base.security.jwt.services.abstracts.AbstractBaseInvitationCodesService; import io.tech1.framework.b2b.postgres.security.jwt.repositories.PostgresInvitationCodesRepository; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/validators/PostgresBaseInvitationCodesRequestsValidator.java b/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/validators/PostgresBaseInvitationCodesRequestsValidator.java index 4c5a252b0..726711a2e 100644 --- a/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/validators/PostgresBaseInvitationCodesRequestsValidator.java +++ b/tech1-framework-b2b-postgres-security-jwt/src/main/java/io/tech1/framework/b2b/postgres/security/jwt/validators/PostgresBaseInvitationCodesRequestsValidator.java @@ -2,7 +2,7 @@ import io.tech1.framework.b2b.base.security.jwt.validators.abtracts.AbstractBaseInvitationCodesRequestsValidator; import io.tech1.framework.b2b.postgres.security.jwt.repositories.PostgresInvitationCodesRepository; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/configurations/ApplicationPostgresRepositoriesTest.java b/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/configurations/ApplicationPostgresRepositoriesTest.java index 20d1dc43d..8e3289c2f 100644 --- a/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/configurations/ApplicationPostgresRepositoriesTest.java +++ b/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/configurations/ApplicationPostgresRepositoriesTest.java @@ -3,7 +3,7 @@ import io.tech1.framework.b2b.postgres.security.jwt.repositories.PostgresInvitationCodesRepository; import io.tech1.framework.b2b.postgres.security.jwt.repositories.PostgresUsersRepository; import io.tech1.framework.b2b.postgres.security.jwt.repositories.PostgresUsersSessionsRepository; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -29,7 +29,7 @@ class ApplicationPostgresRepositoriesTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/configurations/ApplicationPostgresTest.java b/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/configurations/ApplicationPostgresTest.java index 31f1eff88..1470d27e2 100644 --- a/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/configurations/ApplicationPostgresTest.java +++ b/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/configurations/ApplicationPostgresTest.java @@ -1,6 +1,6 @@ package io.tech1.framework.b2b.postgres.security.jwt.configurations; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -25,7 +25,7 @@ class ApplicationPostgresTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/essence/PostgresBaseEssenceConstructorTest.java b/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/essence/PostgresBaseEssenceConstructorTest.java index 84057c8a2..74332d1d1 100644 --- a/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/essence/PostgresBaseEssenceConstructorTest.java +++ b/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/essence/PostgresBaseEssenceConstructorTest.java @@ -4,8 +4,8 @@ import io.tech1.framework.b2b.postgres.security.jwt.repositories.PostgresInvitationCodesRepository; import io.tech1.framework.b2b.postgres.security.jwt.repositories.PostgresUsersRepository; import io.tech1.framework.domain.properties.base.DefaultUser; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -34,7 +34,7 @@ class PostgresBaseEssenceConstructorTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/tests/contexts/PostgresTestsApplicationValidatorsContext.java b/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/tests/contexts/PostgresTestsApplicationValidatorsContext.java index 08b3b35c3..f47c5bdbe 100644 --- a/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/tests/contexts/PostgresTestsApplicationValidatorsContext.java +++ b/tech1-framework-b2b-postgres-security-jwt/src/test/java/io/tech1/framework/b2b/postgres/security/jwt/tests/contexts/PostgresTestsApplicationValidatorsContext.java @@ -6,7 +6,7 @@ import io.tech1.framework.b2b.postgres.security.jwt.repositories.PostgresUsersRepository; import io.tech1.framework.b2b.postgres.security.jwt.repositories.PostgresUsersSessionsRepository; import io.tech1.framework.incidents.events.publishers.IncidentPublisher; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -19,7 +19,7 @@ "io.tech1.framework.b2b.postgres.security.jwt.validators" }) @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) public class PostgresTestsApplicationValidatorsContext { diff --git a/tech1-framework-b2b-postgres-server/src/main/java/io/tech1/framework/b2b/postgres/server/Application.java b/tech1-framework-b2b-postgres-server/src/main/java/io/tech1/framework/b2b/postgres/server/Application.java index 601a5ea59..432326288 100644 --- a/tech1-framework-b2b-postgres-server/src/main/java/io/tech1/framework/b2b/postgres/server/Application.java +++ b/tech1-framework-b2b-postgres-server/src/main/java/io/tech1/framework/b2b/postgres/server/Application.java @@ -1,7 +1,7 @@ package io.tech1.framework.b2b.postgres.server; import io.tech1.framework.b2b.postgres.server.properties.ApplicationProperties; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/tech1-framework-b2b-postgres-server/src/main/java/io/tech1/framework/b2b/postgres/server/startup/StartupEventListener.java b/tech1-framework-b2b-postgres-server/src/main/java/io/tech1/framework/b2b/postgres/server/startup/StartupEventListener.java index 4cebe3f44..69ea21dee 100644 --- a/tech1-framework-b2b-postgres-server/src/main/java/io/tech1/framework/b2b/postgres/server/startup/StartupEventListener.java +++ b/tech1-framework-b2b-postgres-server/src/main/java/io/tech1/framework/b2b/postgres/server/startup/StartupEventListener.java @@ -3,7 +3,7 @@ import io.tech1.framework.b2b.base.security.jwt.essense.AbstractEssenceConstructor; import io.tech1.framework.b2b.base.security.jwt.startup.DefaultStartupEventListener; import io.tech1.framework.incidents.events.publishers.IncidentPublisher; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/async/ApplicationAsync.java b/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/async/ApplicationAsync.java index 009206047..6731542db 100644 --- a/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/async/ApplicationAsync.java +++ b/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/async/ApplicationAsync.java @@ -1,7 +1,7 @@ package io.tech1.framework.configurations.async; import io.tech1.framework.domain.base.PropertyId; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler; diff --git a/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/events/ApplicationEvents.java b/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/events/ApplicationEvents.java index e8f9ab205..9164f2aa0 100644 --- a/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/events/ApplicationEvents.java +++ b/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/events/ApplicationEvents.java @@ -1,7 +1,7 @@ package io.tech1.framework.configurations.events; import io.tech1.framework.domain.base.PropertyId; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/mvc/ApplicationMVC.java b/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/mvc/ApplicationMVC.java index c9e62613d..5165f2e8f 100644 --- a/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/mvc/ApplicationMVC.java +++ b/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/mvc/ApplicationMVC.java @@ -1,7 +1,7 @@ package io.tech1.framework.configurations.mvc; import io.tech1.framework.domain.base.PropertyId; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/server/ApplicationSpringBootServer.java b/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/server/ApplicationSpringBootServer.java index 846a78308..6ed163073 100644 --- a/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/server/ApplicationSpringBootServer.java +++ b/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/server/ApplicationSpringBootServer.java @@ -1,7 +1,7 @@ package io.tech1.framework.configurations.server; import io.tech1.framework.domain.base.PropertyId; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import io.tech1.framework.utilities.environment.EnvironmentUtility; import io.tech1.framework.utilities.environment.base.BaseEnvironmentUtility; import io.tech1.framework.utilities.resources.actuator.BaseInfoResource; diff --git a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/async/ApplicationAsyncTest.java b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/async/ApplicationAsyncTest.java index 24afa5c22..2e309735f 100644 --- a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/async/ApplicationAsyncTest.java +++ b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/async/ApplicationAsyncTest.java @@ -1,7 +1,7 @@ package io.tech1.framework.configurations.async; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -28,7 +28,7 @@ class ApplicationAsyncTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class, + ApplicationFrameworkPropertiesTestsHardcodedContext.class, ApplicationAsync.class }) static class ContextConfiguration { diff --git a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/events/ApplicationEventsTest.java b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/events/ApplicationEventsTest.java index 7eb789dbb..7dbceb35c 100644 --- a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/events/ApplicationEventsTest.java +++ b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/events/ApplicationEventsTest.java @@ -1,6 +1,6 @@ package io.tech1.framework.configurations.events; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -25,7 +25,7 @@ class ApplicationEventsTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class, + ApplicationFrameworkPropertiesTestsHardcodedContext.class, ApplicationEvents.class }) static class ContextConfiguration { diff --git a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/jasypt/ApplicationJasyptTest.java b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/jasypt/ApplicationJasyptTest.java index 12baeb334..2fef00f9d 100644 --- a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/jasypt/ApplicationJasyptTest.java +++ b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/jasypt/ApplicationJasyptTest.java @@ -1,7 +1,7 @@ package io.tech1.framework.configurations.jasypt; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -25,7 +25,7 @@ class ApplicationJasyptTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class, + ApplicationFrameworkPropertiesTestsHardcodedContext.class, ApplicationJasypt.class }) static class ContextConfiguration { diff --git a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc1Test.java b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc1Test.java index f34e24bc7..5eb42f065 100644 --- a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc1Test.java +++ b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc1Test.java @@ -2,7 +2,7 @@ import io.tech1.framework.domain.properties.configs.MvcConfigs; import io.tech1.framework.domain.properties.configs.mvc.CorsConfigs; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc2Test.java b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc2Test.java index f293cbea8..cc74aef7c 100644 --- a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc2Test.java +++ b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc2Test.java @@ -2,7 +2,7 @@ import io.tech1.framework.domain.properties.configs.MvcConfigs; import io.tech1.framework.domain.properties.configs.mvc.CorsConfigs; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc3Test.java b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc3Test.java index 7e1436b37..b774d3811 100644 --- a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc3Test.java +++ b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/mvc/ApplicationMvc3Test.java @@ -2,7 +2,7 @@ import io.tech1.framework.domain.properties.configs.MvcConfigs; import io.tech1.framework.domain.properties.configs.mvc.CorsConfigs; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/server/ApplicationSpringBootServerTest.java b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/server/ApplicationSpringBootServerTest.java index 2fbca7de6..bf38039a1 100644 --- a/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/server/ApplicationSpringBootServerTest.java +++ b/tech1-framework-configurations/src/test/java/io/tech1/framework/configurations/server/ApplicationSpringBootServerTest.java @@ -1,6 +1,6 @@ package io.tech1.framework.configurations.server; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -28,7 +28,7 @@ class ApplicationSpringBootServerTest { @Configuration @Import({ ApplicationSpringBootServer.class, - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) static class ContextConfiguration { @Bean diff --git a/tech1-framework-properties/src/main/java/io/tech1/framework/properties/ApplicationFrameworkProperties.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/properties/ApplicationFrameworkProperties.java similarity index 96% rename from tech1-framework-properties/src/main/java/io/tech1/framework/properties/ApplicationFrameworkProperties.java rename to tech1-framework-domain/src/main/java/io/tech1/framework/domain/properties/ApplicationFrameworkProperties.java index 04cba9b1f..56ed93e74 100644 --- a/tech1-framework-properties/src/main/java/io/tech1/framework/properties/ApplicationFrameworkProperties.java +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/properties/ApplicationFrameworkProperties.java @@ -1,4 +1,4 @@ -package io.tech1.framework.properties; +package io.tech1.framework.domain.properties; import io.tech1.framework.domain.properties.configs.*; import lombok.Data; diff --git a/tech1-framework-properties/src/main/java/io/tech1/framework/properties/tests/contexts/ApplicationFrameworkPropertiesContext.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/properties/ApplicationFrameworkPropertiesTestsHardcodedContext.java similarity index 88% rename from tech1-framework-properties/src/main/java/io/tech1/framework/properties/tests/contexts/ApplicationFrameworkPropertiesContext.java rename to tech1-framework-domain/src/main/java/io/tech1/framework/domain/properties/ApplicationFrameworkPropertiesTestsHardcodedContext.java index c9dfc9cfa..2ac4be022 100644 --- a/tech1-framework-properties/src/main/java/io/tech1/framework/properties/tests/contexts/ApplicationFrameworkPropertiesContext.java +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/properties/ApplicationFrameworkPropertiesTestsHardcodedContext.java @@ -1,12 +1,11 @@ -package io.tech1.framework.properties.tests.contexts; +package io.tech1.framework.domain.properties; import io.tech1.framework.domain.properties.configs.*; -import io.tech1.framework.properties.ApplicationFrameworkProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration -public class ApplicationFrameworkPropertiesContext { +public class ApplicationFrameworkPropertiesTestsHardcodedContext { @Bean public ApplicationFrameworkProperties applicationFrameworkProperties() { diff --git a/tech1-framework-properties/src/test/java/io/tech1/framework/properties/ApplicationFrameworkPropertiesTest.java b/tech1-framework-domain/src/test/java/io/tech1/framework/domain/properties/ApplicationFrameworkPropertiesTest.java similarity index 80% rename from tech1-framework-properties/src/test/java/io/tech1/framework/properties/ApplicationFrameworkPropertiesTest.java rename to tech1-framework-domain/src/test/java/io/tech1/framework/domain/properties/ApplicationFrameworkPropertiesTest.java index 7890318fd..6c197c5de 100644 --- a/tech1-framework-properties/src/test/java/io/tech1/framework/properties/ApplicationFrameworkPropertiesTest.java +++ b/tech1-framework-domain/src/test/java/io/tech1/framework/domain/properties/ApplicationFrameworkPropertiesTest.java @@ -1,6 +1,6 @@ -package io.tech1.framework.properties; +package io.tech1.framework.domain.properties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import org.junit.jupiter.api.Test; import java.lang.reflect.InvocationTargetException; @@ -13,7 +13,7 @@ class ApplicationFrameworkPropertiesTest { @Test void applicationFrameworkPropertiesTest() { // Arrange - var context = new ApplicationFrameworkPropertiesContext(); + var context = new ApplicationFrameworkPropertiesTestsHardcodedContext(); var applicationFrameworkProperties = context.applicationFrameworkProperties(); // Act diff --git a/tech1-framework-emails/src/main/java/io/tech1/framework/emails/configurations/ApplicationEmails.java b/tech1-framework-emails/src/main/java/io/tech1/framework/emails/configurations/ApplicationEmails.java index 915a3eafc..f4020e6a7 100644 --- a/tech1-framework-emails/src/main/java/io/tech1/framework/emails/configurations/ApplicationEmails.java +++ b/tech1-framework-emails/src/main/java/io/tech1/framework/emails/configurations/ApplicationEmails.java @@ -5,7 +5,7 @@ import io.tech1.framework.emails.services.impl.EmailServiceImpl; import io.tech1.framework.emails.utilities.EmailUtility; import io.tech1.framework.emails.utilities.impl.EmailUtilityImpl; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/tech1-framework-emails/src/main/java/io/tech1/framework/emails/services/impl/EmailServiceImpl.java b/tech1-framework-emails/src/main/java/io/tech1/framework/emails/services/impl/EmailServiceImpl.java index 5b2f9d93a..c6d7b4fe2 100644 --- a/tech1-framework-emails/src/main/java/io/tech1/framework/emails/services/impl/EmailServiceImpl.java +++ b/tech1-framework-emails/src/main/java/io/tech1/framework/emails/services/impl/EmailServiceImpl.java @@ -4,7 +4,7 @@ import io.tech1.framework.emails.domain.EmailPlainAttachment; import io.tech1.framework.emails.services.EmailService; import io.tech1.framework.emails.utilities.EmailUtility; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import jakarta.activation.DataHandler; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeBodyPart; diff --git a/tech1-framework-emails/src/test/java/io/tech1/framework/emails/configurations/ApplicationEmailsTest.java b/tech1-framework-emails/src/test/java/io/tech1/framework/emails/configurations/ApplicationEmailsTest.java index b13ecea42..ab793b5b2 100644 --- a/tech1-framework-emails/src/test/java/io/tech1/framework/emails/configurations/ApplicationEmailsTest.java +++ b/tech1-framework-emails/src/test/java/io/tech1/framework/emails/configurations/ApplicationEmailsTest.java @@ -1,7 +1,7 @@ package io.tech1.framework.emails.configurations; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -26,7 +26,7 @@ class ApplicationEmailsTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class, + ApplicationFrameworkPropertiesTestsHardcodedContext.class, ApplicationEmails.class }) static class ContextConfiguration { diff --git a/tech1-framework-emails/src/test/java/io/tech1/framework/emails/services/impl/EmailServiceImplTest.java b/tech1-framework-emails/src/test/java/io/tech1/framework/emails/services/impl/EmailServiceImplTest.java index 84003c4f2..68ebab27f 100644 --- a/tech1-framework-emails/src/test/java/io/tech1/framework/emails/services/impl/EmailServiceImplTest.java +++ b/tech1-framework-emails/src/test/java/io/tech1/framework/emails/services/impl/EmailServiceImplTest.java @@ -8,7 +8,7 @@ import io.tech1.framework.emails.domain.EmailPlainAttachment; import io.tech1.framework.emails.services.EmailService; import io.tech1.framework.emails.utilities.EmailUtility; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import jakarta.mail.internet.MimeMultipart; diff --git a/tech1-framework-hardware/src/main/java/io/tech1/framework/hardware/configurations/ApplicationHardwareMonitoring.java b/tech1-framework-hardware/src/main/java/io/tech1/framework/hardware/configurations/ApplicationHardwareMonitoring.java index fe28d8e32..2e53ae7ae 100644 --- a/tech1-framework-hardware/src/main/java/io/tech1/framework/hardware/configurations/ApplicationHardwareMonitoring.java +++ b/tech1-framework-hardware/src/main/java/io/tech1/framework/hardware/configurations/ApplicationHardwareMonitoring.java @@ -1,7 +1,7 @@ package io.tech1.framework.hardware.configurations; import io.tech1.framework.domain.base.PropertyId; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.ComponentScan; diff --git a/tech1-framework-hardware/src/main/java/io/tech1/framework/hardware/monitoring/store/impl/HardwareMonitoringStoreImpl.java b/tech1-framework-hardware/src/main/java/io/tech1/framework/hardware/monitoring/store/impl/HardwareMonitoringStoreImpl.java index cd0efa3e5..d20a3064c 100644 --- a/tech1-framework-hardware/src/main/java/io/tech1/framework/hardware/monitoring/store/impl/HardwareMonitoringStoreImpl.java +++ b/tech1-framework-hardware/src/main/java/io/tech1/framework/hardware/monitoring/store/impl/HardwareMonitoringStoreImpl.java @@ -4,7 +4,7 @@ import io.tech1.framework.domain.hardware.monitoring.HardwareMonitoringThresholds; import io.tech1.framework.domain.hardware.monitoring.HardwareMonitoringWidget; import io.tech1.framework.hardware.monitoring.store.HardwareMonitoringStore; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.queue.CircularFifoQueue; diff --git a/tech1-framework-hardware/src/test/java/io/tech1/framework/hardware/configurations/ApplicationHardwareMonitoringTest.java b/tech1-framework-hardware/src/test/java/io/tech1/framework/hardware/configurations/ApplicationHardwareMonitoringTest.java index 1ba0db4ea..6e369e601 100644 --- a/tech1-framework-hardware/src/test/java/io/tech1/framework/hardware/configurations/ApplicationHardwareMonitoringTest.java +++ b/tech1-framework-hardware/src/test/java/io/tech1/framework/hardware/configurations/ApplicationHardwareMonitoringTest.java @@ -1,6 +1,6 @@ package io.tech1.framework.hardware.configurations; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -24,7 +24,7 @@ class ApplicationHardwareMonitoringTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class, + ApplicationFrameworkPropertiesTestsHardcodedContext.class, ApplicationHardwareMonitoring.class }) static class ContextConfiguration { diff --git a/tech1-framework-hardware/src/test/java/io/tech1/framework/hardware/monitoring/store/impl/HardwareMonitoringStoreImplTest.java b/tech1-framework-hardware/src/test/java/io/tech1/framework/hardware/monitoring/store/impl/HardwareMonitoringStoreImplTest.java index 203f77e58..7cb4d8fb1 100644 --- a/tech1-framework-hardware/src/test/java/io/tech1/framework/hardware/monitoring/store/impl/HardwareMonitoringStoreImplTest.java +++ b/tech1-framework-hardware/src/test/java/io/tech1/framework/hardware/monitoring/store/impl/HardwareMonitoringStoreImplTest.java @@ -10,8 +10,8 @@ import io.tech1.framework.domain.hardware.monitoring.HardwareMonitoringThresholds; import io.tech1.framework.domain.hardware.monitoring.HardwareName; import io.tech1.framework.hardware.monitoring.store.HardwareMonitoringStore; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -35,7 +35,7 @@ class HardwareMonitoringStoreImplTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationAsyncIncidents.java b/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationAsyncIncidents.java index fe8e6420b..c1767f875 100644 --- a/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationAsyncIncidents.java +++ b/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationAsyncIncidents.java @@ -3,7 +3,7 @@ import io.tech1.framework.domain.base.PropertyId; import io.tech1.framework.incidents.handlers.AsyncUncaughtExceptionHandlerPublisher; import io.tech1.framework.incidents.handlers.RejectedExecutionHandlerPublisher; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationEventsIncidents.java b/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationEventsIncidents.java index f382e6590..14f0eabbc 100644 --- a/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationEventsIncidents.java +++ b/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationEventsIncidents.java @@ -2,7 +2,7 @@ import io.tech1.framework.domain.base.PropertyId; import io.tech1.framework.incidents.handlers.ErrorHandlerPublisher; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationIncidents.java b/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationIncidents.java index ab94ffd72..db3c340a2 100644 --- a/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationIncidents.java +++ b/tech1-framework-incidents/src/main/java/io/tech1/framework/incidents/configurations/ApplicationIncidents.java @@ -8,7 +8,7 @@ import io.tech1.framework.domain.base.PropertyId; import io.tech1.framework.incidents.feigns.definitions.IncidentClientDefinition; import io.tech1.framework.incidents.feigns.definitions.IncidentClientSlf4j; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationAsyncIncidentsTest.java b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationAsyncIncidentsTest.java index 8b791b166..988f514bb 100644 --- a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationAsyncIncidentsTest.java +++ b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationAsyncIncidentsTest.java @@ -2,8 +2,8 @@ import io.tech1.framework.incidents.handlers.AsyncUncaughtExceptionHandlerPublisher; import io.tech1.framework.incidents.handlers.RejectedExecutionHandlerPublisher; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -33,7 +33,7 @@ class ApplicationAsyncIncidentsTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class, + ApplicationFrameworkPropertiesTestsHardcodedContext.class, ApplicationAsyncIncidents.class }) static class ContextConfiguration { diff --git a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationEventsIncidentsTest.java b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationEventsIncidentsTest.java index 1a63e31eb..7b9ec2200 100644 --- a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationEventsIncidentsTest.java +++ b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationEventsIncidentsTest.java @@ -1,7 +1,7 @@ package io.tech1.framework.incidents.configurations; import io.tech1.framework.incidents.handlers.ErrorHandlerPublisher; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -30,7 +30,7 @@ class ApplicationEventsIncidentsTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class, + ApplicationFrameworkPropertiesTestsHardcodedContext.class, ApplicationEventsIncidents.class }) static class ContextConfiguration { diff --git a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationIncidents1Test.java b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationIncidents1Test.java index e5dcdffeb..be3fd7d84 100644 --- a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationIncidents1Test.java +++ b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationIncidents1Test.java @@ -5,7 +5,7 @@ import io.tech1.framework.domain.properties.configs.IncidentConfigs; import io.tech1.framework.incidents.feigns.definitions.IncidentClientDefinition; import io.tech1.framework.incidents.feigns.definitions.IncidentClientSlf4j; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationIncidents2Test.java b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationIncidents2Test.java index da5f4b603..3fc871f0a 100644 --- a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationIncidents2Test.java +++ b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/configurations/ApplicationIncidents2Test.java @@ -4,7 +4,7 @@ import io.tech1.framework.domain.properties.configs.EventsConfigs; import io.tech1.framework.domain.properties.configs.IncidentConfigs; import io.tech1.framework.incidents.feigns.definitions.IncidentClientSlf4j; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/events/publishers/impl/IncidentPublisherImplTest.java b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/events/publishers/impl/IncidentPublisherImplTest.java index bb2b91ca2..8dfee5394 100644 --- a/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/events/publishers/impl/IncidentPublisherImplTest.java +++ b/tech1-framework-incidents/src/test/java/io/tech1/framework/incidents/events/publishers/impl/IncidentPublisherImplTest.java @@ -4,7 +4,7 @@ import io.tech1.framework.incidents.domain.system.IncidentSystemResetServerCompleted; import io.tech1.framework.incidents.domain.system.IncidentSystemResetServerStarted; import io.tech1.framework.incidents.events.publishers.IncidentPublisher; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/tech1-framework-properties/pom.xml b/tech1-framework-properties/pom.xml deleted file mode 100644 index a2c7ee31f..000000000 --- a/tech1-framework-properties/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 4.0.0 - - - io.tech1.framework - tech1-framework - 2.8.4-SNAPSHOT - - - tech1-framework-properties - - - - - io.tech1.framework - tech1-framework-domain - ${project.version} - compile - - - diff --git a/tech1-framework-properties/src/test/resources/logback-test.xml b/tech1-framework-properties/src/test/resources/logback-test.xml deleted file mode 100644 index baaf306bc..000000000 --- a/tech1-framework-properties/src/test/resources/logback-test.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - %d{ISO8601} %5p --- [%15.15t] %-40.40logger{39} : %m%n - - - - - - - - - - - - - - - diff --git a/tech1-framework-utilities/pom.xml b/tech1-framework-utilities/pom.xml index 53360daa6..ad33ea515 100644 --- a/tech1-framework-utilities/pom.xml +++ b/tech1-framework-utilities/pom.xml @@ -17,7 +17,7 @@ io.tech1.framework - tech1-framework-properties + tech1-framework-domain ${project.version} compile diff --git a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/browsers/impl/UserAgentDetailsUtilityImpl.java b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/browsers/impl/UserAgentDetailsUtilityImpl.java index dbdfe27a9..c03886226 100644 --- a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/browsers/impl/UserAgentDetailsUtilityImpl.java +++ b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/browsers/impl/UserAgentDetailsUtilityImpl.java @@ -7,8 +7,7 @@ import io.tech1.framework.domain.enums.Toggle; import io.tech1.framework.domain.http.requests.UserAgentDetails; import io.tech1.framework.domain.http.requests.UserAgentHeader; -import io.tech1.framework.domain.properties.configs.utilities.UserAgentConfigs; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import io.tech1.framework.utilities.browsers.UserAgentDetailsUtility; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/configurations/ApplicationUtilities.java b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/configurations/ApplicationUtilities.java index 5a0b73166..1e98bcfdc 100644 --- a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/configurations/ApplicationUtilities.java +++ b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/configurations/ApplicationUtilities.java @@ -1,7 +1,7 @@ package io.tech1.framework.utilities.configurations; import io.tech1.framework.domain.base.PropertyId; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.ComponentScan; diff --git a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/geo/facades/impl/GeoCountryFlagUtilityImpl.java b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/geo/facades/impl/GeoCountryFlagUtilityImpl.java index 0cde580e3..198b9aa0f 100644 --- a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/geo/facades/impl/GeoCountryFlagUtilityImpl.java +++ b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/geo/facades/impl/GeoCountryFlagUtilityImpl.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.tech1.framework.domain.enums.Toggle; import io.tech1.framework.domain.geo.GeoCountryFlag; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import io.tech1.framework.utilities.geo.facades.GeoCountryFlagUtility; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/geo/functions/mindmax/impl/MindMaxGeoLocationUtilityImpl.java b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/geo/functions/mindmax/impl/MindMaxGeoLocationUtilityImpl.java index 43310ec7a..e1ef98340 100644 --- a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/geo/functions/mindmax/impl/MindMaxGeoLocationUtilityImpl.java +++ b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/geo/functions/mindmax/impl/MindMaxGeoLocationUtilityImpl.java @@ -5,7 +5,7 @@ import io.tech1.framework.domain.enums.Toggle; import io.tech1.framework.domain.geo.GeoLocation; import io.tech1.framework.domain.http.requests.IPAddress; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import io.tech1.framework.utilities.geo.facades.GeoCountryFlagUtility; import io.tech1.framework.utilities.geo.functions.mindmax.MindMaxGeoLocationUtility; import lombok.extern.slf4j.Slf4j; diff --git a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/resources/actuator/BaseInfoResource.java b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/resources/actuator/BaseInfoResource.java index e8b20dace..03f680fea 100644 --- a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/resources/actuator/BaseInfoResource.java +++ b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/resources/actuator/BaseInfoResource.java @@ -1,6 +1,6 @@ package io.tech1.framework.utilities.resources.actuator; -import io.tech1.framework.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import io.tech1.framework.utilities.environment.EnvironmentUtility; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/browsers/impl/UserAgentDetailsUtilityImplTest.java b/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/browsers/impl/UserAgentDetailsUtilityImplTest.java index b4dedebd3..f5ee37b75 100644 --- a/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/browsers/impl/UserAgentDetailsUtilityImplTest.java +++ b/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/browsers/impl/UserAgentDetailsUtilityImplTest.java @@ -1,8 +1,8 @@ package io.tech1.framework.utilities.browsers.impl; import io.tech1.framework.domain.http.requests.UserAgentHeader; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import io.tech1.framework.utilities.browsers.UserAgentDetailsUtility; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; @@ -42,7 +42,7 @@ private static Stream getUserAgentDetailsTest() { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/geo/facades/impl/GeoCountryFlagUtilityImplTest.java b/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/geo/facades/impl/GeoCountryFlagUtilityImplTest.java index 3cc3aa8ce..d6576c61d 100644 --- a/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/geo/facades/impl/GeoCountryFlagUtilityImplTest.java +++ b/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/geo/facades/impl/GeoCountryFlagUtilityImplTest.java @@ -1,8 +1,8 @@ package io.tech1.framework.utilities.geo.facades.impl; import io.tech1.framework.domain.tests.constants.TestsFlagsConstants; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import io.tech1.framework.utilities.geo.facades.GeoCountryFlagUtility; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.extension.ExtendWith; @@ -42,7 +42,7 @@ private static Stream getFlagEmojiTest() { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/geo/functions/ipapi/utility/impl/IPAPIGeoLocationUtilityImplConsoleTest.java b/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/geo/functions/ipapi/utility/impl/IPAPIGeoLocationUtilityImplConsoleTest.java index 47a9bb6e9..900f76e03 100644 --- a/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/geo/functions/ipapi/utility/impl/IPAPIGeoLocationUtilityImplConsoleTest.java +++ b/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/geo/functions/ipapi/utility/impl/IPAPIGeoLocationUtilityImplConsoleTest.java @@ -2,8 +2,8 @@ import io.tech1.framework.domain.exceptions.geo.GeoLocationNotFoundException; import io.tech1.framework.domain.http.requests.IPAddress; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import io.tech1.framework.utilities.geo.facades.GeoCountryFlagUtility; import io.tech1.framework.utilities.geo.facades.impl.GeoCountryFlagUtilityImpl; import io.tech1.framework.utilities.geo.functions.ipapi.configurations.IPAPIConfiguration; @@ -32,7 +32,7 @@ class IPAPIGeoLocationUtilityImplConsoleTest { @Configuration @Import({ IPAPIConfiguration.class, - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { diff --git a/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/resources/actuator/BaseInfoResourceTest.java b/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/resources/actuator/BaseInfoResourceTest.java index c0ba7b3e2..538f8fdea 100644 --- a/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/resources/actuator/BaseInfoResourceTest.java +++ b/tech1-framework-utilities/src/test/java/io/tech1/framework/utilities/resources/actuator/BaseInfoResourceTest.java @@ -1,7 +1,7 @@ package io.tech1.framework.utilities.resources.actuator; -import io.tech1.framework.properties.ApplicationFrameworkProperties; -import io.tech1.framework.properties.tests.contexts.ApplicationFrameworkPropertiesContext; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; +import io.tech1.framework.domain.properties.ApplicationFrameworkPropertiesTestsHardcodedContext; import io.tech1.framework.utilities.environment.EnvironmentUtility; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; @@ -31,7 +31,7 @@ class BaseInfoResourceTest { @Configuration @Import({ - ApplicationFrameworkPropertiesContext.class + ApplicationFrameworkPropertiesTestsHardcodedContext.class }) @RequiredArgsConstructor(onConstructor = @__(@Autowired)) static class ContextConfiguration { From 8fab8b8c5d4499a21ad3dbb6ef83a29706353309 Mon Sep 17 00:00:00 2001 From: Yurii Luchkiv Date: Mon, 27 May 2024 11:47:17 +0300 Subject: [PATCH 2/6] =?UTF-8?q?=E2=80=94=20Addition:=20SpringBootActuatorI?= =?UTF-8?q?nfo.getGitOrDash()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../spring/actuator/info/SpringBootActuatorInfo.java | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79ee9a457..97fe102e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ ### Changelog [v2.8.4] — Migrate: ops b2b-****-server in docker — Migrate: ApplicationFrameworkProperties -> tech1-framework-domain +— Addition: SpringBootActuatorInfo.getGitOrDash() diff --git a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/feigns/domain/spring/actuator/info/SpringBootActuatorInfo.java b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/feigns/domain/spring/actuator/info/SpringBootActuatorInfo.java index 788d37481..63c4d1b85 100644 --- a/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/feigns/domain/spring/actuator/info/SpringBootActuatorInfo.java +++ b/tech1-framework-utilities/src/main/java/io/tech1/framework/utilities/feigns/domain/spring/actuator/info/SpringBootActuatorInfo.java @@ -71,4 +71,13 @@ public Version getMavenVersionOrDash() { return Version.dash(); } } + + @JsonIgnore + public SpringBootActuatorInfoGit getGitOrDash() { + if (nonNull(this.git)) { + return this.git; + } else { + return SpringBootActuatorInfoGit.dash(); + } + } } From 1a00cc9d1d82b4b59d52bfce6cd024f5feeb9a05 Mon Sep 17 00:00:00 2001 From: Yurii Luchkiv Date: Mon, 27 May 2024 11:52:18 +0300 Subject: [PATCH 3/6] =?UTF-8?q?=E2=80=94=20Addition:=20SwaggerConstants=20?= =?UTF-8?q?->=20ENDPOINTS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- .../configurations/ApplicationBaseSecurityJwt.java | 9 +++------ .../domain/constants/SwaggerConstants.java | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 tech1-framework-domain/src/main/java/io/tech1/framework/domain/constants/SwaggerConstants.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 97fe102e4..83f06f359 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### Changelog [v2.8.4] — Migrate: ops b2b-****-server in docker — Migrate: ApplicationFrameworkProperties -> tech1-framework-domain -— Addition: SpringBootActuatorInfo.getGitOrDash() +— Addition: SpringBootActuatorInfo -> getGitOrDash() +— Addition: SwaggerConstants -> ENDPOINTS diff --git a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwt.java b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwt.java index ec901b5be..d0f3b30fc 100644 --- a/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwt.java +++ b/tech1-framework-b2b-base-security-jwt/src/main/java/io/tech1/framework/b2b/base/security/jwt/configurations/ApplicationBaseSecurityJwt.java @@ -7,9 +7,10 @@ import io.tech1.framework.configurations.jasypt.ApplicationJasypt; import io.tech1.framework.configurations.server.ApplicationSpringBootServer; import io.tech1.framework.domain.base.PropertyId; +import io.tech1.framework.domain.constants.SwaggerConstants; +import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import io.tech1.framework.emails.configurations.ApplicationEmails; import io.tech1.framework.incidents.configurations.ApplicationIncidents; -import io.tech1.framework.domain.properties.ApplicationFrameworkProperties; import io.tech1.framework.utilities.configurations.ApplicationUtilities; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; @@ -96,11 +97,7 @@ AuthenticationManager authenticationManager(AuthenticationConfiguration authenti public WebSecurityCustomizer webSecurityCustomizer() { return web -> { if (this.applicationFrameworkProperties.getServerConfigs().isSpringdocEnabled()) { - web.ignoring().requestMatchers( - "/v3/api-docs/**", - "/swagger-ui.html", - "/swagger-ui/**" - ); + web.ignoring().requestMatchers(SwaggerConstants.ENDPOINTS.toArray(new String[0])); } this.abstractApplicationSecurityJwtConfigurer.configure(web); }; diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/constants/SwaggerConstants.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/constants/SwaggerConstants.java new file mode 100644 index 000000000..944ef6b09 --- /dev/null +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/constants/SwaggerConstants.java @@ -0,0 +1,14 @@ +package io.tech1.framework.domain.constants; + +import lombok.experimental.UtilityClass; + +import java.util.List; + +@UtilityClass +public class SwaggerConstants { + public static final List ENDPOINTS = List.of( + "/v3/api-docs/**", + "/swagger-ui.html", + "/swagger-ui/**" + ); +} From a0e86826cd089582f3eb37cfc94be0cdaaa8c635 Mon Sep 17 00:00:00 2001 From: Yurii Luchkiv Date: Mon, 27 May 2024 12:04:25 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=E2=80=94=20Addition:=20SynchronizedValueFa?= =?UTF-8?q?ctory/UniqueValueFactory?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + ...icLongIncrementalTime2013NonceFactory.java | 18 ++++++ .../CurrentTimeIncrementalNonceFactory.java | 43 +++++++++++++ .../SynchronizedValueFactories.java | 11 ++++ .../SynchronizedValueFactory.java | 6 ++ .../unique/CurrentTimeUniqueValueFactory.java | 23 +++++++ .../unique/IntegerUniqueValueFactory.java | 11 ++++ .../unique/StringUniqueValueFactory.java | 11 ++++ .../unique/UniqueValueFactories.java | 15 +++++ .../factories/unique/UniqueValueFactory.java | 6 ++ .../CurrentTimeUniqueValueFactoryTest.java | 63 +++++++++++++++++++ 11 files changed, 208 insertions(+) create mode 100644 tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/AtomicLongIncrementalTime2013NonceFactory.java create mode 100644 tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/CurrentTimeIncrementalNonceFactory.java create mode 100644 tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/SynchronizedValueFactories.java create mode 100644 tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/SynchronizedValueFactory.java create mode 100644 tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/CurrentTimeUniqueValueFactory.java create mode 100644 tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/IntegerUniqueValueFactory.java create mode 100644 tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/StringUniqueValueFactory.java create mode 100644 tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/UniqueValueFactories.java create mode 100644 tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/UniqueValueFactory.java create mode 100644 tech1-framework-domain/src/test/java/io/tech1/framework/domain/factories/unique/CurrentTimeUniqueValueFactoryTest.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 83f06f359..f02389de3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,3 +3,4 @@ — Migrate: ApplicationFrameworkProperties -> tech1-framework-domain — Addition: SpringBootActuatorInfo -> getGitOrDash() — Addition: SwaggerConstants -> ENDPOINTS +— Addition: SynchronizedValueFactory/UniqueValueFactory diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/AtomicLongIncrementalTime2013NonceFactory.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/AtomicLongIncrementalTime2013NonceFactory.java new file mode 100644 index 000000000..ab74edcde --- /dev/null +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/AtomicLongIncrementalTime2013NonceFactory.java @@ -0,0 +1,18 @@ +package io.tech1.framework.domain.factories.synchronization; + +import java.util.concurrent.atomic.AtomicLong; + +public class AtomicLongIncrementalTime2013NonceFactory implements SynchronizedValueFactory { + + // Jan 1st, 2013 in milliseconds from epoch + private static final long START_MILLIS = 1356998400000L; + + // counter for the nonce + private final AtomicLong lastNonce = new AtomicLong((System.currentTimeMillis() - START_MILLIS) / 250L); + + @Override + public Long createValue() { + return this.lastNonce.incrementAndGet(); + } + +} diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/CurrentTimeIncrementalNonceFactory.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/CurrentTimeIncrementalNonceFactory.java new file mode 100644 index 000000000..6e18451f3 --- /dev/null +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/CurrentTimeIncrementalNonceFactory.java @@ -0,0 +1,43 @@ +package io.tech1.framework.domain.factories.synchronization; + +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Supplier; + +/** + * Class computes a current time-based nonce. + * + *

This class while designed to be thread-safe does not protect against multiple processes where + * the system clock may be out of sync. It also does not protect a system where a lower granularity + * time unit like {@link TimeUnit#SECONDS} is used and the same nonce is computed at the same time + * from competing processes. + * + *

Compatibility is limited to the time units specified. + */ +public class CurrentTimeIncrementalNonceFactory implements SynchronizedValueFactory { + + private final AtomicLong nonce = new AtomicLong(0); + + private final Supplier timeSupplier; + + public CurrentTimeIncrementalNonceFactory(TimeUnit timeUnit) { + this.timeSupplier = switch (timeUnit) { + case SECONDS -> () -> System.currentTimeMillis() / 1000; + case MILLISECONDS -> System::currentTimeMillis; + case MICROSECONDS -> () -> System.nanoTime() / 1000; + case NANOSECONDS -> System::nanoTime; + default -> throw new IllegalArgumentException("TimeUnit %s not supported".formatted(timeUnit)); + }; + } + + @Override + public Long createValue() { + return this.nonce.updateAndGet(prevNonce -> { + long newNonce = this.timeSupplier.get(); + if (newNonce <= prevNonce) { + newNonce = prevNonce + 1; + } + return newNonce; + }); + } +} diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/SynchronizedValueFactories.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/SynchronizedValueFactories.java new file mode 100644 index 000000000..5709952b0 --- /dev/null +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/SynchronizedValueFactories.java @@ -0,0 +1,11 @@ +package io.tech1.framework.domain.factories.synchronization; + +import lombok.experimental.UtilityClass; + +@UtilityClass +public class SynchronizedValueFactories { + + public static AtomicLongIncrementalTime2013NonceFactory atomicLongIncrementalTime2013NonceFactory() { + return new AtomicLongIncrementalTime2013NonceFactory(); + } +} diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/SynchronizedValueFactory.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/SynchronizedValueFactory.java new file mode 100644 index 000000000..cfe7c846c --- /dev/null +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/synchronization/SynchronizedValueFactory.java @@ -0,0 +1,6 @@ +package io.tech1.framework.domain.factories.synchronization; + +@FunctionalInterface +public interface SynchronizedValueFactory { + T createValue(); +} diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/CurrentTimeUniqueValueFactory.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/CurrentTimeUniqueValueFactory.java new file mode 100644 index 000000000..13108a18b --- /dev/null +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/CurrentTimeUniqueValueFactory.java @@ -0,0 +1,23 @@ +package io.tech1.framework.domain.factories.unique; + +import java.util.concurrent.atomic.AtomicInteger; + +public final class CurrentTimeUniqueValueFactory implements UniqueValueFactory { + private final AtomicInteger unique; + + public CurrentTimeUniqueValueFactory() { + this.unique = new AtomicInteger(0); + } + + // WARNING: create problems in "Tuesday, January 19, 2038 3:14:07 AM" == Integer.MAX_VALUE + @Override + public Integer createValue() { + return this.unique.updateAndGet(prevUnique -> { + int newUnique = (int) (System.currentTimeMillis() / 1000); + if (newUnique <= prevUnique) { + newUnique = prevUnique + 1; + } + return newUnique; + }); + } +} diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/IntegerUniqueValueFactory.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/IntegerUniqueValueFactory.java new file mode 100644 index 000000000..1da5976af --- /dev/null +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/IntegerUniqueValueFactory.java @@ -0,0 +1,11 @@ +package io.tech1.framework.domain.factories.unique; + +import io.tech1.framework.domain.utilities.random.RandomUtility; + +public class IntegerUniqueValueFactory implements UniqueValueFactory { + + @Override + public Integer createValue() { + return RandomUtility.randomIntegerGreaterThanZero(); + } +} diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/StringUniqueValueFactory.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/StringUniqueValueFactory.java new file mode 100644 index 000000000..a6589955d --- /dev/null +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/StringUniqueValueFactory.java @@ -0,0 +1,11 @@ +package io.tech1.framework.domain.factories.unique; + +import io.tech1.framework.domain.utilities.random.RandomUtility; + +public class StringUniqueValueFactory implements UniqueValueFactory { + + @Override + public String createValue() { + return RandomUtility.randomString(); + } +} diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/UniqueValueFactories.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/UniqueValueFactories.java new file mode 100644 index 000000000..8fc9dedc1 --- /dev/null +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/UniqueValueFactories.java @@ -0,0 +1,15 @@ +package io.tech1.framework.domain.factories.unique; + +import lombok.experimental.UtilityClass; + +@UtilityClass +public class UniqueValueFactories { + + public static StringUniqueValueFactory stringUniqueValueFactory() { + return new StringUniqueValueFactory(); + } + + public static IntegerUniqueValueFactory integerUniqueValueFactory() { + return new IntegerUniqueValueFactory(); + } +} diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/UniqueValueFactory.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/UniqueValueFactory.java new file mode 100644 index 000000000..5522e12ec --- /dev/null +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/factories/unique/UniqueValueFactory.java @@ -0,0 +1,6 @@ +package io.tech1.framework.domain.factories.unique; + +@FunctionalInterface +public interface UniqueValueFactory { + T createValue(); +} diff --git a/tech1-framework-domain/src/test/java/io/tech1/framework/domain/factories/unique/CurrentTimeUniqueValueFactoryTest.java b/tech1-framework-domain/src/test/java/io/tech1/framework/domain/factories/unique/CurrentTimeUniqueValueFactoryTest.java new file mode 100644 index 000000000..6648c5fa5 --- /dev/null +++ b/tech1-framework-domain/src/test/java/io/tech1/framework/domain/factories/unique/CurrentTimeUniqueValueFactoryTest.java @@ -0,0 +1,63 @@ +package io.tech1.framework.domain.factories.unique; + +import io.tech1.framework.domain.utilities.concurrent.SleepUtility; +import io.tech1.framework.domain.utilities.time.TimestampUtility; +import org.junit.jupiter.api.RepeatedTest; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import static io.tech1.framework.domain.tests.constants.TestsJunitConstants.RANDOM_ITERATIONS_COUNT; +import static org.assertj.core.api.Assertions.assertThat; + +class CurrentTimeUniqueValueFactoryTest { + + private static Stream createValueCheckUniqueArgs() { + return Stream.of( + Arguments.of(100), + Arguments.of(1000), + Arguments.of(10000), + Arguments.of(100000), + Arguments.of(1000000) + ); + } + + @RepeatedTest(RANDOM_ITERATIONS_COUNT) + void createValueBetween() { + // Arrange + var window = 1; + var randomFactory = new CurrentTimeUniqueValueFactory(); + + // Act + var value = randomFactory.createValue(); + + // Assert + assertThat(value) + .isNotNull() + .isBetween( + (int) (TimestampUtility.getCurrentTimestamp() / 1000) - window, + (int) (TimestampUtility.getCurrentTimestamp() / 1000) + window + ); + } + + @ParameterizedTest + @MethodSource("createValueCheckUniqueArgs") + void createValueCheckUnique(int iterations) { + // Arrange + var randomFactory = new CurrentTimeUniqueValueFactory(); + + // Act + var values1 = IntStream.range(0, iterations).mapToObj(i -> randomFactory.createValue()).collect(Collectors.toSet()); + SleepUtility.sleep(TimeUnit.SECONDS, 2); + var values2 = IntStream.range(0, iterations).mapToObj(i -> randomFactory.createValue()).collect(Collectors.toSet()); + + // Assert + assertThat(values1).hasSize(iterations); + assertThat(values2).hasSize(iterations); + } +} From 3f95757a6edc8d286e27c55a7755b33a25aceee6 Mon Sep 17 00:00:00 2001 From: Yurii Luchkiv Date: Mon, 27 May 2024 12:06:24 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=E2=80=94=20Addition:=20CollectionUtility?= =?UTF-8?q?=20=E2=86=92=20toConcurrentSet()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 ++++--- sonar-project.properties | 1 + .../collections/CollectionUtility.java | 7 +++++++ .../collections/CollectionUtilityTest.java | 21 +++++++++++++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f02389de3..f618c39ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ### Changelog [v2.8.4] — Migrate: ops b2b-****-server in docker -— Migrate: ApplicationFrameworkProperties -> tech1-framework-domain -— Addition: SpringBootActuatorInfo -> getGitOrDash() -— Addition: SwaggerConstants -> ENDPOINTS +— Migrate: ApplicationFrameworkProperties → tech1-framework-domain +— Addition: SpringBootActuatorInfo → getGitOrDash() +— Addition: SwaggerConstants → ENDPOINTS — Addition: SynchronizedValueFactory/UniqueValueFactory +— Addition: CollectionUtility → toConcurrentSet() diff --git a/sonar-project.properties b/sonar-project.properties index 24312f7f3..b7a2a9bb5 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -63,6 +63,7 @@ sonar.exclusions=\ src/main/java/io/tech1/framework/domain/crons/**/*,\ src/main/java/io/tech1/framework/domain/enums/**/*,\ src/main/java/io/tech1/framework/domain/collections/Partitions.java,\ + src/main/java/io/tech1/framework/domain/factories/**/*,\ src/main/java/io/tech1/framework/domain/geo/**/*,\ src/main/java/io/tech1/framework/domain/hardware/**/*,\ src/main/java/io/tech1/framework/domain/http/cache/**/*,\ diff --git a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/utilities/collections/CollectionUtility.java b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/utilities/collections/CollectionUtility.java index 3cc830b69..190056a39 100644 --- a/tech1-framework-domain/src/main/java/io/tech1/framework/domain/utilities/collections/CollectionUtility.java +++ b/tech1-framework-domain/src/main/java/io/tech1/framework/domain/utilities/collections/CollectionUtility.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import static io.tech1.framework.domain.asserts.Asserts.assertTrueOrThrow; @@ -15,6 +16,12 @@ @UtilityClass public class CollectionUtility { + public ConcurrentHashMap.KeySetView toConcurrentSet(Collection list) { + ConcurrentHashMap.KeySetView set = ConcurrentHashMap.newKeySet(); + set.addAll(list); + return set; + } + public static List mutableSingletonList(T object) { List list = new ArrayList<>(1); list.add(object); diff --git a/tech1-framework-domain/src/test/java/io/tech1/framework/domain/utilities/collections/CollectionUtilityTest.java b/tech1-framework-domain/src/test/java/io/tech1/framework/domain/utilities/collections/CollectionUtilityTest.java index 6c37da8a6..3ea8d291c 100644 --- a/tech1-framework-domain/src/test/java/io/tech1/framework/domain/utilities/collections/CollectionUtilityTest.java +++ b/tech1-framework-domain/src/test/java/io/tech1/framework/domain/utilities/collections/CollectionUtilityTest.java @@ -10,6 +10,7 @@ import java.math.BigDecimal; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -61,6 +62,26 @@ private static Stream minOrZeroTest() { ); } + @Test + void toConcurrentSetTest() { + // Arrange + var collection = List.of( + BigDecimal.valueOf(38.43), + BigDecimal.valueOf(58.455555), + BigDecimal.valueOf(77.3392543), + BigDecimal.valueOf(8.99999999) + ); + + // Act + var actual = toConcurrentSet(collection); + + // Assert + assertThat(actual) + .isNotNull() + .containsAll(collection) + .isExactlyInstanceOf(ConcurrentHashMap.KeySetView.class); + } + @Test void mutableSingletonListIntegrationTest() { // Arrange From cc6b1f8fc6631c88cd141dbc5407ac9abe8e67d3 Mon Sep 17 00:00:00 2001 From: Yurii Luchkiv Date: Mon, 27 May 2024 12:09:31 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=E2=80=94=20Addition:=20ApplicationSwagger?= =?UTF-8?q?=20=E2=86=92=20tech1-framework-configurations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../swagger/ApplicationSwagger.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/swagger/ApplicationSwagger.java diff --git a/CHANGELOG.md b/CHANGELOG.md index f618c39ad..50bb8b658 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,3 +5,4 @@ — Addition: SwaggerConstants → ENDPOINTS — Addition: SynchronizedValueFactory/UniqueValueFactory — Addition: CollectionUtility → toConcurrentSet() +— Addition: ApplicationSwagger → tech1-framework-configurations diff --git a/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/swagger/ApplicationSwagger.java b/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/swagger/ApplicationSwagger.java new file mode 100644 index 000000000..614061f9b --- /dev/null +++ b/tech1-framework-configurations/src/main/java/io/tech1/framework/configurations/swagger/ApplicationSwagger.java @@ -0,0 +1,17 @@ +package io.tech1.framework.configurations.swagger; + +import io.swagger.v3.oas.annotations.OpenAPIDefinition; +import io.swagger.v3.oas.annotations.info.Info; +import org.springframework.context.annotation.Configuration; + +// Swagger +@OpenAPIDefinition( + info = @Info( + title = "${tech1.server-configs.name}", + version = "${tech1.maven-configs.version}" + ) +) +// Spring +@Configuration +public class ApplicationSwagger { +}