svn commit: r1308200 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: intercept/WebBeansInterceptorConfig.java util/WebBeansUtil.java

[struberg]

Author: struberg
Date: Sun Apr  1 20:54:03 2012
New Revision: 1308200

URL: http://svn.apache.org/viewvc?rev=1308200&view=rev
Log:
reduce dynamic calls for static candidates

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java?rev=1308200&r1=1308199&r2=1308200&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
 Sun Apr  1 20:54:03 2012
@@ -248,7 +248,7 @@ public final class WebBeansInterceptorCo
             componentInterceptors = findDeployedWebBeansInterceptor(anns, 
component.getWebBeansContext());
 
             // Adding class interceptors
-            addComponentInterceptors(component, componentInterceptors, stack);
+            addComponentInterceptors(componentInterceptors, stack);
         }
 
         // Method level interceptors.
@@ -258,7 +258,7 @@ public final class WebBeansInterceptorCo
         }
         else
         {
-            addMethodInterceptors(component, annotatedType, stack, 
componentInterceptors);
+            addMethodInterceptors(annotatedType, stack, componentInterceptors);
         }
         filterInterceptorsPerBDA(component,stack);
 
@@ -295,9 +295,8 @@ public final class WebBeansInterceptorCo
 
     }
 
-    public void addComponentInterceptors(AbstractOwbBean<?> bean, 
Set<Interceptor<?>> set, List<InterceptorData> stack)
+    public void addComponentInterceptors(Set<Interceptor<?>> set, 
List<InterceptorData> stack)
     {
-        WebBeansContext webBeansContext = bean.getWebBeansContext();
         Iterator<Interceptor<?>> it = set.iterator();
         while (it.hasNext())
         {
@@ -388,7 +387,6 @@ public final class WebBeansInterceptorCo
     private void addMethodInterceptors(AbstractInjectionTargetBean<?> 
component, Class<?> clazz, List<InterceptorData> stack, Set<Interceptor<?>> 
componentInterceptors,
                                               Set<Annotation> 
resolvedComponentInterceptorBindings)
     {
-        WebBeansContext webBeansContext = component.getWebBeansContext();
         AnnotationManager annotationManager = 
webBeansContext.getAnnotationManager();
 
         // All methods, not just those declared
@@ -485,13 +483,11 @@ public final class WebBeansInterceptorCo
     }
 
     @SuppressWarnings("unchecked")
-    private <T> void addMethodInterceptors(AbstractInjectionTargetBean<?> 
component,
-                                                  AnnotatedType<T> 
annotatedType,
-                                                  List<InterceptorData> stack,
-                                                  Set<Interceptor<?>> 
componentInterceptors)
+    private <T> void addMethodInterceptors(AnnotatedType<T> annotatedType,
+                                           List<InterceptorData> stack,
+                                           Set<Interceptor<?>> 
componentInterceptors)
     {
 
-        WebBeansContext webBeansContext = component.getWebBeansContext();
         AnnotationManager annotationManager = 
webBeansContext.getAnnotationManager();
         Set<AnnotatedMethod<? super T>> methods = annotatedType.getMethods();
         for(AnnotatedMethod<? super T> methodA : methods)

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1308200&r1=1308199&r2=1308200&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
 Sun Apr  1 20:54:03 2012
@@ -177,6 +177,10 @@ public final class WebBeansUtil
      */
     private static volatile Boolean enforceCheckedException;
 
+    private final static Class<Instance<?>> INSTANCE_TYPE = new 
TypeLiteral<Instance<?>>(){}.getRawType();
+    private final static Class<Provider<?>> PROVIDER_TYPE = new 
TypeLiteral<Provider<?>>(){}.getRawType();
+    private final static Class<Event<?>>    EVENT_TYPE    = new 
TypeLiteral<Event<?>>(){}.getRawType();
+
     private final WebBeansContext webBeansContext;
 
     public WebBeansUtil(WebBeansContext webBeansContext)
@@ -670,8 +674,8 @@ public final class WebBeansUtil
     {
         InstanceBean<T> instanceBean = new InstanceBean<T>(webBeansContext);
 
-        instanceBean.getTypes().add(new 
TypeLiteral<Instance<?>>(){}.getRawType());
-        instanceBean.getTypes().add(new 
TypeLiteral<Provider<?>>(){}.getRawType());
+        instanceBean.getTypes().add(INSTANCE_TYPE);
+        instanceBean.getTypes().add(PROVIDER_TYPE);
         instanceBean.addApiType(Object.class);
 
         instanceBean.addQualifier(new AnyLiteral());
@@ -690,7 +694,7 @@ public final class WebBeansUtil
     {
         EventBean<T> eventBean = new EventBean<T>(webBeansContext);
 
-        eventBean.getTypes().add(new TypeLiteral<Event<?>>(){}.getRawType());
+        eventBean.getTypes().add(EVENT_TYPE);
         eventBean.addApiType(Object.class);
 
         eventBean.addQualifier(new AnyLiteral());