implement <Array> for constructor parameters

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2665 1c488680-804c-0410-94cd-c6b725194a0e
weld · May 7, 2009 · e4484d8 · e4484d8
1 parent 0f5e959
commit e4484d8
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 32 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java b/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Array;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -36,7 +37,12 @@
 import org.dom4j.Namespace;
 import org.dom4j.QName;
 import org.dom4j.io.SAXReader;
+import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
 import org.jboss.webbeans.introspector.AnnotatedClass;
+import org.jboss.webbeans.introspector.AnnotatedItem;
+import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
+import org.jboss.webbeans.resources.ClassTransformer;
+import org.jboss.webbeans.resources.spi.ResourceLoader;
 import org.jboss.webbeans.resources.spi.ResourceLoadingException;
 import org.xml.sax.SAXException;
 
@@ -309,4 +315,38 @@ public static void checkForUniqueElements(List<Class<? extends Annotation>> list
          throw new DefinitionException("A certain annotation type is declared more than once as a binding type, " + 
                "interceptor binding type or stereotype using XML");
    }
+
+   public static AnnotatedClass<?> obtainArray(Element arrayElement, XmlEnvironment environment, Map<String, Set<String>> packagesMap)
+   {  
+      AnnotatedClass<?> arrayType = obtainArrayType(arrayElement, environment, packagesMap);
+      Object array = Array.newInstance(arrayType.getRawType(), 0);      
+      AnnotatedClass<?> result = AnnotatedClassImpl.of(array.getClass(), new ClassTransformer());      
+      return result;
+   }
+
+   public static AnnotatedClass<?> obtainArrayType(Element arrayElement, XmlEnvironment environment, Map<String, Set<String>> packagesMap)
+   {
+      AnnotatedClass<?> arrayType = null;
+
+      boolean haveNotAnnotation = false;
+      Iterator<?> arrayIterator = arrayElement.elementIterator();
+      while (arrayIterator.hasNext())
+      {
+         Element arrayChild = (Element) arrayIterator.next();
+         AnnotatedClass<?> arrayChildType = ParseXmlHelper.loadElementClass(arrayChild, Object.class, environment, packagesMap);
+         boolean isAnnotation = arrayChildType.getRawType().isAnnotation();
+         if (!isAnnotation)
+         {
+            if (haveNotAnnotation)
+               throw new DefinitionException("<Array> element have second child which is not annotation, it is '" + 
+                     arrayChild.getName() + "'");
+            haveNotAnnotation = true;
+            arrayType = arrayChildType;
+         }
+      }
+      if (!haveNotAnnotation)
+         throw new DefinitionException("<Array> element must have one child elemen which is not annotation");
+
+      return arrayType;
+   }
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java b/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
@@ -98,25 +98,7 @@ private void checkChildrenForArray(Element element)
          Element child = (Element) childIterator.next();
 
          if (XmlConstants.ARRAY.equalsIgnoreCase(child.getName()))
-         {
-            boolean haveNotAnnotation = false;
-            Iterator<?> arrayIterator = child.elementIterator();
-            while (arrayIterator.hasNext())
-            {
-               Element arrayChild = (Element) arrayIterator.next();
-               AnnotatedClass<?> arrayChildType = ParseXmlHelper.loadElementClass(arrayChild, Object.class, environment, packagesMap);
-               boolean isAnnotation = arrayChildType.getRawType().isAnnotation();
-               if (!isAnnotation)
-               {
-                  if (haveNotAnnotation)
-                     throw new DefinitionException("<Array> element have second child which is not annotation, it is '" + 
-                           arrayChild.getName() + "'");
-                  haveNotAnnotation = true;
-               }
-            }
-            if (!haveNotAnnotation)
-               throw new DefinitionException("<Array> element must have one child elemen which is not annotation");
-         }
+            ParseXmlHelper.obtainArrayType(child, environment, packagesMap);
          else
             checkChildrenForArray(child);
       }

diff --git a/...ain/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java b/...ain/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java
@@ -109,7 +109,12 @@ public void checkChildren(Element beanElement, AnnotatedClass<?> beanClass)
    private void checkBeanChild(Element beanChildElement, AnnotatedClass<?> beanClass)
    {
       if (XmlConstants.ARRAY.equalsIgnoreCase(beanChildElement.getName()))
+      {
+         // bean child element declaring an array parameter of the bean constructor
+         AnnotatedClass<?> array = ParseXmlHelper.obtainArray(beanChildElement, environment, packagesMap);
+         constructorParameters.add(array);
          return;
+      }         
 
       List<AnnotatedClass<?>> beanChildClassList = ParseXmlHelper.tryLoadElementClass(beanChildElement, Object.class, environment, packagesMap);
 
@@ -120,7 +125,7 @@ private void checkBeanChild(Element beanChildElement, AnnotatedClass<?> beanClas
          Namespace beanChildNamespace = beanChildElement.getNamespace();
          if (beanChildNamespace.equals(beanNamespace))
          {
-            // bean child element declaring a method or field of the bean.
+            // bean child element declaring a method or field of the bean
             checkFieldOrMethodChild(beanChildElement, beanClass);
             return;
          }

diff --git a/.../main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/SimpleBeanChildrenChecker.java b/.../main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/SimpleBeanChildrenChecker.java
@@ -82,18 +82,18 @@ protected void checkForConstructor(Element beanElement, AnnotatedClass<?> beanCl
          if (parameters.size() != constructorParameters.size())
             continue;
 
-         boolean isMacthable = true;
+         boolean isMatchable = true;
 
          for (int i = 0; i < parameters.size(); i++)
          {
             if (!parameters.get(i).isAssignableFrom(constructorParameters.get(i)))
             {
-               isMacthable = false;
+               isMatchable = false;
                break;
             }
          }
 
-         if (isMacthable)
+         if (isMatchable)
             matchableConstructors.add(constructor);
       }
 

diff --git a/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java b/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java
@@ -14,9 +14,10 @@ public Order()
       this.val = 0;
    }
 
-   public Order(int val)
+   public Order(int val, String[] strArr)
    {
       this.val = val;
+      this.strArr = strArr;
    }
 
    public int getVal()

diff --git a/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/beans.xml b/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/beans.xml
@@ -3,11 +3,11 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="urn:java:org.jboss.webbeans.test.unit.xml.parser.schema.valid http://mydomain.com/myapp/schema-1.2.xsd">	
 	<myapp:Order>
-		<Array>
-			<String />
-		</Array>
 		<myapp:getVal />
 		<myapp:val />
 		<Integer />
+		<Array>
+			<String />
+		</Array>
 	</myapp:Order>
 </Beans>
diff --git a/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml b/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml
@@ -29,12 +29,12 @@
 		<myapp:TestInterceptorBindingType />
 		<myapp:TestStereotype />
 		<myapp:TestDeploymentType />
-		<Array>
-			<String />
-		</Array>
 		<myapp:getVal />
 		<myapp:val />
 		<Integer />
+		<Array>
+			<String />
+		</Array>
 	</myapp:Order>
 <!--	
 	<myapp:PaymentService>
@@ -48,13 +48,13 @@
 		</Resource>
 	</myapp:PaymentService>
 -->
-
+<!--
 	<Topic>
 		<Resource>
 			<name>java:app/service/PaymentService</name>
 		</Resource>
 	</Topic>
-
+-->		
 	<Decorators>
 		<myapp:TestDecorator />	
 	</Decorators>