You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ar...@apache.org on 2013/01/06 11:32:34 UTC

svn commit: r1429495 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/component/creation/ main/java/org/apache/webbeans/config/ test/java/org/apache/webbeans/test/

Author: arne
Date: Sun Jan  6 10:32:34 2013
New Revision: 1429495

URL: http://svn.apache.org/viewvc?rev=1429495&view=rev
Log:
OWB-745: moved DefinitionUtil.defineStereoTypes() to AbstractBeanCreator

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java?rev=1429495&r1=1429494&r2=1429495&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java Sun Jan  6 10:32:34 2013
@@ -410,7 +410,48 @@ public class AbstractBeanCreator<T> impl
      */
     public void defineStereoTypes()
     {
-        definitionUtil.defineStereoTypes(bean, AnnotationUtil.getAnnotationsFromSet(annotated.getAnnotations()));
+        Annotation[] anns = AnnotationUtil.getAnnotationsFromSet(annotated.getAnnotations());
+        final AnnotationManager annotationManager = getBean().getWebBeansContext().getAnnotationManager();
+        if (annotationManager.hasStereoTypeMetaAnnotation(anns))
+        {
+            Annotation[] steroAnns =
+                annotationManager.getStereotypeMetaAnnotations(anns);
+
+            for (Annotation stereo : steroAnns)
+            {
+                getBean().addStereoType(stereo);
+            }
+        }
+        
+        // Adding inherited qualifiers
+        IBeanInheritedMetaData inheritedMetaData = null;
+        
+        if(getBean() instanceof InjectionTargetBean)
+        {
+            inheritedMetaData = ((InjectionTargetBean<?>) getBean()).getInheritedMetaData();
+        }
+        
+        if (inheritedMetaData != null)
+        {
+            Set<Annotation> inheritedTypes = inheritedMetaData.getInheritedStereoTypes();        
+            for (Annotation inherited : inheritedTypes)
+            {
+                Set<Class<? extends Annotation>> qualifiers = getBean().getStereotypes();
+                boolean found = false;
+                for (Class<? extends Annotation> existQualifier : qualifiers)
+                {
+                    if (existQualifier.equals(inherited.annotationType()))
+                    {
+                        found = true;
+                        break;
+                    }
+                }
+                if (!found)
+                {
+                    getBean().addStereoType(inherited);
+                }
+            }
+        }
     }
     
     protected <X> void addMethodInjectionPointMetaData(AnnotatedMethod<X> method)

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java?rev=1429495&r1=1429494&r2=1429495&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java Sun Jan  6 10:32:34 2013
@@ -393,7 +393,7 @@ public abstract class AbstractInjecionTa
                     }                    
 
                     definitionUtil.defineSerializable(producerFieldBean);
-                    definitionUtil.defineStereoTypes(producerFieldBean, anns);
+                    producerFieldBeanCreator.defineStereoTypes();
                     webBeansContext.getWebBeansUtil().setBeanEnableFlagForProducerBean(getBean(), producerFieldBean, anns);
                     if (producerFieldBean.getReturnType().isArray())
                     {
@@ -460,7 +460,7 @@ public abstract class AbstractInjecionTa
                 }
                 
                 definitionUtil.defineSerializable(producerMethodBean);
-                definitionUtil.defineStereoTypes(producerMethodBean, AnnotationUtil.getAnnotationsFromSet(annotatedMethod.getAnnotations()));
+                producerMethodBeanCreator.defineStereoTypes();
                 webBeansContext.getWebBeansUtil().setBeanEnableFlagForProducerBean(getBean(),
                                                                                    producerMethodBean,
                                                                                    AnnotationUtil.getAnnotationsFromSet(annotatedMethod.getAnnotations()));

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java?rev=1429495&r1=1429494&r2=1429495&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java Sun Jan  6 10:32:34 2013
@@ -23,7 +23,6 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.inject.Named;
@@ -32,9 +31,6 @@ import org.apache.webbeans.annotation.An
 import org.apache.webbeans.component.AbstractInjectionTargetBean;
 import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.EnterpriseBeanMarker;
-import org.apache.webbeans.component.InjectionTargetBean;
-import org.apache.webbeans.component.OwbBean;
-import org.apache.webbeans.config.inheritance.IBeanInheritedMetaData;
 import org.apache.webbeans.decorator.WebBeansDecoratorConfig;
 import org.apache.webbeans.event.EventUtil;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
@@ -56,52 +52,6 @@ public final class DefinitionUtil
         this.webBeansContext = webBeansContext;
     }
 
-    public <T> void defineStereoTypes(OwbBean<?> component, Annotation[] anns)
-    {
-        final AnnotationManager annotationManager = component.getWebBeansContext().getAnnotationManager();
-        if (annotationManager.hasStereoTypeMetaAnnotation(anns))
-        {
-            Annotation[] steroAnns =
-                annotationManager.getStereotypeMetaAnnotations(anns);
-
-            for (Annotation stereo : steroAnns)
-            {
-                component.addStereoType(stereo);
-            }
-        }
-        
-        // Adding inherited qualifiers
-        IBeanInheritedMetaData inheritedMetaData = null;
-        
-        if(component instanceof InjectionTargetBean)
-        {
-            inheritedMetaData = ((InjectionTargetBean<?>) component).getInheritedMetaData();
-        }
-        
-        if (inheritedMetaData != null)
-        {
-            Set<Annotation> inheritedTypes = inheritedMetaData.getInheritedStereoTypes();        
-            for (Annotation inherited : inheritedTypes)
-            {
-                Set<Class<? extends Annotation>> qualifiers = component.getStereotypes();
-                boolean found = false;
-                for (Class<? extends Annotation> existQualifier : qualifiers)
-                {
-                    if (existQualifier.equals(inherited.annotationType()))
-                    {
-                        found = true;
-                        break;
-                    }
-                }
-                if (!found)
-                {
-                    component.addStereoType(inherited);
-                }
-            }
-        }
-        
-    }
-
     /**
      * Configure web beans component name.
      * 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java?rev=1429495&r1=1429494&r2=1429495&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java Sun Jan  6 10:32:34 2013
@@ -532,7 +532,7 @@ public abstract class TestContext implem
         webBeansContext.getWebBeansUtil().setInjectionTargetBeanEnableFlag(component);
 
         definitionUtil.defineSerializable(component);
-        definitionUtil.defineStereoTypes(component, clazz.getDeclaredAnnotations());
+        managedBeanCreator.defineStereoTypes();
 
         Annotation[] clazzAnns = clazz.getDeclaredAnnotations();