Removing PortalConfigurationStorage

cuioss · Jun 7, 2024 · 3b9aae5 · 3b9aae5
1 parent ee6de9f
commit 3b9aae5
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 92 deletions.
diff --git a/...on/portal-authentication-oauth/src/main/resources/META-INF/microprofile-config.properties b/...on/portal-authentication-oauth/src/main/resources/META-INF/microprofile-config.properties
@@ -27,7 +27,7 @@ config_name=portal-authentication-oauth
 authentication.oidc.client.default_scopes=openid profile
 
 # Defines the name of the claim / attribute that is used
-# for mapping the roles to the user, multiple values are allowed, separated by comma.
+# for mapping the roles to the user; multiple values are allowed, separated by comma.
 # Defaults to 'ehealth-suite-roles'
 authentication.oidc.client.role_mapper_claim=ehealth-suite-roles
 

diff --git a/...guration-api/src/main/java/de/cuioss/portal/configuration/PortalConfigurationStorage.java b/...guration-api/src/main/java/de/cuioss/portal/configuration/PortalConfigurationStorage.java
diff --git a/...tion/portal-configuration-impl/src/main/resources/META-INF/microprofile-config.properties b/...tion/portal-configuration-impl/src/main/resources/META-INF/microprofile-config.properties
@@ -1,3 +1,4 @@
+config_name=portal-configuration-impl
 # Defines the default configuration for the CUI-Portal
 
 # Context parameter within configuration-subsystem with the name "portal.locale.default"

diff --git a/...pl/src/test/java/de/cuioss/portal/configuration/impl/support/PortalConfigurationMock.java b/...pl/src/test/java/de/cuioss/portal/configuration/impl/support/PortalConfigurationMock.java
@@ -103,7 +103,6 @@
  * @author Oliver Wolff
  */
 @PortalConfigurationSource
-@PortalConfigurationStorage
 @ApplicationScoped
 @Priority(PortalConfigurationMock.PRIORITY)
 @EqualsAndHashCode(of = "configurationMap")

diff --git a/...c/test/java/de/cuioss/portal/configuration/standalone/source/PortalConfigurationMock.java b/...c/test/java/de/cuioss/portal/configuration/standalone/source/PortalConfigurationMock.java
@@ -15,38 +15,26 @@
  */
 package de.cuioss.portal.configuration.standalone.source;
 
-import static de.cuioss.tools.collect.CollectionLiterals.immutableMap;
-import static de.cuioss.tools.collect.CollectionLiterals.mutableList;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.event.Event;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
-import org.eclipse.microprofile.config.spi.ConfigSource;
-import org.jboss.weld.junit5.auto.AddBeanClasses;
-
 import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.portal.common.stage.ProjectStage;
-import de.cuioss.portal.configuration.ConfigurationSourceChangeEvent;
-import de.cuioss.portal.configuration.ConfigurationStorage;
-import de.cuioss.portal.configuration.PortalConfigurationChangeEvent;
-import de.cuioss.portal.configuration.PortalConfigurationChangeInterceptor;
-import de.cuioss.portal.configuration.PortalConfigurationKeys;
-import de.cuioss.portal.configuration.PortalConfigurationSource;
-import de.cuioss.portal.configuration.PortalConfigurationStorage;
+import de.cuioss.portal.configuration.*;
 import de.cuioss.portal.configuration.initializer.ApplicationInitializer;
 import de.cuioss.portal.configuration.initializer.PortalInitializer;
 import de.cuioss.portal.configuration.types.ConfigAsList;
 import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.jboss.weld.junit5.auto.AddBeanClasses;
+
+import java.util.*;
+
+import static de.cuioss.tools.collect.CollectionLiterals.immutableMap;
+import static de.cuioss.tools.collect.CollectionLiterals.mutableList;
 
 /**
  * Mock variant of configuration, overwriting all other configuration elements.
@@ -113,7 +101,6 @@
  * @author Oliver Wolff
  */
 @PortalConfigurationSource
-@PortalConfigurationStorage
 @ApplicationScoped
 @Priority(PortalConfigurationMock.PRIORITY)
 @EqualsAndHashCode(of = "configurationMap")

diff --git a/...portal-core/src/test/java/de/cuioss/portal/core/test/support/PortalConfigurationMock.java b/...portal-core/src/test/java/de/cuioss/portal/core/test/support/PortalConfigurationMock.java
@@ -15,37 +15,29 @@
  */
 package de.cuioss.portal.core.test.support;
 
-import static de.cuioss.tools.collect.CollectionLiterals.immutableMap;
-import static de.cuioss.tools.collect.CollectionLiterals.mutableList;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.event.Event;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
-import org.jboss.weld.junit5.auto.AddBeanClasses;
-
 import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.portal.common.stage.ProjectStage;
-import de.cuioss.portal.configuration.ConfigurationSourceChangeEvent;
-import de.cuioss.portal.configuration.ConfigurationStorage;
-import de.cuioss.portal.configuration.PortalConfigurationChangeEvent;
-import de.cuioss.portal.configuration.PortalConfigurationChangeInterceptor;
-import de.cuioss.portal.configuration.PortalConfigurationKeys;
-import de.cuioss.portal.configuration.PortalConfigurationSource;
-import de.cuioss.portal.configuration.PortalConfigurationStorage;
+import de.cuioss.portal.configuration.*;
 import de.cuioss.portal.configuration.initializer.ApplicationInitializer;
 import de.cuioss.portal.configuration.initializer.PortalInitializer;
 import de.cuioss.portal.configuration.source.AbstractPortalConfigSource;
 import de.cuioss.portal.configuration.types.ConfigAsList;
 import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.jboss.weld.junit5.auto.AddBeanClasses;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static de.cuioss.tools.collect.CollectionLiterals.immutableMap;
+import static de.cuioss.tools.collect.CollectionLiterals.mutableList;
 
 /**
  * Mock variant of configuration, overwriting all other configuration elements.
@@ -87,7 +79,7 @@
  *   private PortalConfigurationMock configuration;
  * </code>
  * </pre>
- *
+ * <p>
  * Initialize it like
  *
  * <pre>
@@ -98,7 +90,7 @@
  *   }
  * </code>
  * </pre>
- *
+ * <p>
  * and use it like:
  *
  * <pre>
@@ -112,7 +104,6 @@
  * @author Oliver Wolff
  */
 @PortalConfigurationSource
-@PortalConfigurationStorage
 @ApplicationScoped
 @Priority(PortalPriorities.PORTAL_ASSEMBLY_LEVEL)
 @EqualsAndHashCode(of = "configurationMap", callSuper = false)
@@ -163,7 +154,6 @@ public void fireEvent(Map<String, String> deltaMap) {
      *
      * @param key   of the entry
      * @param value of the entry
-     *
      */
     public void fireEvent(String key, String value) {
         fireEvent(immutableMap(key, value));
@@ -177,7 +167,6 @@ public void fireEvent(String key, String value) {
      * @param value1 of the entry1
      * @param key2   of the entry2
      * @param value2 of the entry2
-     *
      */
     public void fireEvent(String key1, String value1, String key2, String value2) {
         fireEvent(immutableMap(key1, value1, key2, value2));

diff --git a/...cro-profile/portal-metrics-api/src/main/resources/META-INF/microprofile-config.properties b/...cro-profile/portal-metrics-api/src/main/resources/META-INF/microprofile-config.properties