Cleanup

cuioss · Jul 23, 2023 · 83c1ec9 · 83c1ec9
1 parent bee7877
commit 83c1ec9
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 194 deletions.
diff --git a/.../cuioss/portal/configuration/impl/initializer/PortalSystemPropertiesConfiguratorTest.java b/.../cuioss/portal/configuration/impl/initializer/PortalSystemPropertiesConfiguratorTest.java
@@ -12,15 +12,15 @@
 import org.junit.jupiter.api.Test;
 
 import de.cuioss.portal.configuration.PortalConfigurationSource;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import de.cuioss.portal.configuration.initializer.PortalInitializer;
 import de.cuioss.test.juli.LogAsserts;
 import de.cuioss.test.juli.TestLogLevel;
 import de.cuioss.test.juli.junit5.EnableTestLogger;
 import lombok.Getter;
 
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 @EnableAutoWeld
 @EnableTestLogger
 class PortalSystemPropertiesConfiguratorTest {

diff --git a/...rc/test/java/de/cuioss/portal/configuration/impl/producer/ConfigPropertyNullableTest.java b/...rc/test/java/de/cuioss/portal/configuration/impl/producer/ConfigPropertyNullableTest.java
@@ -12,12 +12,12 @@
 
 import de.cuioss.portal.configuration.ConfigPropertyNullable;
 import de.cuioss.portal.configuration.PortalConfigurationSource;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 
 @SuppressWarnings("el-syntax")
 @EnableAutoWeld
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 class ConfigPropertyNullableTest {
 
     private static final String KEY = "a.config.key";

diff --git a/...st/java/de/cuioss/portal/configuration/impl/producer/ConfigurationProducerLocaleTest.java b/...st/java/de/cuioss/portal/configuration/impl/producer/ConfigurationProducerLocaleTest.java
@@ -15,14 +15,14 @@
 import org.junit.jupiter.api.Test;
 
 import de.cuioss.portal.configuration.PortalConfigurationSource;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import de.cuioss.portal.configuration.types.ConfigAsLocale;
 import de.cuioss.portal.configuration.types.ConfigAsLocaleList;
 import de.cuioss.tools.string.Joiner;
 import lombok.Getter;
 
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 @EnableAutoWeld
 class ConfigurationProducerLocaleTest {
 

diff --git a/...src/test/java/de/cuioss/portal/configuration/impl/producer/ConfigurationProducerTest.java b/...src/test/java/de/cuioss/portal/configuration/impl/producer/ConfigurationProducerTest.java
@@ -24,7 +24,7 @@
 import de.cuioss.portal.configuration.MetricsConfigKeys;
 import de.cuioss.portal.configuration.PortalConfigurationSource;
 import de.cuioss.portal.configuration.cache.CacheConfig;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import de.cuioss.portal.configuration.types.ConfigAsCacheConfig;
 import de.cuioss.portal.configuration.types.ConfigAsFileLoader;
@@ -36,7 +36,7 @@
 import lombok.Getter;
 
 @EnableAutoWeld
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 class ConfigurationProducerTest {
 
     private static final String CONFIGURATION_KEY = "configurationKey";

diff --git a/...est/java/de/cuioss/portal/configuration/impl/producer/ConnectionMetadataProducerTest.java b/...est/java/de/cuioss/portal/configuration/impl/producer/ConnectionMetadataProducerTest.java
@@ -26,15 +26,15 @@
 import de.cuioss.portal.configuration.connections.impl.ConnectionMetadata;
 import de.cuioss.portal.configuration.connections.impl.ConnectionMetadataKeys;
 import de.cuioss.portal.configuration.connections.impl.ConnectionType;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import de.cuioss.portal.configuration.types.ConfigAsConnectionMetadata;
 import de.cuioss.test.juli.LogAsserts;
 import de.cuioss.test.juli.TestLogLevel;
 import de.cuioss.test.juli.junit5.EnableTestLogger;
 
 @EnableAutoWeld
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 @AddBeanClasses({ ConnectionMetadataProducer.class, ConnectionMetadata.class })
 @EnableTestLogger
 class ConnectionMetadataProducerTest {

diff --git a/...ation-impl/src/test/java/de/cuioss/portal/configuration/impl/producer/MPProducerTest.java b/...ation-impl/src/test/java/de/cuioss/portal/configuration/impl/producer/MPProducerTest.java
@@ -20,7 +20,7 @@
 import org.junit.jupiter.api.Test;
 
 import de.cuioss.portal.configuration.PortalConfigurationSource;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import de.cuioss.portal.configuration.types.ConfigAsList;
 import de.cuioss.test.generator.Generators;
@@ -33,7 +33,7 @@
  * @author Sven Haag
  */
 @EnableAutoWeld
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 class MPProducerTest {
 
     private static final CuiLogger log = new CuiLogger(MPProducerTest.class);

diff --git a/...java/de/cuioss/portal/configuration/impl/producer/PortalProjectStageProducerImplTest.java b/...java/de/cuioss/portal/configuration/impl/producer/PortalProjectStageProducerImplTest.java
@@ -13,14 +13,14 @@
 import de.cuioss.portal.configuration.PortalConfigurationKeys;
 import de.cuioss.portal.configuration.PortalConfigurationSource;
 import de.cuioss.portal.configuration.application.PortalProjectStageProducer;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import de.cuioss.test.valueobjects.junit5.contracts.ShouldHandleObjectContracts;
 import de.cuioss.uimodel.application.CuiProjectStage;
 import lombok.Getter;
 
 @EnableAutoWeld
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 @AddBeanClasses({ PortalProjectStageImpl.class })
 class PortalProjectStageProducerImplTest implements ShouldHandleObjectContracts<PortalProjectStageImpl> {
 

diff --git a/...java/de/cuioss/portal/configuration/impl/schedule/FileWatcherServiceImplDisabledTest.java b/...java/de/cuioss/portal/configuration/impl/schedule/FileWatcherServiceImplDisabledTest.java
@@ -17,12 +17,12 @@
 import org.junit.jupiter.api.Test;
 
 import de.cuioss.portal.configuration.PortalConfigurationSource;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import de.cuioss.portal.configuration.schedule.PortalFileWatcherService;
 import lombok.Getter;
 
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 @EnableAutoWeld
 class FileWatcherServiceImplDisabledTest {
 

diff --git a/.../java/de/cuioss/portal/configuration/impl/schedule/FileWatcherServiceImplEnabledTest.java b/.../java/de/cuioss/portal/configuration/impl/schedule/FileWatcherServiceImplEnabledTest.java
@@ -23,13 +23,13 @@
 import org.junit.jupiter.api.Test;
 
 import de.cuioss.portal.configuration.PortalConfigurationSource;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import de.cuioss.portal.configuration.schedule.FileChangedEvent;
 import de.cuioss.portal.configuration.schedule.PortalFileWatcherService;
 import lombok.Getter;
 
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 @EnableAutoWeld
 class FileWatcherServiceImplEnabledTest {
 

diff --git a/...ava/de/cuioss/portal/configuration/impl/schedule/FileWatcherServiceImplRecursiveTest.java b/...ava/de/cuioss/portal/configuration/impl/schedule/FileWatcherServiceImplRecursiveTest.java
@@ -22,7 +22,7 @@
 import org.junit.jupiter.api.Test;
 
 import de.cuioss.portal.configuration.PortalConfigurationSource;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import de.cuioss.portal.configuration.schedule.FileChangedEvent;
 import de.cuioss.portal.configuration.schedule.PortalFileWatcherService;
@@ -31,7 +31,7 @@
 import de.cuioss.tools.logging.CuiLogger;
 import lombok.Getter;
 
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 @EnableAutoWeld
 @EnableTestLogger(rootLevel = TestLogLevel.TRACE)
 class FileWatcherServiceImplRecursiveTest {

diff --git a/...l/src/test/java/de/cuioss/portal/configuration/impl/source/ConfigurationResolverTest.java b/...l/src/test/java/de/cuioss/portal/configuration/impl/source/ConfigurationResolverTest.java
@@ -10,11 +10,11 @@
 import org.junit.jupiter.api.Test;
 
 import de.cuioss.portal.configuration.PortalConfigurationSource;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import lombok.Getter;
 
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 @EnableAutoWeld
 class ConfigurationResolverTest {
 

diff --git a/.../java/de/cuioss/portal/configuration/impl/source/DefaultConfigurationReplacementTest.java b/.../java/de/cuioss/portal/configuration/impl/source/DefaultConfigurationReplacementTest.java
@@ -10,10 +10,10 @@
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
 import org.junit.jupiter.api.Test;
 
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import lombok.Getter;
 
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 @EnableAutoWeld
 class DefaultConfigurationReplacementTest {
 

diff --git a/...impl/src/test/java/de/cuioss/portal/configuration/impl/source/PortalConfigSourceTest.java b/...impl/src/test/java/de/cuioss/portal/configuration/impl/source/PortalConfigSourceTest.java
@@ -31,15 +31,15 @@
 import de.cuioss.portal.configuration.PortalConfigurationChangeEvent;
 import de.cuioss.portal.configuration.PortalConfigurationSource;
 import de.cuioss.portal.configuration.cache.CacheConfig;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import de.cuioss.portal.configuration.impl.support.TestEnvConfigSource;
 import de.cuioss.portal.configuration.types.ConfigAsCacheConfig;
 import de.cuioss.portal.configuration.types.ConfigAsFilteredMap;
 import de.cuioss.portal.configuration.util.ConfigurationHelper;
 import de.cuioss.tools.string.MoreStrings;
 
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 @EnableAutoWeld
 @SuppressWarnings("el-syntax")
 class PortalConfigSourceTest {

diff --git a/.../java/de/cuioss/portal/configuration/impl/source/PortalInstallationConfigurationTest.java b/.../java/de/cuioss/portal/configuration/impl/source/PortalInstallationConfigurationTest.java
@@ -29,15 +29,15 @@
 import de.cuioss.portal.configuration.PortalConfigurationSource;
 import de.cuioss.portal.configuration.impl.schedule.ConfigChangeObserver;
 import de.cuioss.portal.configuration.impl.schedule.FileWatcherServiceImpl;
-import de.cuioss.portal.configuration.impl.support.EnablePortalConfiguration;
+import de.cuioss.portal.configuration.impl.support.EnablePortalConfigurationLocal;
 import de.cuioss.portal.configuration.impl.support.PortalConfigurationMock;
 import de.cuioss.portal.configuration.schedule.FileChangedEvent;
 import de.cuioss.test.generator.Generators;
 import de.cuioss.test.generator.TypedGenerator;
 import de.cuioss.test.juli.TestLogLevel;
 import de.cuioss.test.juli.junit5.EnableTestLogger;
 
-@EnablePortalConfiguration
+@EnablePortalConfigurationLocal
 @AddBeanClasses({ FileWatcherServiceImpl.class, InstallationConfigSourcePathInitializer.class,
         ConfigChangeObserver.class })
 @EnableAutoWeld

diff --git a/...pl/support/EnablePortalConfiguration.java → ...pport/EnablePortalConfigurationLocal.java b/...pl/support/EnablePortalConfiguration.java → ...pport/EnablePortalConfigurationLocal.java
@@ -35,5 +35,5 @@
 @Target(TYPE)
 @AddBeanClasses({ ConfigProducer.class, PortalConfigProducer.class, PortalConfigurationMock.class,
         InstallationConfigSourcePathInitializer.class, ConfigChangeObserver.class })
-public @interface EnablePortalConfiguration {
+public @interface EnablePortalConfigurationLocal {
 }