Removing portal-configuration-yml, portal-configuration-standalone an…

…d friends

bom/pom.xml

@@ -20,24 +20,12 @@
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>de.cuioss.portal.configuration</groupId>
-                <artifactId>portal-configuration-yaml</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <dependency>
                 <groupId>de.cuioss.portal.configuration</groupId>
                 <artifactId>portal-configuration-impl</artifactId>
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>de.cuioss.portal.configuration</groupId>
-                <artifactId>portal-configuration-standalone</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <!-- Authentication-->
             <dependency>
                 <groupId>de.cuioss.portal.authentication</groupId>

modules/configuration/pom.xml

@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>de.cuioss.portal</groupId>
@@ -55,7 +55,5 @@
     <modules>
         <module>portal-configuration-api</module>
         <module>portal-configuration-impl</module>
-        <module>portal-configuration-yaml</module>
-        <module>portal-configuration-standalone</module>
     </modules>
 </project>

modules/configuration/portal-configuration-impl/pom.xml

@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>de.cuioss.portal.configuration</groupId>
@@ -10,11 +10,13 @@
     <artifactId>portal-configuration-impl</artifactId>
     <name>Portal Configuration Runtime</name>
     <description>Provides the implementation-classes for the
-        portal-configuration extensions</description>
+        portal-configuration extensions
+    </description>
     <properties>
         <version.waitility>4.2.1</version.waitility>
         <maven.jar.plugin.automatic.module.name>
-            de.cuioss.portal.configuration.impl</maven.jar.plugin.automatic.module.name>
+            de.cuioss.portal.configuration.impl
+        </maven.jar.plugin.automatic.module.name>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -31,11 +33,6 @@
             <groupId>de.cuioss.portal.configuration</groupId>
             <artifactId>portal-configuration-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>de.cuioss.portal.configuration</groupId>
-            <artifactId>portal-configuration-yaml</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-api</artifactId>

modules/configuration/portal-configuration-impl/src/test/java/de/cuioss/portal/configuration/impl/source/LoaderUtilsTest.java

@@ -30,29 +30,8 @@
 @EnableTestLogger(debug = LoaderUtils.class)
 class LoaderUtilsTest {
 
-    @Test
-    void shouldLoadExistingFiles() {
-        assertFalse(LoaderUtils.loadConfigurationFromSource(EXISTING_YML).isEmpty());
-    }
-
-    @Test
-    void shouldNotLoadNonExistingPropertyFile() {
-        assertTrue(LoaderUtils.loadConfigurationFromSource(NOT_EXISTING_YML).isEmpty());
-        LogAsserts.assertLogMessagePresentContaining(TestLogLevel.ERROR, "Portal-519");
-
-    }
-
-    @Test
-    void shouldNotLoadNonExistingYml() {
-        assertTrue(LoaderUtils.loadConfigurationFromSource(NOT_EXISTING_YML).isEmpty());
-        LogAsserts.assertLogMessagePresentContaining(TestLogLevel.ERROR, "Portal-519");
-    }
-
     @Test
     void shouldCreateFromFileResources() {
-        assertFalse(loadConfigurationFromSource(EXISTING_YML).isEmpty());
-        assertTrue(loadConfigurationFromSource(NOT_EXISTING_YML).isEmpty());
-        assertTrue(loadConfigurationFromSource(NOT_EXISTING_PROPERTIES).isEmpty());
         assertTrue(loadConfigurationFromSource((FileLoader) null).isEmpty());
         assertTrue(loadConfigurationFromSource((FileConfigurationSource) null).isEmpty());
         assertTrue(loadConfigurationFromSource(EMPTY_PATH).isEmpty());

modules/configuration/portal-configuration-impl/src/test/java/de/cuioss/portal/configuration/impl/source/PortalConfigSourceTest.java

@@ -79,10 +79,6 @@ class PortalConfigSourceTest {
     @ConfigAsCacheConfig(name = "", defaultExpiration = 4, defaultSize = 3)
     private Provider<CacheConfig> invalidCacheConfigProvider;
 
-    @Inject
-    @ConfigProperty(name = "array.list")
-    private Set<String> arrayList;
-
     @Inject
     @ConfigProperty(name = "string.list")
     private Set<String> stringList;
@@ -101,9 +97,6 @@ void beforeTest() {
     void listAndArrays() {
         assertNotNull(stringList);
         assertEquals(3, stringList.size());
-
-        assertNotNull(arrayList);
-        assertEquals(3, arrayList.size());
     }
 
     @Test
@@ -261,10 +254,4 @@ void configHelperShouldUseResolvedPortalConfigValue() {
         final var all = ConfigurationHelper.resolveConfigProperties();
         assertFalse(all.containsKey("TEST_CONFIG_PRIO"), "properties with empty value should be unavailable");
     }
-
-    @Test
-    void expandsNestedKeys() {
-        assertDoesNotThrow(() -> nestedKeyReplacement.get(), "nested key should be present in test config");
-        assertEquals("stringvalue", nestedKeyReplacement.get());
-    }
 }

modules/configuration/portal-configuration-impl/src/test/java/de/cuioss/portal/configuration/impl/support/TestResourcesRepository.java

@@ -23,15 +23,10 @@
 public class TestResourcesRepository implements FileConfigurationSource {
 
     public static final FileConfigurationSource EXISTING_PROPERTIES = new TestResourcesRepository(
-            "classpath:/META-INF/test.properties", true);
+        "classpath:/META-INF/test.properties", true);
 
     public static final FileConfigurationSource NOT_EXISTING_PROPERTIES = new TestResourcesRepository(
-            "classpath:/META-INF/not-there.properties", false);
-
-    public static final FileConfigurationSource EXISTING_YML = new TestResourcesRepository("classpath:test.yml", true);
-
-    public static final FileConfigurationSource NOT_EXISTING_YML = new TestResourcesRepository(
-            "classpath:not-there.yml", false);
+        "classpath:/META-INF/not-there.properties", false);
 
     public static final FileConfigurationSource EMPTY_PATH = new TestResourcesRepository("", false);
 

modules/configuration/portal-configuration-impl/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource

@@ -1,8 +1,6 @@
 de.cuioss.portal.configuration.impl.support.TestEnvConfigSource
 de.cuioss.portal.configuration.impl.support.PortalConfigurationMock
-de.cuioss.portal.configuration.impl.support.TestYamlFileConfigurationSource
 de.cuioss.portal.configuration.impl.support.TestPropertiesFileConfigurationSource
-de.cuioss.portal.configuration.impl.source.FancyYamlFileConfigSource
 de.cuioss.portal.configuration.impl.source.HighReloadableConfigSource
 de.cuioss.portal.configuration.impl.source.LowReloadableConfigSource
 

modules/configuration/portal-configuration-impl/src/test/resources/config/module.properties

@@ -1,4 +1,6 @@
 module.properties.type=file
 module.properties.value=foo
 stage.test=prod
-stage.test.development=dev
+stage.test.development=dev
+string.list=a,b,c
+nested.key.replacement=${key-with-value:default-nested-key-value}