Changeset 6053 for trunk

Timestamp:

11/14/11 12:08:03 (6 months ago)

Author:

mtld

Message:

CDI fix

Files:

• trunk/pustefix-cdi/src/main/java/org/pustefixframework/cdi/CDIExtension.java (modified) (4 diffs)

trunk/pustefix-cdi/src/main/java/org/pustefixframework/cdi/CDIExtension.java

@@ -28 +28 @@
 
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Annotated;
 import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.Bean;
@@ -39 +38 @@
 import javax.enterprise.inject.spi.ProcessBean;
 import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Named;
 
@@ -67 +65 @@
         List<SpringBean> beans = getUnknownBeans(manager);
         for(SpringBean bean : beans) {
-            event.addBean(bean);
+            Set<Bean<?>> found = null;
+            if(bean.getName() != null) {
+                found = manager.getBeans(bean.getName());
+            } 
+            if(found == null || found.size() == 0) {
+                Annotation[] qualifiers = bean.getQualifiers().toArray(new Annotation[bean.getQualifiers().size()]);
+                found = manager.getBeans(bean.getBeanClass(), qualifiers);
+            }
+            if(found.size() == 0) {
+                event.addBean(bean);
+            }
         }
     }
@@ -86 +94 @@
         Set<InjectionPoint> ips = pit.getInjectionTarget().getInjectionPoints();
         for(InjectionPoint ip : ips) {
+            
+            BeanFactoryAdapter beanFactoryAdapter = beanFactoryAdapters.get(beanManager);
             Class<?> clazz = (Class<?>)ip.getType();
+            Annotated annotated = ip.getAnnotated();
+            
+            String name = null;
+            Named named = annotated.getAnnotation(Named.class);
+            if(named != null) {
+                name = named.value();
+                //if(name.equals("")) {
+                //    name = clazz.getSimpleName();
+                //    name = Character.toLowerCase(name.charAt(0)) + name.substring(1);
+                //}
+            }
+            
             AnnotatedType<?> annotatedType = beanManager.createAnnotatedType(clazz);
-            //TODO: check if really no CDI bean by additional criteria
-            if(!annotatedType.isAnnotationPresent(Named.class)) {
-                Set<Type> beanTypes = annotatedType.getTypeClosure();
-                BeanFactoryAdapter beanFactoryAdapter = beanFactoryAdapters.get(beanManager);
-                HashSet<Annotation> qualifiers = new HashSet<Annotation>();
-                qualifiers.add(new AnnotationLiteral<Any>() {});
-                qualifiers.add(new AnnotationLiteral<Default>() {});
-                Set<Class<? extends Annotation>> stereotypes = new HashSet<Class<? extends Annotation>>();
-                getUnknownBeans(beanManager).add(new SpringBean(beanFactoryAdapter, clazz.getSimpleName(), clazz, beanTypes, qualifiers, stereotypes));
+            Set<Type> beanTypes = annotatedType.getTypeClosure();
+            
+            Set<Annotation> qualifiers = new HashSet<Annotation>();
+            Set<Class<? extends Annotation>> stereoTypes = new HashSet<Class<? extends Annotation>>();
+            Set<Annotation> annotations = ip.getAnnotated().getAnnotations();
+            for(Annotation annotation: annotations) {
+                if(beanManager.isQualifier(annotation.annotationType())) {
+                    qualifiers.add(annotation);
+                } else if(beanManager.isStereotype(annotation.annotationType())) {
+                    stereoTypes.add(annotation.annotationType());
+                }
             }
+            
+            SpringBean bean = new SpringBean(beanFactoryAdapter, name, clazz, beanTypes, qualifiers, stereoTypes);
+            
+            getUnknownBeans(beanManager).add(bean);
+            
         }
     }
-    
+
 }