myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1052294 - in /myfaces/extensions/cdi/trunk/jee-modules: jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/ jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/
Date Thu, 23 Dec 2010 14:55:22 GMT
Author: gpetracek
Date: Thu Dec 23 14:55:22 2010
New Revision: 1052294

URL: http://svn.apache.org/viewvc?rev=1052294&view=rev
Log:
EXTCDI-95 improved performance

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextWrapper.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/InjectionAwareApplicationWrapper.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/InjectionAwareApplicationWrapper.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextWrapper.java?rev=1052294&r1=1052293&r2=1052294&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextWrapper.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextWrapper.java
Thu Dec 23 14:55:22 2010
@@ -52,7 +52,7 @@ class CodiFacesContextWrapper extends Fa
 
     private BeanManager beanManager;
 
-    private CodiCoreConfig codiCoreConfig;
+    private boolean advancedQualifierRequiredForDependencyInjection;
 
     private BeforeAfterFacesRequestBroadcaster beforeAfterFacesRequestBroadcaster;
 
@@ -72,8 +72,10 @@ class CodiFacesContextWrapper extends Fa
     {
         this.beanManager = BeanManagerProvider.getInstance().getBeanManager();
 
-        this.codiCoreConfig = CodiUtils.getOrCreateScopedInstanceOfBeanByClass(this.beanManager,
CodiCoreConfig.class);
-
+        this.advancedQualifierRequiredForDependencyInjection =
+                CodiUtils.getOrCreateScopedInstanceOfBeanByClass(this.beanManager, CodiCoreConfig.class)
+                        .isAdvancedQualifierRequiredForDependencyInjection();
+        
         initBroadcaster();
 
         broadcastBeforeFacesRequestEvent();
@@ -81,7 +83,8 @@ class CodiFacesContextWrapper extends Fa
 
     public Application getApplication()
     {
-        return new InjectionAwareApplicationWrapper(wrappedFacesContext.getApplication(),
this.codiCoreConfig);
+        return new InjectionAwareApplicationWrapper(wrappedFacesContext.getApplication(),
+                this.advancedQualifierRequiredForDependencyInjection);
     }
 
     private void broadcastBeforeFacesRequestEvent()

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/InjectionAwareApplicationWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/InjectionAwareApplicationWrapper.java?rev=1052294&r1=1052293&r2=1052294&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/InjectionAwareApplicationWrapper.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/InjectionAwareApplicationWrapper.java
Thu Dec 23 14:55:22 2010
@@ -18,8 +18,6 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf.impl.listener.request;
 
-import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
-
 import static org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils.injectFields;
 
 import javax.faces.application.Application;
@@ -58,11 +56,11 @@ class InjectionAwareApplicationWrapper e
 
     private boolean advancedQualifierRequiredForDependencyInjection;
 
-    protected InjectionAwareApplicationWrapper(Application wrapped, CodiCoreConfig codiCoreConfig)
+    protected InjectionAwareApplicationWrapper(Application wrapped,
+                                               boolean advancedQualifierRequiredForDependencyInjection)
     {
         this.wrapped = wrapped;
-        this.advancedQualifierRequiredForDependencyInjection =
-                codiCoreConfig.isAdvancedQualifierRequiredForDependencyInjection();
+        this.advancedQualifierRequiredForDependencyInjection = advancedQualifierRequiredForDependencyInjection;
     }
 
     public Converter createConverter(String converterId)

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java?rev=1052294&r1=1052293&r2=1052294&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java
Thu Dec 23 14:55:22 2010
@@ -45,7 +45,7 @@ class CodiFacesContextWrapper extends Fa
 
     private BeanManager beanManager;
 
-    private CodiCoreConfig codiCoreConfig;
+    private boolean advancedQualifierRequiredForDependencyInjection;
 
     private BeforeAfterFacesRequestBroadcaster beforeAfterFacesRequestBroadcaster;
 
@@ -65,8 +65,10 @@ class CodiFacesContextWrapper extends Fa
     {
         this.beanManager = BeanManagerProvider.getInstance().getBeanManager();
 
-        this.codiCoreConfig = CodiUtils.getOrCreateScopedInstanceOfBeanByClass(this.beanManager,
CodiCoreConfig.class);
-        
+        this.advancedQualifierRequiredForDependencyInjection =
+                CodiUtils.getOrCreateScopedInstanceOfBeanByClass(this.beanManager, CodiCoreConfig.class)
+                        .isAdvancedQualifierRequiredForDependencyInjection();
+
         initBroadcaster();
 
         broadcastBeforeFacesRequestEvent();
@@ -75,7 +77,8 @@ class CodiFacesContextWrapper extends Fa
     @Override
     public Application getApplication()
     {
-        return new InjectionAwareApplicationWrapper(wrappedFacesContext.getApplication(),
this.codiCoreConfig);
+        return new InjectionAwareApplicationWrapper(wrappedFacesContext.getApplication(),
+                this.advancedQualifierRequiredForDependencyInjection);
     }
 
     private void broadcastBeforeFacesRequestEvent()

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/InjectionAwareApplicationWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/InjectionAwareApplicationWrapper.java?rev=1052294&r1=1052293&r2=1052294&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/InjectionAwareApplicationWrapper.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/InjectionAwareApplicationWrapper.java
Thu Dec 23 14:55:22 2010
@@ -18,7 +18,6 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf2.impl.listener.request;
 
-import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
 import static org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils.injectFields;
 
 import javax.faces.application.ApplicationWrapper;
@@ -38,11 +37,11 @@ class InjectionAwareApplicationWrapper e
 
     private boolean advancedQualifierRequiredForDependencyInjection;
 
-    protected InjectionAwareApplicationWrapper(Application wrapped, CodiCoreConfig codiCoreConfig)
+    protected InjectionAwareApplicationWrapper(Application wrapped,
+                                               boolean advancedQualifierRequiredForDependencyInjection)
     {
         this.wrapped = wrapped;
-        this.advancedQualifierRequiredForDependencyInjection =
-                codiCoreConfig.isAdvancedQualifierRequiredForDependencyInjection();
+        this.advancedQualifierRequiredForDependencyInjection = advancedQualifierRequiredForDependencyInjection;
     }
 
     public Application getWrapped()



Mime
View raw message