[deltaspike] branch master updated: refactored

[tandraschko]

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


The following commit(s) were added to refs/heads/master by this push:
     new b3b2b65ae refactored
b3b2b65ae is described below

commit b3b2b65ae4478989de7b64dd9af97d34be6401f1
Author: Thomas Andraschko <tandrasc...@apache.org>
AuthorDate: Fri Mar 31 10:29:08 2023 +0200

    refactored
---
 .../request/DeltaSpikeApplicationWrapper.java}                      | 6 +++---
 .../jsf/impl/listener/request/DeltaSpikeFacesContextWrapper.java    | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/InjectionAwareApplicationWrapper.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/request/DeltaSpikeApplicationWrapper.java
similarity index 94%
rename from 
deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/InjectionAwareApplicationWrapper.java
rename to 
deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/request/DeltaSpikeApplicationWrapper.java
index bf628149c..1619b0bae 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/InjectionAwareApplicationWrapper.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/request/DeltaSpikeApplicationWrapper.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.deltaspike.jsf.impl.injection;
+package org.apache.deltaspike.jsf.impl.listener.request;
 
 import org.apache.deltaspike.jsf.api.config.JsfModuleConfig;
 import org.apache.deltaspike.jsf.impl.security.SecurityAwareViewHandler;
@@ -28,13 +28,13 @@ import jakarta.faces.context.FacesContext;
 import jakarta.faces.event.PreDestroyViewMapEvent;
 import jakarta.faces.event.SystemEvent;
 
-public class InjectionAwareApplicationWrapper extends ApplicationWrapper
+public class DeltaSpikeApplicationWrapper extends ApplicationWrapper
 {
     private final Application wrapped;
     private final boolean preDestroyViewMapEventFilterMode;
     private final ProjectStage projectStage;
 
-    public InjectionAwareApplicationWrapper(
+    public DeltaSpikeApplicationWrapper(
             Application wrapped, JsfModuleConfig jsfModuleConfig, boolean 
preDestroyViewMapEventFilterMode,
             ProjectStage projectStage)
     {
diff --git 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/request/DeltaSpikeFacesContextWrapper.java
 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/request/DeltaSpikeFacesContextWrapper.java
index 69f4b4382..540dff20f 100644
--- 
a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/request/DeltaSpikeFacesContextWrapper.java
+++ 
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/request/DeltaSpikeFacesContextWrapper.java
@@ -27,7 +27,6 @@ import org.apache.deltaspike.core.util.ClassDeactivationUtils;
 import org.apache.deltaspike.core.util.ProjectStageProducer;
 import org.apache.deltaspike.jsf.api.config.JsfModuleConfig;
 import 
org.apache.deltaspike.jsf.impl.config.view.DefaultErrorViewAwareExceptionHandlerWrapper;
-import 
org.apache.deltaspike.jsf.impl.injection.InjectionAwareApplicationWrapper;
 import org.apache.deltaspike.jsf.impl.message.FacesMessageEntry;
 
 import jakarta.enterprise.inject.spi.BeanManager;
@@ -245,7 +244,7 @@ class DeltaSpikeFacesContextWrapper extends 
FacesContextWrapper
         {
             wrappedApplication = new 
NavigationHandlerAwareApplication(wrappedApplication);
         }
-        return new InjectionAwareApplicationWrapper(
+        return new DeltaSpikeApplicationWrapper(
             wrappedApplication, this.jsfModuleConfig, 
this.preDestroyViewMapEventFilterMode, this.projectStage);
     }