Introducing new module: portal-common-cdi

cuioss · Oct 11, 2023 · eef54fd · eef54fd
1 parent fdc09b7
commit eef54fd
Show file tree

Hide file tree

Showing 63 changed files with 174 additions and 157 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -63,6 +63,13 @@
                 <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
+            <!-- Portal-Common-->
+            <dependency>
+                <groupId>de.cuioss.portal.core</groupId>
+                <artifactId>portal-common-cdi</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
             <!-- Portal-Core-Servlet-->
             <dependency>
                 <groupId>de.cuioss.portal.core</groupId>

diff --git a/...-authentication-api/src/main/java/de/cuioss/portal/authentication/PortalUserEnricher.java b/...-authentication-api/src/main/java/de/cuioss/portal/authentication/PortalUserEnricher.java
@@ -20,7 +20,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import de.cuioss.portal.authentication.facade.AuthenticationFacade;
-import de.cuioss.portal.configuration.common.PortalPriorities;
+import de.cuioss.portal.common.priority.PortalPriorities;
 
 /**
  * To enrich an {@link AuthenticatedUserInfo} created by the

diff --git a/...on-api/src/main/java/de/cuioss/portal/authentication/facade/BaseAuthenticationFacade.java b/...on-api/src/main/java/de/cuioss/portal/authentication/facade/BaseAuthenticationFacade.java
@@ -24,7 +24,7 @@
 
 import de.cuioss.portal.authentication.AuthenticatedUserInfo;
 import de.cuioss.portal.authentication.PortalUserEnricher;
-import de.cuioss.portal.configuration.common.PortalPriorities;
+import de.cuioss.portal.common.priority.PortalPriorities;
 
 /**
  * Abstract implementation to handle {@link PortalUserEnricher}s.

diff --git a/modules/configuration/portal-configuration-api/pom.xml b/modules/configuration/portal-configuration-api/pom.xml
@@ -27,6 +27,10 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
+        <dependency>
+            <groupId>de.cuioss.portal.core</groupId>
+            <artifactId>portal-common-cdi</artifactId>
+        </dependency>
         <!-- Test-->
         <dependency>
             <groupId>org.easymock</groupId>

diff --git a/...nfiguration-api/src/main/java/de/cuioss/portal/configuration/PortalConfigurationKeys.java b/...nfiguration-api/src/main/java/de/cuioss/portal/configuration/PortalConfigurationKeys.java
@@ -17,7 +17,7 @@
 
 import java.io.Serializable;
 
-import de.cuioss.portal.configuration.application.ProjectStage;
+import de.cuioss.portal.common.stage.ProjectStage;
 import de.cuioss.portal.configuration.schedule.FileWatcherService;
 import lombok.experimental.UtilityClass;
 

diff --git a/...pi/src/main/java/de/cuioss/portal/configuration/bundles/PortalResourceBundleRegistry.java b/...pi/src/main/java/de/cuioss/portal/configuration/bundles/PortalResourceBundleRegistry.java
diff --git a/...n-api/src/main/java/de/cuioss/portal/configuration/source/AbstractPortalConfigSource.java b/...n-api/src/main/java/de/cuioss/portal/configuration/source/AbstractPortalConfigSource.java
@@ -20,8 +20,8 @@
 
 import org.eclipse.microprofile.config.spi.ConfigSource;
 
+import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.portal.configuration.FileConfigurationSource;
-import de.cuioss.portal.configuration.common.PortalPriorities;
 import de.cuioss.tools.logging.CuiLogger;
 import lombok.ToString;
 

diff --git a/.../java/de/cuioss/portal/configuration/impl/bundles/PortalDefaultResourceBundleLocator.java b/.../java/de/cuioss/portal/configuration/impl/bundles/PortalDefaultResourceBundleLocator.java
@@ -22,9 +22,9 @@
 import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 
-import de.cuioss.portal.configuration.bundles.PortalResourceBundleLocator;
-import de.cuioss.portal.configuration.bundles.ResourceBundleLocator;
-import de.cuioss.portal.configuration.common.PortalPriorities;
+import de.cuioss.portal.common.bundle.PortalResourceBundleLocator;
+import de.cuioss.portal.common.bundle.ResourceBundleLocator;
+import de.cuioss.portal.common.priority.PortalPriorities;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;

diff --git a/...n/java/de/cuioss/portal/configuration/impl/bundles/PortalVendorResourceBundleLocator.java b/...n/java/de/cuioss/portal/configuration/impl/bundles/PortalVendorResourceBundleLocator.java
@@ -27,17 +27,17 @@
 import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 
-import de.cuioss.portal.configuration.bundles.PortalResourceBundleLocator;
-import de.cuioss.portal.configuration.bundles.ResourceBundleLocator;
-import de.cuioss.portal.configuration.common.PortalPriorities;
+import de.cuioss.portal.common.bundle.PortalResourceBundleLocator;
+import de.cuioss.portal.common.bundle.ResourceBundleLocator;
+import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.tools.logging.CuiLogger;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 
 /**
  * Defines the vendor specific bundle to be defined within a portal application,
- * that is "com.icw.ehf.cui.portal.i18n.vendor-messages" with the Priority
+ * that is "de.cuioss.portal.i18n.vendor-messages" with the Priority
  * {@link PortalPriorities#PORTAL_ASSEMBLY_LEVEL + 10}
  *
  * @author Matthias Walliczek
@@ -51,15 +51,15 @@ public class PortalVendorResourceBundleLocator implements ResourceBundleLocator
 
     private static final CuiLogger log = new CuiLogger(PortalVendorResourceBundleLocator.class);
 
-    private static final String VENDOR_MESSAGES = "com.icw.ehf.cui.portal.i18n.vendor-messages";
+    private static final String VENDOR_MESSAGES = "de.cuioss.portal.i18n.vendor-messages";
 
     private static final long serialVersionUID = -8478481710191113463L;
 
     @Getter
     private List<String> configuredResourceBundles = immutableList(VENDOR_MESSAGES);
 
     /**
-     * Initializes the bean beand by loading the {@link ResourceBundle}
+     * Initializes the bean by loading the {@link ResourceBundle}
      */
     @PostConstruct
     public void initBean() {

diff --git a/...pl/src/main/java/de/cuioss/portal/configuration/impl/producer/PortalProjectStageImpl.java b/...pl/src/main/java/de/cuioss/portal/configuration/impl/producer/PortalProjectStageImpl.java
@@ -27,9 +27,9 @@
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
+import de.cuioss.portal.common.stage.ProjectStage;
 import de.cuioss.portal.configuration.PortalConfigurationChangeEvent;
 import de.cuioss.portal.configuration.PortalConfigurationKeys;
-import de.cuioss.portal.configuration.application.ProjectStage;
 import de.cuioss.tools.logging.CuiLogger;
 import de.cuioss.uimodel.application.CuiProjectStage;
 import lombok.EqualsAndHashCode;

diff --git a/...l/src/test/java/de/cuioss/portal/configuration/impl/source/FancyYamlFileConfigSource.java b/...l/src/test/java/de/cuioss/portal/configuration/impl/source/FancyYamlFileConfigSource.java
@@ -15,7 +15,7 @@
  */
 package de.cuioss.portal.configuration.impl.source;
 
-import de.cuioss.portal.configuration.common.PortalPriorities;
+import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.portal.configuration.yaml.YamlConfigSource;
 
 public final class FancyYamlFileConfigSource extends YamlConfigSource {

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
@@ -33,15 +33,15 @@
 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.application.ProjectStage;
-import de.cuioss.portal.configuration.common.PortalPriorities;
 import de.cuioss.portal.configuration.initializer.ApplicationInitializer;
 import de.cuioss.portal.configuration.initializer.PortalInitializer;
 import de.cuioss.portal.configuration.types.ConfigAsList;

diff --git a/...va/de/cuioss/portal/configuration/impl/support/TestPropertiesFileConfigurationSource.java b/...va/de/cuioss/portal/configuration/impl/support/TestPropertiesFileConfigurationSource.java
@@ -15,7 +15,7 @@
  */
 package de.cuioss.portal.configuration.impl.support;
 
-import de.cuioss.portal.configuration.common.PortalPriorities;
+import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.portal.configuration.source.PropertiesConfigSource;
 
 /**

diff --git a/...est/java/de/cuioss/portal/configuration/impl/support/TestYamlFileConfigurationSource.java b/...est/java/de/cuioss/portal/configuration/impl/support/TestYamlFileConfigurationSource.java
@@ -15,7 +15,7 @@
  */
 package de.cuioss.portal.configuration.impl.support;
 
-import de.cuioss.portal.configuration.common.PortalPriorities;
+import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.portal.configuration.yaml.YamlConfigSource;
 
 public class TestYamlFileConfigurationSource extends YamlConfigSource {

diff --git a/...pl/src/test/java/de/cuioss/portal/configuration/impl/support/UnsupportedConfigSource.java b/...pl/src/test/java/de/cuioss/portal/configuration/impl/support/UnsupportedConfigSource.java
@@ -17,8 +17,8 @@
 
 import java.util.Map;
 
+import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.portal.configuration.FileConfigurationSource;
-import de.cuioss.portal.configuration.common.PortalPriorities;
 import de.cuioss.portal.configuration.source.PropertiesConfigSource;
 
 /**

diff --git a/...va/de/cuioss/portal/configuration/standalone/source/AbstractInstallationConfigSource.java b/...va/de/cuioss/portal/configuration/standalone/source/AbstractInstallationConfigSource.java
@@ -22,8 +22,8 @@
 import java.nio.file.Paths;
 import java.util.Map;
 
+import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.portal.configuration.FileConfigurationSource;
-import de.cuioss.portal.configuration.common.PortalPriorities;
 import de.cuioss.portal.configuration.impl.source.LoaderUtils;
 import de.cuioss.portal.configuration.source.AbstractPortalConfigSource;
 import de.cuioss.tools.collect.CollectionLiterals;

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
@@ -33,15 +33,15 @@
 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.application.ProjectStage;
-import de.cuioss.portal.configuration.common.PortalPriorities;
 import de.cuioss.portal.configuration.initializer.ApplicationInitializer;
 import de.cuioss.portal.configuration.initializer.PortalInitializer;
 import de.cuioss.portal.configuration.types.ConfigAsList;

diff --git a/...ation-yaml/src/main/java/de/cuioss/portal/configuration/yaml/YamlDefaultConfigSource.java b/...ation-yaml/src/main/java/de/cuioss/portal/configuration/yaml/YamlDefaultConfigSource.java
@@ -17,7 +17,7 @@
 
 import java.net.URL;
 
-import de.cuioss.portal.configuration.common.PortalPriorities;
+import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.tools.io.FileTypePrefix;
 
 /**

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
@@ -14,5 +14,6 @@
     <name>Portal Core Modules</name>
     <modules>
         <module>portal-core</module>
+        <module>portal-common-cdi</module>
     </modules>
 </project>
diff --git a/modules/core/portal-common-cdi/pom.xml b/modules/core/portal-common-cdi/pom.xml
@@ -0,0 +1,53 @@
+<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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>de.cuioss.portal.core</groupId>
+        <artifactId>core</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <properties>
+        <maven.jar.plugin.automatic.module.name>
+            de.cuioss.portal.core.common.cdi</maven.jar.plugin.automatic.module.name>
+    </properties>
+    <artifactId>portal-common-cdi</artifactId>
+    <name>Portal Common CDI</name>
+    <description>Provides some base-types and utilities</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.cuioss</groupId>
+            <artifactId>cui-java-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.cuioss</groupId>
+            <artifactId>cui-core-ui-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-web-api</artifactId>
+        </dependency>
+
+        <!-- Unit testing -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.cuioss.test</groupId>
+            <artifactId>cui-test-juli-logger</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.cuioss.test</groupId>
+            <artifactId>cui-test-value-objects</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-junit5</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/.../bundles/PortalResourceBundleLocator.java → ...n/bundle/PortalResourceBundleLocator.java b/.../bundles/PortalResourceBundleLocator.java → ...n/bundle/PortalResourceBundleLocator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.cuioss.portal.configuration.bundles;
+package de.cuioss.portal.common.bundle;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

diff --git a/...ration/bundles/ResourceBundleLocator.java → .../common/bundle/ResourceBundleLocator.java b/...ration/bundles/ResourceBundleLocator.java → .../common/bundle/ResourceBundleLocator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.cuioss.portal.configuration.bundles;
+package de.cuioss.portal.common.bundle;
 
 import java.io.Serializable;
 import java.util.List;

diff --git a/...ation/bundles/ResourceBundleRegistry.java → ...common/bundle/ResourceBundleRegistry.java b/...ation/bundles/ResourceBundleRegistry.java → ...common/bundle/ResourceBundleRegistry.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.cuioss.portal.configuration.bundles;
+package de.cuioss.portal.common.bundle;
 
 import java.io.Serializable;
 import java.util.List;

diff --git a/...l/bundles/ResourceBundleRegistryImpl.java → ...on/bundle/ResourceBundleRegistryImpl.java b/...l/bundles/ResourceBundleRegistryImpl.java → ...on/bundle/ResourceBundleRegistryImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.cuioss.portal.configuration.impl.bundles;
+package de.cuioss.portal.common.bundle;
 
 import static de.cuioss.tools.collect.CollectionLiterals.mutableList;
 
@@ -29,11 +29,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import de.cuioss.portal.configuration.bundles.PortalResourceBundleLocator;
-import de.cuioss.portal.configuration.bundles.PortalResourceBundleRegistry;
-import de.cuioss.portal.configuration.bundles.ResourceBundleLocator;
-import de.cuioss.portal.configuration.bundles.ResourceBundleRegistry;
-import de.cuioss.portal.configuration.common.PortalPriorities;
+import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.tools.collect.CollectionLiterals;
 import de.cuioss.tools.logging.CuiLogger;
 import lombok.EqualsAndHashCode;
@@ -51,7 +47,6 @@
 @ApplicationScoped
 @EqualsAndHashCode(of = "resolvedPaths", doNotUseGetters = true)
 @ToString(of = "resolvedPaths", doNotUseGetters = true)
-@PortalResourceBundleRegistry
 public class ResourceBundleRegistryImpl implements ResourceBundleRegistry {
 
     private static final long serialVersionUID = 2611987921899581695L;