[jboss-cvs] JBossAS SVN: r71851 - in projects/microcontainer/trunk/kernel/src: resources/tests/org/jboss/test/kernel/deployment/test and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Apr 9 12:12:48 EDT 2008


Author: alesj
Date: 2008-04-09 12:12:48 -0400 (Wed, 09 Apr 2008)
New Revision: 71851

Added:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/NestedBeanHandler.java
   projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansXMLTestCase.xml
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/SimpleObjectWithBeans.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansXMLTestCase.java
Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java
Log:
[JBMICROCONT-28], [JBMICROCONT-281]; anonymous inner beans.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java	2008-04-09 15:32:57 UTC (rev 71850)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java	2008-04-09 16:12:48 UTC (rev 71851)
@@ -23,9 +23,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -36,6 +34,8 @@
 
 import org.jboss.beans.info.spi.BeanAccessMode;
 import org.jboss.beans.metadata.api.model.AutowireType;
+import static org.jboss.beans.metadata.plugins.CloneUtil.cloneCollection;
+import static org.jboss.beans.metadata.plugins.CloneUtil.cloneObject;
 import org.jboss.beans.metadata.spi.AliasMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
@@ -50,7 +50,6 @@
 import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
 import org.jboss.beans.metadata.spi.PropertyMetaData;
 import org.jboss.beans.metadata.spi.SupplyMetaData;
-import static org.jboss.beans.metadata.plugins.CloneUtil.*;
 import org.jboss.dependency.plugins.AbstractDependencyItem;
 import org.jboss.dependency.spi.Controller;
 import org.jboss.dependency.spi.ControllerContext;
@@ -190,67 +189,22 @@
 
    public List<BeanMetaData> getBeans()
    {
-      List<BeanMetaData> nestedBeans = findNestedBeans();
-      if (nestedBeans.isEmpty())
-      {
-         return Collections.singletonList(prepareThis());
-      }
-      else
-      {
-         nestedBeans.add(prepareThis());
-         return nestedBeans;
-      }
+      NestedBeanHandler handler = createNestedBeanHandler();
+      return handler.checkForNestedBeans();
    }
 
    /**
-    * Prepare / check if this needs a name, etc.
+    * Create nested bean handler.
+    * Can be overridden to change generateName policy.
     *
-    * @return this instance or a clone
+    * @return nested bean handler
     */
-   protected BeanMetaData prepareThis()
+   protected NestedBeanHandler createNestedBeanHandler()
    {
-      return this;
+      return new NestedBeanHandler(this);
    }
 
    /**
-    * Fins the nested beans.
-    *
-    * @return list of nested beans
-    */
-   protected List<BeanMetaData> findNestedBeans()
-   {
-      List<BeanMetaData> allBeans = new ArrayList<BeanMetaData>();
-      addBeans(this, allBeans);
-      return allBeans;
-   }
-
-   /**
-    * Add all nested beans to the list.
-    *
-    * @param current the current meta data visitor node child
-    * @param list the nested beans list
-    */
-   protected void addBeans(MetaDataVisitorNode current, List<BeanMetaData> list)
-   {
-      for(Iterator<? extends MetaDataVisitorNode> children = current.getChildren(); children != null && children.hasNext();)
-      {
-         MetaDataVisitorNode next = children.next();
-         if (next instanceof BeanMetaDataFactory)
-         {
-            list.addAll(((BeanMetaDataFactory) next).getBeans());
-         }
-         else
-         {
-            addBeans(next, list);
-            if (next instanceof BeanMetaData)
-            {
-               list.add((BeanMetaData) next);
-            }
-         }
-      }
-   }
-
-   /**
     * Get the bean class name.
     * @return the fully qualified bean class name.
     */

Added: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/NestedBeanHandler.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/NestedBeanHandler.java	                        (rev 0)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/NestedBeanHandler.java	2008-04-09 16:12:48 UTC (rev 71851)
@@ -0,0 +1,260 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.beans.metadata.plugins;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
+import org.jboss.beans.metadata.spi.PropertyMetaData;
+import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.logging.Logger;
+
+/**
+ * Handle nested beans util class.
+ * Hidding the impl details from AbstractBeanMetaData
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class NestedBeanHandler
+{
+   private static Logger log = Logger.getLogger(NestedBeanHandler.class);
+
+   private BeanMetaData root;
+   private int counter = 1;
+
+   public NestedBeanHandler(BeanMetaData root)
+   {
+      this.root = root;
+   }
+
+   /**
+    * Check for nested beans.
+    *
+    * @return list of bean meta data
+    */
+   public List<BeanMetaData> checkForNestedBeans()
+   {
+      List<BeanMetaData> nestedBeans = findNestedBeans();
+      if (nestedBeans.isEmpty())
+      {
+         return Collections.singletonList(prepareRoot(root));
+      }
+      else
+      {
+         BeanMetaData clone = (BeanMetaData)root.clone();
+         List<Pair> pairs = new ArrayList<Pair>();
+         addPairs(clone, pairs);
+         List<BeanMetaData> result = new ArrayList<BeanMetaData>();
+         for (Pair pair : pairs)
+         {
+            MetaDataVisitorNode previous = pair.getPrevious();
+            BeanMetaData bean = pair.getBean();
+            if (bean.getName() == null)
+               bean.setName(generateName(previous));
+            replaceWithInjection(previous, bean);
+            result.add(bean);
+         }
+         result.add(prepareRoot(clone));
+         return result;
+      }
+   }
+
+   /**
+    * Prepare root.
+    * 
+    * Could be overriden to prehaps
+    * allow null name on the root as well.
+    *
+    * @param bean the root bean or its clone
+    * @return root
+    */
+   protected BeanMetaData prepareRoot(BeanMetaData bean)
+   {
+      return bean;
+   }
+
+   /**
+    * Fins the nested beans.
+    *
+    * @return list of nested beans
+    */
+   private List<BeanMetaData> findNestedBeans()
+   {
+      List<BeanMetaData> allBeans = new ArrayList<BeanMetaData>();
+      addBeans(root, allBeans);
+      return allBeans;
+   }
+
+   /**
+    * Add all nested beans to the list.
+    *
+    * @param current the current meta data visitor node child
+    * @param list    the nested beans list
+    */
+   private void addBeans(MetaDataVisitorNode current, List<BeanMetaData> list)
+   {
+      for (Iterator<? extends MetaDataVisitorNode> children = current.getChildren(); children != null && children.hasNext();)
+      {
+         MetaDataVisitorNode next = children.next();
+         addBeans(next, list);
+         if (next instanceof BeanMetaData)
+         {
+            list.add((BeanMetaData)next);
+         }
+      }
+   }
+
+   /**
+    * Add all nested beans to the list.
+    *
+    * @param current the current meta data visitor node child
+    * @param list    the nested beans pair list
+    */
+   private void addPairs(MetaDataVisitorNode current, List<Pair> list)
+   {
+      for (Iterator<? extends MetaDataVisitorNode> children = current.getChildren(); children != null && children.hasNext();)
+      {
+         MetaDataVisitorNode next = children.next();
+         addPairs(next, list);
+         if (next instanceof BeanMetaData)
+         {
+            BeanMetaData bean = (BeanMetaData)next;
+            list.add(new Pair(current, bean));
+         }
+      }
+   }
+
+   /**
+    * Generate the name.
+    *
+    * @param previous the previous / parent node
+    * @return generated name
+    */
+   protected String generateName(MetaDataVisitorNode previous)
+   {
+      String name;
+      if (previous instanceof PropertyMetaData)
+      {
+         PropertyMetaData pmd = (PropertyMetaData)previous;
+         name = root.getName() + "$" + pmd.getName();
+      }
+      else
+      {
+         name = root.getName() + "#" + counter;
+         counter++;
+      }
+      return name;
+   }
+
+   /**
+    * Replace bean with injection.
+    *
+    * @param previous the previous / parent node
+    * @param bean     the bean to replace
+    */
+   private static void replaceWithInjection(MetaDataVisitorNode previous, BeanMetaData bean)
+   {
+      ValueMetaData injection = new AbstractDependencyValueMetaData(bean.getName());
+
+      if (previous instanceof ValueMetaDataAware)
+      {
+         ValueMetaDataAware vmda = (ValueMetaDataAware)previous;
+         vmda.setValue(injection);
+      }
+      else if (previous instanceof AbstractClassLoaderMetaData)
+      {
+         AbstractClassLoaderMetaData aclmd = (AbstractClassLoaderMetaData)previous;
+         aclmd.setClassLoader(injection);
+      }
+      else if (previous instanceof AbstractListMetaData)
+      {
+         AbstractListMetaData almd = (AbstractListMetaData)previous;
+         int index = almd.indexOf(bean);
+         almd.remove(index);
+         almd.add(index, injection);
+      }
+      else if (previous instanceof AbstractCollectionMetaData)
+      {
+         AbstractCollectionMetaData acmd = (AbstractCollectionMetaData)previous;
+         acmd.remove(bean);
+         acmd.add(injection);
+      }
+      else if (previous instanceof AbstractMapMetaData)
+      {
+         AbstractMapMetaData ammd = (AbstractMapMetaData)previous;
+         for (Map.Entry<MetaDataVisitorNode, MetaDataVisitorNode> entry : ammd.entrySet())
+         {
+            MetaDataVisitorNode key = entry.getKey();
+            MetaDataVisitorNode value = entry.getValue();
+
+            if (key.equals(bean))
+            {
+               ammd.remove(key);
+               ammd.put(injection, value);
+            }
+            if (value.equals(bean))
+            {
+               ammd.put(key, injection);
+            }
+         }
+      }
+      else if (previous instanceof AbstractValueMetaData)
+      {
+         AbstractValueMetaData avmd = (AbstractValueMetaData)previous;
+         avmd.setValue(injection);
+      }
+      else
+      {
+         log.warn("Unknown previous type to do injection replacement: " + previous);
+      }
+   }
+
+   /**
+    * Simple pair class.
+    */
+   private class Pair
+   {
+      private MetaDataVisitorNode previous;
+      private BeanMetaData bean;
+
+      private Pair(MetaDataVisitorNode previous, BeanMetaData bean)
+      {
+         this.previous = previous;
+         this.bean = bean;
+      }
+
+      public MetaDataVisitorNode getPrevious()
+      {
+         return previous;
+      }
+
+      public BeanMetaData getBean()
+      {
+         return bean;
+      }
+   }
+}

Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansXMLTestCase.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansXMLTestCase.xml	                        (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansXMLTestCase.xml	2008-04-09 16:12:48 UTC (rev 71851)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <bean name="const_value" class="org.jboss.test.kernel.deployment.support.SimpleObjectWithBeans">
+      <constructor>
+         <bean class="org.jboss.test.kernel.deployment.support.SimpleObjectWithBeans" />
+      </constructor>
+   </bean>
+
+   <bean name="const_param" class="org.jboss.test.kernel.deployment.support.SimpleObjectWithBeans">
+      <constructor>
+         <parameter>
+            <bean class="org.jboss.test.kernel.deployment.support.SimpleBeanImpl" />
+         </parameter>
+      </constructor>
+   </bean>
+
+   <bean name="prop" class="org.jboss.test.kernel.deployment.support.SimpleObjectWithBeans">
+      <property name="simpleBean">
+         <bean class="org.jboss.test.kernel.deployment.support.SimpleBeanImpl"/>
+      </property>
+   </bean>
+
+   <bean name="cl" class="org.jboss.test.kernel.deployment.support.SimpleObjectWithBeans">
+      <classloader><bean class="org.jboss.test.kernel.deployment.support.NullClassLoader"/></classloader>
+   </bean>
+
+   <bean name="list" class="org.jboss.test.kernel.deployment.support.SimpleObjectWithBeans">
+      <property name="list">
+         <list>
+            <bean class="org.jboss.test.kernel.deployment.support.SimpleBeanImpl"/>
+         </list>
+      </property>
+   </bean>
+
+   <bean name="set" class="org.jboss.test.kernel.deployment.support.SimpleObjectWithBeans">
+      <property name="set">
+         <set>
+            <bean class="org.jboss.test.kernel.deployment.support.SimpleBeanImpl"/>
+         </set>
+      </property>
+   </bean>
+
+   <bean name="map" class="org.jboss.test.kernel.deployment.support.SimpleObjectWithBeans">
+      <property name="map">
+         <map>
+           <entry>
+             <key><bean class="org.jboss.test.kernel.deployment.support.SimpleBeanImpl"/></key>
+             <value><bean class="org.jboss.test.kernel.deployment.support.SimpleBeanImpl"/></value>
+           </entry>
+         </map>
+      </property>
+   </bean>
+
+  <bean name="nested" class="org.jboss.test.kernel.deployment.support.SimpleObjectWithBeans">
+     <property name="nested">
+       <bean class="org.jboss.test.kernel.deployment.support.SimpleObjectWithBeans">
+          <constructor>
+             <parameter>
+                <bean class="org.jboss.test.kernel.deployment.support.SimpleBeanImpl" />
+             </parameter>
+          </constructor>
+       </bean>
+     </property>
+  </bean>
+
+</deployment>

Copied: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/SimpleObjectWithBeans.java (from rev 71757, projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/SimpleObjectWithBean.java)
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/SimpleObjectWithBeans.java	                        (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/SimpleObjectWithBeans.java	2008-04-09 16:12:48 UTC (rev 71851)
@@ -0,0 +1,106 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.kernel.deployment.support;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A simple object with all possible bean as meta data
+ *
+ * @author <a href="ales.justin at gmail.com">Ales Justin</a>
+ */
+public class SimpleObjectWithBeans implements Serializable
+{
+   // Constants -----------------------------------------------------
+
+   private static final long serialVersionUID = 3258126972906387766L;
+
+   // Attributes ----------------------------------------------------
+
+   private SimpleBean simpleBean;
+   private SimpleObjectWithBeans nested;
+   private List<SimpleBean> list;
+   private Set<SimpleBean> set;
+   private Map<SimpleBean, SimpleBean> map;
+
+   public SimpleObjectWithBeans()
+   {
+   }
+
+   public SimpleObjectWithBeans(SimpleBean simpleBean)
+   {
+      this.simpleBean = simpleBean;
+   }
+
+   public SimpleBean getSimpleBean()
+   {
+      return simpleBean;
+   }
+
+   public void setSimpleBean(SimpleBean simpleBean)
+   {
+      this.simpleBean = simpleBean;
+   }
+
+   public SimpleObjectWithBeans getNested()
+   {
+      return nested;
+   }
+
+   public void setNested(SimpleObjectWithBeans nested)
+   {
+      this.nested = nested;
+   }
+
+   public List<SimpleBean> getList()
+   {
+      return list;
+   }
+
+   public void setList(List<SimpleBean> list)
+   {
+      this.list = list;
+   }
+
+   public Set<SimpleBean> getSet()
+   {
+      return set;
+   }
+
+   public void setSet(Set<SimpleBean> set)
+   {
+      this.set = set;
+   }
+
+   public Map<SimpleBean, SimpleBean> getMap()
+   {
+      return map;
+   }
+
+   public void setMap(Map<SimpleBean, SimpleBean> map)
+   {
+      this.map = map;
+   }
+}
\ No newline at end of file

Copied: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansTestCase.java (from rev 71757, projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanMetaDataTestCase.java)
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansTestCase.java	2008-04-09 16:12:48 UTC (rev 71851)
@@ -0,0 +1,146 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.kernel.deployment.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Test;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractListMetaData;
+import org.jboss.beans.metadata.plugins.AbstractMapMetaData;
+import org.jboss.beans.metadata.plugins.AbstractSetMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
+import org.jboss.test.kernel.deployment.support.SimpleBean;
+import org.jboss.test.kernel.deployment.support.SimpleBeanImpl;
+import org.jboss.test.kernel.deployment.support.SimpleObjectWithBeans;
+
+/**
+ * Test anonymous beans.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AnonymousBeansTestCase extends AbstractDeploymentTest
+{
+   public AnonymousBeansTestCase(String name) throws Throwable
+   {
+      super(name);
+   }
+
+   public static Test suite()
+   {
+      return suite(AnonymousBeansTestCase.class);
+   }
+
+   // ---- tests
+
+   protected void doSetupBeans() throws Throwable
+   {
+      AbstractKernelDeployment deployment = new AbstractKernelDeployment();
+      deployment.setName("somename");
+      List<BeanMetaDataFactory> beans = new ArrayList<BeanMetaDataFactory>();
+      deployment.setBeanFactories(beans);
+
+      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("const_value", SimpleObjectWithBeans.class.getName());
+      builder.setConstructorValue(new AbstractBeanMetaData(null, SimpleObjectWithBeans.class.getName()));
+      beans.add((BeanMetaDataFactory)builder.getBeanMetaData());
+
+      builder = BeanMetaDataBuilder.createBuilder("const_param", SimpleObjectWithBeans.class.getName());
+      builder.addConstructorParameter(SimpleBean.class.getName(), new AbstractBeanMetaData(null, SimpleBeanImpl.class.getName()));
+      beans.add((BeanMetaDataFactory)builder.getBeanMetaData());
+
+      builder = BeanMetaDataBuilder.createBuilder("prop", SimpleObjectWithBeans.class.getName());
+      builder.addPropertyMetaData("simpleBean", new AbstractBeanMetaData(null, SimpleBeanImpl.class.getName()));
+      beans.add((BeanMetaDataFactory)builder.getBeanMetaData());
+
+      builder = BeanMetaDataBuilder.createBuilder("list", SimpleObjectWithBeans.class.getName());
+      AbstractListMetaData list = new AbstractListMetaData();
+      list.add(new AbstractBeanMetaData(null, SimpleBeanImpl.class.getName()));
+      builder.addPropertyMetaData("list", list);
+      beans.add((BeanMetaDataFactory)builder.getBeanMetaData());
+
+      builder = BeanMetaDataBuilder.createBuilder("set", SimpleObjectWithBeans.class.getName());
+      AbstractSetMetaData set = new AbstractSetMetaData();
+      set.add(new AbstractBeanMetaData(null, SimpleBeanImpl.class.getName()));
+      builder.addPropertyMetaData("set", set);
+      beans.add((BeanMetaDataFactory)builder.getBeanMetaData());
+
+      builder = BeanMetaDataBuilder.createBuilder("map", SimpleObjectWithBeans.class.getName());
+      AbstractMapMetaData map = new AbstractMapMetaData();
+      map.put(new AbstractBeanMetaData(null, SimpleBeanImpl.class.getName()), new AbstractBeanMetaData(null, SimpleBeanImpl.class.getName()));
+      builder.addPropertyMetaData("map", map);
+      beans.add((BeanMetaDataFactory)builder.getBeanMetaData());
+
+      builder = BeanMetaDataBuilder.createBuilder("nested", SimpleObjectWithBeans.class.getName());
+      BeanMetaDataBuilder nested = BeanMetaDataBuilder.createBuilder(null, SimpleObjectWithBeans.class.getName());
+      nested.addConstructorParameter(SimpleBean.class.getName(), new AbstractBeanMetaData(null, SimpleBeanImpl.class.getName()));
+      builder.addPropertyMetaData("nested", nested.getBeanMetaData());
+      beans.add((BeanMetaDataFactory)builder.getBeanMetaData());
+
+      deploy(deployment);
+   }
+
+   public void testAnonymous() throws Throwable
+   {
+      doSetupBeans();
+
+      SimpleObjectWithBeans const_value = assertBean("const_value", SimpleObjectWithBeans.class);
+      SimpleObjectWithBeans const_value_1 = assertBean("const_value#1", SimpleObjectWithBeans.class);
+      assertSame(const_value, const_value_1);
+
+      SimpleObjectWithBeans const_param = assertBean("const_param", SimpleObjectWithBeans.class);
+      SimpleBean const_param_1 = assertBean("const_param#1", SimpleBean.class);
+      assertSame(const_param.getSimpleBean(), const_param_1);
+
+      SimpleObjectWithBeans prop = assertBean("prop", SimpleObjectWithBeans.class);
+      SimpleBean prop_bean = assertBean("prop$simpleBean", SimpleBean.class);
+      assertSame(prop.getSimpleBean(), prop_bean);
+
+      SimpleObjectWithBeans list = assertBean("list", SimpleObjectWithBeans.class);
+      SimpleBean list_bean = assertBean("list#1", SimpleBean.class);
+      assertNotNull(list.getList());
+      assertFalse(list.getList().isEmpty());
+      assertSame(list.getList().get(0), list_bean);
+
+      SimpleObjectWithBeans set = assertBean("set", SimpleObjectWithBeans.class);
+      SimpleBean set_bean = assertBean("set#1", SimpleBean.class);
+      assertNotNull(set.getSet());
+      assertFalse(set.getSet().isEmpty());
+      assertSame(set.getSet().iterator().next(), set_bean);
+
+      SimpleObjectWithBeans map = assertBean("map", SimpleObjectWithBeans.class);
+      SimpleBean map_bean_1 = assertBean("map#1", SimpleBean.class);
+      SimpleBean map_bean_2 = assertBean("map#2", SimpleBean.class);
+      assertNotNull(map.getMap());
+      assertFalse(map.getMap().isEmpty());
+      assertSame(map.getMap().keySet().iterator().next(), map_bean_1);
+      assertSame(map.getMap().values().iterator().next(), map_bean_2);
+
+      SimpleObjectWithBeans nested = assertBean("nested", SimpleObjectWithBeans.class);
+      SimpleObjectWithBeans nested_nested = assertBean("nested$nested", SimpleObjectWithBeans.class);
+      SimpleBean nested_1 = assertBean("nested#1", SimpleBean.class);
+      assertSame(nested.getNested(), nested_nested);
+      assertSame(nested_nested.getSimpleBean(), nested_1);
+   }
+}
\ No newline at end of file

Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansXMLTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansXMLTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AnonymousBeansXMLTestCase.java	2008-04-09 16:12:48 UTC (rev 71851)
@@ -0,0 +1,47 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.kernel.deployment.test;
+
+import junit.framework.Test;
+
+/**
+ * Test anonymous beans.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AnonymousBeansXMLTestCase extends AnonymousBeansTestCase
+{
+   public AnonymousBeansXMLTestCase(String name) throws Throwable
+   {
+      super(name);
+   }
+
+   public static Test suite()
+   {
+      return suite(AnonymousBeansXMLTestCase.class);
+   }
+
+   protected void doSetupBeans()
+   {
+      // do nothing
+   }
+}
\ No newline at end of file

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java	2008-04-09 15:32:57 UTC (rev 71850)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java	2008-04-09 16:12:48 UTC (rev 71851)
@@ -63,6 +63,8 @@
       suite.addTest(ScopingShutdownTestCase.suite());
       suite.addTest(FromContextUnsupportedTestCase.suite());
       suite.addTest(InCallbackInstantiatedTestCase.suite());
+      suite.addTest(AnonymousBeansTestCase.suite());
+      suite.addTest(AnonymousBeansXMLTestCase.suite());
 
       return suite;
    }




More information about the jboss-cvs-commits mailing list