[jboss-cvs] JBossAS SVN: r84201 - in projects/jboss-man/branches/Branch_2_1/metatype/src: test/java/org/jboss/test/metatype/values/factory/support and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Feb 14 01:25:10 EST 2009


Author: scott.stark at jboss.org
Date: 2009-02-14 01:25:09 -0500 (Sat, 14 Feb 2009)
New Revision: 84201

Added:
   projects/jboss-man/branches/Branch_2_1/metatype/src/test/java/org/jboss/test/metatype/values/factory/support/AbstractPropertyMetaData.java
Modified:
   projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
   projects/jboss-man/branches/Branch_2_1/metatype/src/test/java/org/jboss/test/metatype/values/factory/test/CompositeValueFactoryUnitTestCase.java
Log:
JBMAN-50, only attempt to access the composite value from the bean if the property is readable.


Modified: projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java	2009-02-14 06:20:23 UTC (rev 84200)
+++ projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java	2009-02-14 06:25:09 UTC (rev 84201)
@@ -466,10 +466,12 @@
       for (String name : type.itemSet())
       {
          MetaType itemType = type.getType(name);
-         Object itemValue;
+         Object itemValue = null;
          try
          {
-            itemValue = beanInfo.getProperty(value, name);
+            PropertyInfo property = beanInfo.getProperty(name);
+            if (property.isReadable())
+               itemValue = beanInfo.getProperty(value, name);
          }
          catch (RuntimeException e)
          {

Copied: projects/jboss-man/branches/Branch_2_1/metatype/src/test/java/org/jboss/test/metatype/values/factory/support/AbstractPropertyMetaData.java (from rev 84200, projects/jboss-man/trunk/metatype/src/test/java/org/jboss/test/metatype/values/factory/support/AbstractPropertyMetaData.java)
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/src/test/java/org/jboss/test/metatype/values/factory/support/AbstractPropertyMetaData.java	                        (rev 0)
+++ projects/jboss-man/branches/Branch_2_1/metatype/src/test/java/org/jboss/test/metatype/values/factory/support/AbstractPropertyMetaData.java	2009-02-14 06:25:09 UTC (rev 84201)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * 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.metatype.values.factory.support;
+
+/**
+ * Bean for testing JBMAN-50
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class AbstractPropertyMetaData
+{
+   private static final long serialVersionUID = 3L;
+
+   /** The property name */
+   protected String name;
+
+   /** The preinstantiate */
+   protected boolean preInstantiate = true;
+
+   /** The property type */
+   protected String type;
+   
+   /** The property replace */
+   private Boolean replace;
+   
+   /** Whether to trim */
+   private Boolean trim;
+   
+   /**
+    * Create a new property meta data
+    */
+   public AbstractPropertyMetaData()
+   {
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   public String getType()
+   {
+      return type;
+   }
+
+   public boolean isPreInstantiate()
+   {
+      return preInstantiate;
+   }
+
+   public void setPreInstantiate(boolean preInstantiate)
+   {
+      this.preInstantiate = preInstantiate;
+   }
+
+   public String getPropertyType()
+   {
+      return type;
+   }
+   
+   public void setPropertyType(String type)
+   {
+      this.type = type;
+   }
+
+   public void setPropertyReplace(boolean replace)
+   {
+      this.replace = replace;
+   }
+
+   public void setPropertyTrim(boolean trim)
+   {
+      this.trim = trim;
+   }
+
+}

Modified: projects/jboss-man/branches/Branch_2_1/metatype/src/test/java/org/jboss/test/metatype/values/factory/test/CompositeValueFactoryUnitTestCase.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/src/test/java/org/jboss/test/metatype/values/factory/test/CompositeValueFactoryUnitTestCase.java	2009-02-14 06:20:23 UTC (rev 84200)
+++ projects/jboss-man/branches/Branch_2_1/metatype/src/test/java/org/jboss/test/metatype/values/factory/test/CompositeValueFactoryUnitTestCase.java	2009-02-14 06:25:09 UTC (rev 84201)
@@ -39,6 +39,7 @@
 import org.jboss.metatype.api.values.SimpleValueSupport;
 import org.jboss.metatype.plugins.types.MutableCompositeMetaType;
 import org.jboss.test.metatype.types.support.MetaMappingUsage;
+import org.jboss.test.metatype.values.factory.support.AbstractPropertyMetaData;
 import org.jboss.test.metatype.values.factory.support.TestIgnoredCompositeItem;
 import org.jboss.test.metatype.values.factory.support.TestRecursiveComposite;
 import org.jboss.test.metatype.values.factory.support.TestRenamedCompositeItem;
@@ -230,4 +231,22 @@
       getLog().debug("Composite Value: " + actual);
       assertEquals(expected, actual);
    }
+
+   /**
+    * JBMAN-50 DefaultMetaValueFactory.createCompositeValue Property is not
+    * readable test.
+    */
+   public void testMutableCompositeMetaValue()
+      throws Exception
+   {
+      AbstractPropertyMetaData apmd = new AbstractPropertyMetaData();
+      MetaValue mv = createMetaValue(apmd);
+      assertNotNull(mv);
+      assertTrue(mv instanceof CompositeValue);
+      CompositeValue cmv = CompositeValue.class.cast(mv);
+      assertTrue("CV contains name", cmv.containsKey("name"));
+      assertTrue("CV contains propertyTrim", cmv.containsKey("propertyTrim"));
+      assertTrue("CV contains propertyReplace", cmv.containsKey("propertyReplace"));
+      assertTrue("CV contains type", cmv.containsKey("type"));
+   }
 }




More information about the jboss-cvs-commits mailing list