Adding portal-deltaspike module

cuioss · Jul 21, 2023 · 474a563 · 474a563
1 parent 4c57ff3
commit 474a563
Show file tree

Hide file tree

Showing 15 changed files with 170 additions and 52 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -99,6 +99,13 @@
                 <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
+            <!-- Deltaspike modules-->
+            <dependency>
+                <groupId>de.cuioss.portal.core</groupId>
+                <artifactId>portal-deltaspike</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
             <!-- Test-->
             <dependency>
                 <groupId>de.cuioss.portal.test</groupId>

diff --git a/modules/core/portal-core/pom.xml b/modules/core/portal-core/pom.xml
@@ -50,6 +50,23 @@
             <groupId>de.cuioss.portal.configuration</groupId>
             <artifactId>portal-configuration-api</artifactId>
         </dependency>
+        <!-- Deltaspike -->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.deltaspike.core</groupId>-->
+<!--            <artifactId>deltaspike-core-api</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.deltaspike.core</groupId>-->
+<!--            <artifactId>deltaspike-core-impl</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.deltaspike.modules</groupId>-->
+<!--            <artifactId>deltaspike-servlet-module-api</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.deltaspike.modules</groupId>-->
+<!--            <artifactId>deltaspike-servlet-module-impl</artifactId>-->
+<!--        </dependency>-->
         <!-- Test Related -->
         <dependency>
             <groupId>org.easymock</groupId>

diff --git a/...core/src/main/java/de/cuioss/portal/core/cdi/servlet/literal/ServletDestroyedLiteral.java b/...core/src/main/java/de/cuioss/portal/core/cdi/servlet/literal/ServletDestroyedLiteral.java
diff --git a/...re/src/main/java/de/cuioss/portal/core/cdi/servlet/literal/ServletInitializedLiteral.java b/...re/src/main/java/de/cuioss/portal/core/cdi/servlet/literal/ServletInitializedLiteral.java
diff --git a/modules/pom.xml b/modules/pom.xml
@@ -65,5 +65,6 @@
         <module>core</module>
         <module>micro-profile</module>
         <module>test</module>
+        <module>portal-deltaspike</module>
     </modules>
 </project>
diff --git a/modules/portal-deltaspike/README.adoc b/modules/portal-deltaspike/README.adoc
@@ -0,0 +1,26 @@
+= portal-deltaspike
+
+== What's that?
+
+Portal specific port of some, not all deltaspike modules.
+
+Ratio: Decouple from the release model, that is currently lacking the 'punch'.
+
+Regarding quality it is "as it is", derived by version 1.9.6. It does not comply with 
+the cui-quality-standards. The idea is, that it can be replaced again by the original
+
+It can not be used in conjunction with other deltspike modules, but it can be replaced by them.
+
+But then you need the whole set!
+
+
+== Maven Coordinates
+
+[source,xml]
+----
+    <dependency>
+        <groupId>de.cuioss.portal.core</groupId>
+        <artifactId>portal-deltaspike</artifactId>
+    </dependency>
+----
+
diff --git a/modules/portal-deltaspike/pom.xml b/modules/portal-deltaspike/pom.xml
@@ -0,0 +1,61 @@
+<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</groupId>
+        <artifactId>modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>portal-deltaspike</artifactId>
+    <name>Portal DeltaSpike</name>
+    <description>Portal specific port of some, not all deltaspike modules.
+        Ratio: Decouple from the release model, that is currently lacking the
+        'punch'.</description>
+    <dependencies>
+        <!-- Provided -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-web-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.config</groupId>
+            <artifactId>microprofile-config-api</artifactId>
+        </dependency>
+        <!-- cuioss-->
+        <dependency>
+            <groupId>de.cuioss</groupId>
+            <artifactId>cui-java-tools</artifactId>
+        </dependency>
+        <!-- Test Related -->
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.cuioss.portal.configuration</groupId>
+            <artifactId>portal-configuration-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.cuioss.test</groupId>
+            <artifactId>cui-test-juli-logger</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-junit5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.cuioss.test</groupId>
+            <artifactId>cui-test-value-objects</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.cuioss.test</groupId>
+            <artifactId>cui-jsf-test-basic</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...cdi/servlet/literal/ServletDestroyed.java → ...taspike/core/api/lifecycle/Destroyed.java b/...cdi/servlet/literal/ServletDestroyed.java → ...taspike/core/api/lifecycle/Destroyed.java
@@ -1,4 +1,4 @@
-package de.cuioss.portal.core.cdi.servlet.literal;
+package org.apache.deltaspike.core.api.lifecycle;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
@@ -21,6 +21,6 @@
 @Target({ TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)
 @Documented
-public @interface ServletDestroyed {
+public @interface Destroyed {
 
 }
diff --git a/...l-deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/DestroyedLiteral.java b/...l-deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/DestroyedLiteral.java
@@ -0,0 +1,15 @@
+package org.apache.deltaspike.core.api.lifecycle;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+/**
+ * Annotation literal for {@link DestroyedLiteral}.
+ * 
+ * @author https://github.com/apache/deltaspike/blob/deltaspike-1.9.6/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DestroyedLiteral.java
+ */
+public class DestroyedLiteral extends AnnotationLiteral<Initialized> implements Destroyed {
+
+    private static final long serialVersionUID = 5587631398288144209L;
+    public static final Destroyed INSTANCE = new DestroyedLiteral();
+
+}
diff --git a/...i/servlet/literal/ServletInitialized.java → ...spike/core/api/lifecycle/Initialized.java b/...i/servlet/literal/ServletInitialized.java → ...spike/core/api/lifecycle/Initialized.java
@@ -1,4 +1,4 @@
-package de.cuioss.portal.core.cdi.servlet.literal;
+package org.apache.deltaspike.core.api.lifecycle;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
@@ -21,6 +21,6 @@
 @Target({ TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)
 @Documented
-public @interface ServletInitialized {
+public @interface Initialized {
 
 }
diff --git a/...deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/InitializedLiteral.java b/...deltaspike/src/main/java/org/apache/deltaspike/core/api/lifecycle/InitializedLiteral.java
@@ -0,0 +1,16 @@
+package org.apache.deltaspike.core.api.lifecycle;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+/**
+ * Annotation literal for {@link Initialized}.
+ * 
+ * @author https://github.com/apache/deltaspike/blob/deltaspike-1.9.6/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/InitializedLiteral.java
+ */
+public class InitializedLiteral extends AnnotationLiteral<Initialized> implements Initialized {
+
+    private static final long serialVersionUID = 1268993406072023790L;
+
+    public static final Initialized INSTANCE = new InitializedLiteral();
+
+}
diff --git a/...et/bridge/RequestResponseEventFilter.java → ...mpl/event/RequestResponseEventFilter.java b/...et/bridge/RequestResponseEventFilter.java → ...mpl/event/RequestResponseEventFilter.java
@@ -1,4 +1,4 @@
-package de.cuioss.portal.core.cdi.servlet.bridge;
+package org.apache.deltaspike.servlet.impl.event;
 
 import java.io.IOException;
 
@@ -9,14 +9,15 @@
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import de.cuioss.portal.core.cdi.servlet.literal.ServletDestroyedLiteral;
-import de.cuioss.portal.core.cdi.servlet.literal.ServletInitialized;
-import de.cuioss.portal.core.cdi.servlet.literal.ServletInitializedLiteral;
+import org.apache.deltaspike.core.api.lifecycle.DestroyedLiteral;
+import org.apache.deltaspike.core.api.lifecycle.Initialized;
+import org.apache.deltaspike.core.api.lifecycle.InitializedLiteral;
+
 import de.cuioss.tools.logging.CuiLogger;
 
 /**
- * Inspired by deltaspike. Fires events for {@link ServletInitialized} and
- * {@link ServletDestroyed}.
+ * Inspired by deltaspike. Fires events for {@link Initialized} and
+ * {@link Destroyed}.
  */
 public class RequestResponseEventFilter implements Filter {
 
@@ -29,16 +30,16 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         var beanManager = CDI.current().getBeanManager();
 
         LOGGER.trace("Fire @Initialized events");
-        beanManager.fireEvent(request, ServletInitializedLiteral.INSTANCE);
-        beanManager.fireEvent(response, ServletInitializedLiteral.INSTANCE);
+        beanManager.fireEvent(request, InitializedLiteral.INSTANCE);
+        beanManager.fireEvent(response, InitializedLiteral.INSTANCE);
 
         try {
             LOGGER.trace("Execute Chain");
             chain.doFilter(request, response);
         } finally {
             LOGGER.trace("Fire @Destroyed events");
-            beanManager.fireEvent(request, ServletDestroyedLiteral.INSTANCE);
-            beanManager.fireEvent(response, ServletDestroyedLiteral.INSTANCE);
+            beanManager.fireEvent(request, DestroyedLiteral.INSTANCE);
+            beanManager.fireEvent(response, DestroyedLiteral.INSTANCE);
         }
     }
 

diff --git a/modules/portal-deltaspike/src/main/resources/META-INF/beans.xml b/modules/portal-deltaspike/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+    bean-discovery-mode="annotated" version="2.0">
+</beans>
diff --git a/.../main/resources/META-INF/web-fragment.xml → .../main/resources/META-INF/web-fragment.xml b/.../main/resources/META-INF/web-fragment.xml → .../main/resources/META-INF/web-fragment.xml
diff --git a/...ridge/RequestResponseEventFilterTest.java → ...event/RequestResponseEventFilterTest.java b/...ridge/RequestResponseEventFilterTest.java → ...event/RequestResponseEventFilterTest.java
@@ -1,4 +1,4 @@
-package de.cuioss.portal.core.cdi.servlet.bridge;
+package org.apache.deltaspike.servlet.impl.event;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -10,15 +10,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.deltaspike.core.api.lifecycle.Initialized;
 import org.apache.myfaces.test.mock.MockHttpServletRequest;
 import org.apache.myfaces.test.mock.MockHttpServletResponse;
 import org.easymock.EasyMock;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import de.cuioss.portal.core.cdi.servlet.literal.ServletInitialized;
-
 @EnableAutoWeld
 class RequestResponseEventFilterTest {
 
@@ -48,19 +47,19 @@ void shouldFilter() throws IOException, ServletException {
         assertTrue(initResponse);
     }
 
-    void initRequest(@Observes @ServletInitialized HttpServletRequest request) {
+    void initRequest(@Observes @Initialized HttpServletRequest request) {
         initRequest = true;
     }
 
-    void destroyRequest(@Observes @ServletInitialized HttpServletRequest request) {
+    void destroyRequest(@Observes @Initialized HttpServletRequest request) {
         destroyRequest = true;
     }
 
-    void initResponse(@Observes @ServletInitialized HttpServletResponse request) {
+    void initResponse(@Observes @Initialized HttpServletResponse request) {
         initResponse = true;
     }
 
-    void destroyResponse(@Observes @ServletInitialized HttpServletResponse request) {
+    void destroyResponse(@Observes @Initialized HttpServletResponse request) {
         destroyResponse = true;
     }