Merge pull request #713 from volosied/MYFACES-4665-5.0

MYFACES-4665: Implement BeforeDestroyed [5.0]
apache · May 9, 2024 · fbf9b8a · fbf9b8a
2 parents 397eeed + 2689c3d
commit fbf9b8a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeEventListenerBridge.java b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeEventListenerBridge.java
@@ -19,6 +19,7 @@
 package org.apache.myfaces.cdi.view;
 
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.BeforeDestroyed;
 import jakarta.enterprise.context.Destroyed;
 import jakarta.enterprise.context.Initialized;
 import jakarta.enterprise.event.Event;
@@ -37,6 +38,10 @@ public class ViewScopeEventListenerBridge
     @Initialized(ViewScoped.class)
     private Event<UIViewRoot> viewScopeInitializedEvent;
 
+    @Inject
+    @BeforeDestroyed(ViewScoped.class)
+    private Event<UIViewRoot> viewScopeBeforeDestroyedEvent;
+
     @Inject
     @Destroyed(ViewScoped.class)
     private Event<UIViewRoot> viewScopeDestroyedEvent;
@@ -50,6 +55,7 @@ public void processEvent(SystemEvent event) throws AbortProcessingException
 
         if (event instanceof PreDestroyViewMapEvent)
         {
+            viewScopeBeforeDestroyedEvent.fire((UIViewRoot) event.getSource());
             viewScopeDestroyedEvent.fire((UIViewRoot) event.getSource());
         }
     }

diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeContextualStorageHolder.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeContextualStorageHolder.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.BeforeDestroyed;
 import jakarta.enterprise.context.Destroyed;
 import jakarta.enterprise.context.Initialized;
 import jakarta.enterprise.context.SessionScoped;
@@ -63,6 +64,10 @@ public class FlowScopeContextualStorageHolder
     @Initialized(FlowScoped.class)
     private Event<Flow> flowInitializedEvent;
 
+    @Inject
+    @BeforeDestroyed(FlowScoped.class)
+    private Event<Flow> flowBeforeDestroyedEvent;
+
     @Inject
     @Destroyed(FlowScoped.class)
     private Event<Flow> flowDestroyedEvent;
@@ -212,6 +217,7 @@ public void destroyCurrentFlowScope(FacesContext facesContext)
             activeFlowKeys.remove(flowMapKey);
         }
 
+        flowBeforeDestroyedEvent.fire(flow);
         flowDestroyedEvent.fire(flow);
     }