Refactored literal

cuioss · Jul 20, 2023 · 4c57ff3 · 4c57ff3
1 parent 2b40776
commit 4c57ff3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/...re/src/main/java/de/cuioss/portal/core/cdi/servlet/bridge/RequestResponseEventFilter.java b/...re/src/main/java/de/cuioss/portal/core/cdi/servlet/bridge/RequestResponseEventFilter.java
@@ -9,14 +9,14 @@
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import de.cuioss.portal.core.cdi.servlet.literal.DestroyedLiteral;
-import de.cuioss.portal.core.cdi.servlet.literal.Initialized;
-import de.cuioss.portal.core.cdi.servlet.literal.InitializedLiteral;
+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 de.cuioss.tools.logging.CuiLogger;
 
 /**
- * Inspired by deltaspike. Fires events for {@link Initialized} and
- * {@link Destroyed}.
+ * Inspired by deltaspike. Fires events for {@link ServletInitialized} and
+ * {@link ServletDestroyed}.
  */
 public class RequestResponseEventFilter implements Filter {
 
@@ -29,16 +29,16 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         var beanManager = CDI.current().getBeanManager();
 
         LOGGER.trace("Fire @Initialized events");
-        beanManager.fireEvent(request, InitializedLiteral.INSTANCE);
-        beanManager.fireEvent(response, InitializedLiteral.INSTANCE);
+        beanManager.fireEvent(request, ServletInitializedLiteral.INSTANCE);
+        beanManager.fireEvent(response, ServletInitializedLiteral.INSTANCE);
 
         try {
             LOGGER.trace("Execute Chain");
             chain.doFilter(request, response);
         } finally {
             LOGGER.trace("Fire @Destroyed events");
-            beanManager.fireEvent(request, DestroyedLiteral.INSTANCE);
-            beanManager.fireEvent(response, DestroyedLiteral.INSTANCE);
+            beanManager.fireEvent(request, ServletDestroyedLiteral.INSTANCE);
+            beanManager.fireEvent(response, ServletDestroyedLiteral.INSTANCE);
         }
     }
 

diff --git a/...l/core/cdi/servlet/literal/Destroyed.java → ...cdi/servlet/literal/ServletDestroyed.java b/...l/core/cdi/servlet/literal/Destroyed.java → ...cdi/servlet/literal/ServletDestroyed.java
@@ -21,6 +21,6 @@
 @Target({ TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)
 @Documented
-public @interface Destroyed {
+public @interface ServletDestroyed {
 
 }
diff --git a/...cdi/servlet/literal/DestroyedLiteral.java → ...vlet/literal/ServletDestroyedLiteral.java b/...cdi/servlet/literal/DestroyedLiteral.java → ...vlet/literal/ServletDestroyedLiteral.java
@@ -3,13 +3,13 @@
 import javax.enterprise.util.AnnotationLiteral;
 
 /**
- * Annotation literal for {@link DestroyedLiteral}.
+ * Annotation literal for {@link ServletDestroyedLiteral}.
  * 
  * @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 {
+public class ServletDestroyedLiteral extends AnnotationLiteral<ServletInitialized> implements ServletDestroyed {
 
     private static final long serialVersionUID = 5587631398288144209L;
-    public static final Destroyed INSTANCE = new DestroyedLiteral();
+    public static final ServletDestroyed INSTANCE = new ServletDestroyedLiteral();
 
 }
diff --git a/...core/cdi/servlet/literal/Initialized.java → ...i/servlet/literal/ServletInitialized.java b/...core/cdi/servlet/literal/Initialized.java → ...i/servlet/literal/ServletInitialized.java
@@ -21,6 +21,6 @@
 @Target({ TYPE, METHOD, PARAMETER, FIELD })
 @Retention(RUNTIME)
 @Documented
-public @interface Initialized {
+public @interface ServletInitialized {
 
 }
diff --git a/...i/servlet/literal/InitializedLiteral.java → ...et/literal/ServletInitializedLiteral.java b/...i/servlet/literal/InitializedLiteral.java → ...et/literal/ServletInitializedLiteral.java
@@ -3,14 +3,14 @@
 import javax.enterprise.util.AnnotationLiteral;
 
 /**
- * Annotation literal for {@link Initialized}.
+ * Annotation literal for {@link ServletInitialized}.
  * 
  * @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 {
+public class ServletInitializedLiteral extends AnnotationLiteral<ServletInitialized> implements ServletInitialized {
 
     private static final long serialVersionUID = 1268993406072023790L;
 
-    public static final Initialized INSTANCE = new InitializedLiteral();
+    public static final ServletInitialized INSTANCE = new ServletInitializedLiteral();
 
 }
diff --git a/...rc/test/java/de/cuioss/portal/core/cdi/servlet/bridge/RequestResponseEventFilterTest.java b/...rc/test/java/de/cuioss/portal/core/cdi/servlet/bridge/RequestResponseEventFilterTest.java
@@ -17,7 +17,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import de.cuioss.portal.core.cdi.servlet.literal.Initialized;
+import de.cuioss.portal.core.cdi.servlet.literal.ServletInitialized;
 
 @EnableAutoWeld
 class RequestResponseEventFilterTest {
@@ -48,19 +48,19 @@ void shouldFilter() throws IOException, ServletException {
         assertTrue(initResponse);
     }
 
-    void initRequest(@Observes @Initialized HttpServletRequest request) {
+    void initRequest(@Observes @ServletInitialized HttpServletRequest request) {
         initRequest = true;
     }
 
-    void destroyRequest(@Observes @Initialized HttpServletRequest request) {
+    void destroyRequest(@Observes @ServletInitialized HttpServletRequest request) {
         destroyRequest = true;
     }
 
-    void initResponse(@Observes @Initialized HttpServletResponse request) {
+    void initResponse(@Observes @ServletInitialized HttpServletResponse request) {
         initResponse = true;
     }
 
-    void destroyResponse(@Observes @Initialized HttpServletResponse request) {
+    void destroyResponse(@Observes @ServletInitialized HttpServletResponse request) {
         destroyResponse = true;
     }