[jboss-cvs] JBossAS SVN: r89194 - in projects/jboss-man/branches/Branch_2_1/managed/src: test/java/org/jboss/test/managed/factory/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2009-05-20 12:07:08 -0400 (Wed, 20 May 2009)
New Revision: 89194

Modified:
   projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java
   projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/ManagementObjectUnitTestCase.java
Log:
JBMAN-79, Cleanup ManagedObjectImpl ctor signatures

Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java	2009-05-20 15:38:48 UTC (rev 89193)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedObjectImpl.java	2009-05-20 16:07:08 UTC (rev 89194)
@@ -97,6 +97,12 @@
     * @param operations the operations
     */
    public ManagedObjectImpl(String name, Set<ManagedProperty> properties,
+         Set<ManagedOperation> operations)
+   {
+      this(name, name, null, properties, operations, null);
+   }
+   @Deprecated
+   public ManagedObjectImpl(String name, Set<ManagedProperty> properties,
          HashSet<ManagedOperation> operations)
    {
       this(name, name, null, properties, operations, null);
@@ -117,6 +123,18 @@
          String nameType,
          String attachmentName,
          Set<ManagedProperty> properties,
+         Set<ManagedOperation> operations,
+         Serializable attachment
+   )
+   {
+      this(name, nameType, attachmentName, toMap(properties), operations, attachment);
+   }
+   @Deprecated
+   public ManagedObjectImpl(
+         String name,
+         String nameType,
+         String attachmentName,
+         Set<ManagedProperty> properties,
          HashSet<ManagedOperation> operations,
          Serializable attachment
    )
@@ -139,7 +157,7 @@
          String nameType,
          String attachmentName,
          Map<String, ManagedProperty> properties,
-         HashSet<ManagedOperation> operations,
+         Set<ManagedOperation> operations,
          Serializable attachment
    )
    {
@@ -147,7 +165,7 @@
          throw new IllegalArgumentException("Null name");
       if (properties == null)
          throw new IllegalArgumentException("Null properties");
-      
+
       this.name = name;
       // todo - check for null?
       this.nameType = nameType;
@@ -156,6 +174,18 @@
       this.operations = operations;
       setAttachment(attachment);
    }
+   @Deprecated
+   public ManagedObjectImpl(
+         String name,
+         String nameType,
+         String attachmentName,
+         Map<String, ManagedProperty> properties,
+         HashSet<ManagedOperation> operations,
+         Serializable attachment
+   )
+   {
+      this(name, name, attachmentName, properties, (Set<ManagedOperation>)operations, attachment);      
+   }
 
    public String getName()
    {

Modified: projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/ManagementObjectUnitTestCase.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/ManagementObjectUnitTestCase.java	2009-05-20 15:38:48 UTC (rev 89193)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/ManagementObjectUnitTestCase.java	2009-05-20 16:07:08 UTC (rev 89194)
@@ -21,9 +21,16 @@
 */
 package org.jboss.test.managed.factory.test;
 
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
 import junit.framework.Test;
 
 import org.jboss.managed.api.ManagedObject;
+import org.jboss.managed.api.ManagedOperation;
+import org.jboss.managed.api.ManagedProperty;
+import org.jboss.managed.plugins.ManagedObjectImpl;
 import org.jboss.test.managed.factory.AbstractManagedObjectFactoryTest;
 import org.jboss.test.managed.factory.support.ManagementObjectChangedName;
 
@@ -63,4 +70,21 @@
       ManagedObject managedObject = createManagedObject(ManagementObjectChangedName.class);
       checkManagedObject(ManagementObjectChangedName.class, managedObject, "changed", null);
    }
-}
\ No newline at end of file
+
+   /**
+    * JBMAN-79
+    */
+   public void testDeprecatedCtor()
+   {
+      String name = "testDeprecatedCtor";
+      String nameType = null;
+      String attachmentName = "testDeprecatedCtor.attachment";
+      Set<ManagedProperty> props = null;
+      HashSet<ManagedOperation> ops = null;
+      Serializable attachment = null;
+      ManagedObjectImpl mo = new ManagedObjectImpl(name, nameType, attachmentName, props, ops, attachment);
+      
+      Set<ManagedOperation> ops2 = ops;
+      ManagedObjectImpl mo2 = new ManagedObjectImpl(name, nameType, attachmentName, props, ops2, attachment);
+   }
+}