[jboss-cvs] JBossAS SVN: r87521 - in projects/jboss-man/branches/Branch_2_1: metatype/src/main/java/org/jboss/metatype/api/values and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Apr 18 12:02:04 EDT 2009 

Author: ispringer
Date: 2009-04-18 12:02:04 -0400 (Sat, 18 Apr 2009)
New Revision: 87521

Modified:
   projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java
   projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/CompositeValue.java
   projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/CompositeValueSupport.java
   projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/MapCompositeValueSupport.java
Log:
add class Javadoc to CompositeValue, MapCompositeValueSupport, and CompositeValueSupport; make MapCompositeValueSupport.getMetaType() return MapCompositeMetaType, rather than CompositeMetaType; fix PlatformMBeanUnitTestCase.testThreadMXBean() so it passes on Java 6, as well as Java 5


Modified: projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java	2009-04-18 11:15:03 UTC (rev 87520)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java	2009-04-18 16:02:04 UTC (rev 87521)
@@ -22,16 +22,11 @@
 package org.jboss.test.managed.factory.test;
 
 import java.lang.annotation.Annotation;
-import java.lang.management.ClassLoadingMXBean;
 import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
-import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.MemoryUsage;
-import java.lang.management.OperatingSystemMXBean;
 import java.lang.management.RuntimeMXBean;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -51,8 +46,6 @@
 import org.jboss.managed.api.ManagedOperation;
 import org.jboss.managed.api.ManagedProperty;
 import org.jboss.managed.api.annotation.ManagementComponent;
-import org.jboss.managed.api.annotation.ManagementOperation;
-import org.jboss.managed.api.annotation.ManagementProperty;
 import org.jboss.managed.api.factory.ManagedObjectFactory;
 import org.jboss.managed.plugins.ManagedOperationMatcher;
 import org.jboss.managed.plugins.jmx.CompositeDataMetaValueBuilder;
@@ -64,9 +57,6 @@
 import org.jboss.metatype.api.values.SimpleValue;
 import org.jboss.metatype.api.values.SimpleValueSupport;
 import org.jboss.test.managed.factory.AbstractManagedObjectFactoryTest;
-import org.jboss.test.managed.factory.support.ManagementObjectChangedName;
-import org.jboss.test.managed.factory.support.amof.CustomName;
-import org.jboss.test.managed.factory.support.amof.ManagementObjectWithRuntimeRef;
 
 /**
  * Tests of creating ManagedObjects for the jvm platform mbeans
@@ -209,7 +199,7 @@
       ManagedOperation gc = ops.iterator().next();
       assertEquals("gc", gc.getName());
       assertEquals("Runs the garbage collector", gc.getDescription());
-      gc.invoke(null);
+      gc.invoke();
    }
 
    public void testThreadMXBean()
@@ -321,7 +311,11 @@
       ObjectName tname = new ObjectName(ManagementFactory.THREAD_MXBEAN_NAME);
       MBeanInfo tinfo = server.getMBeanInfo(tname);
       MBeanOperationInfo[] tops = tinfo.getOperations();
-      assertEquals(8, tops.length);
+      String javaSpecVersion = System.getProperty("java.specification.version");
+      if (javaSpecVersion.equals("1.5") || javaSpecVersion.equals("5.0"))
+         assertEquals(8, tops.length);
+      else if (javaSpecVersion.equals("1.6") || javaSpecVersion.equals("6.0"))
+         assertEquals(11, tops.length);
       for(MBeanOperationInfo op : tops)
       {
          MBeanParameterInfo[] params = op.getSignature();

Modified: projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/CompositeValue.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/CompositeValue.java	2009-04-18 11:15:03 UTC (rev 87520)
+++ projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/CompositeValue.java	2009-04-18 16:02:04 UTC (rev 87521)
@@ -26,7 +26,11 @@
 import org.jboss.metatype.api.types.CompositeMetaType;
 
 /**
- * CompositeValue.
+ * A {@link MetaValue} representing a <code>Map&lt;String,MetaValue&gt;</code>, where the set of allowed keys and
+ * their corresponding values' MetaTypes are specified by the associated {@link CompositeMetaType}.
+ *
+ * @see MapCompositeValueSupport
+ * @see CompositeValueSupport
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $

Modified: projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/CompositeValueSupport.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/CompositeValueSupport.java	2009-04-18 11:15:03 UTC (rev 87520)
+++ projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/CompositeValueSupport.java	2009-04-18 16:02:04 UTC (rev 87521)
@@ -37,9 +37,16 @@
 
 import org.jboss.metatype.api.types.CompositeMetaType;
 import org.jboss.metatype.api.types.MetaType;
+import org.jboss.metatype.api.types.ImmutableCompositeMetaType;
+import org.jboss.metatype.plugins.types.MutableCompositeMetaType;
 
 /**
- * CompositeValueSupport.
+ * A {@link CompositeValue} representing a <code>Map&lt;String,MetaValue&gt;</code>, where the set of allowed keys and
+ * their corresponding values' MetaTypes are specified by the associated {@link ImmutableCompositeMetaType} or
+ * {@link MutableCompositeMetaType}.
+ *
+ * To represent a <code>Map&lt;String,MetaValue&gt;</code> where values must all have the same MetaType, use
+ * {@link MapCompositeValueSupport} instead.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
@@ -141,6 +148,11 @@
       init(compositeMetaType, items);
    }
 
+   /**
+    * Get the value's type - either a {@link ImmutableCompositeMetaType} or a {@link MutableCompositeMetaType}.
+    *
+    * @return the value's type - either a {@link ImmutableCompositeMetaType} or a {@link MutableCompositeMetaType}
+    */
    public CompositeMetaType getMetaType()
    {
       return metaType;

Modified: projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/MapCompositeValueSupport.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/MapCompositeValueSupport.java	2009-04-18 11:15:03 UTC (rev 87520)
+++ projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/api/values/MapCompositeValueSupport.java	2009-04-18 16:02:04 UTC (rev 87521)
@@ -27,12 +27,15 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jboss.metatype.api.types.CompositeMetaType;
 import org.jboss.metatype.api.types.MapCompositeMetaType;
 import org.jboss.metatype.api.types.MetaType;
 
 /**
- * A CompositeValue for Map<String,MetaValue> 
+ * A {@link CompositeValue} representing a <code>Map&lt;String,MetaValue&gt;</code>, where the set of allowed keys is
+ * specified by the associated {@link MapCompositeMetaType}, and where all values must be of the same MetaType.
+ *
+ * To represent a <code>Map&lt;String,MetaValue&gt;</code> where values may have different MetaTypes, use
+ * {@link CompositeValueSupport} instead.
  * 
  * @author Scott.Stark at jboss.org
  * @version $Revision$
@@ -112,7 +115,7 @@
       return values.toArray(mvs);
    }
 
-   public CompositeMetaType getMetaType()
+   public MapCompositeMetaType getMetaType()
    {
       return mapType;
    }
@@ -121,6 +124,7 @@
    {
       return map.values();
    }
+    
    @Override
    public boolean equals(Object obj)
    {
@@ -141,11 +145,13 @@
          return false;
       return map.equals(otherMap);
    }
+
    @Override
    public int hashCode()
    {
       return map.hashCode();
    }
+
    @Override
    public String toString()
    {

More information about the jboss-cvs-commits mailing list