Use ObjectName builder for everything

martint · Apr 8, 2014 · e0f7fe6 · e0f7fe6
1 parent fa5e76f
commit e0f7fe6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/src/main/java/org/weakref/jmx/ObjectNames.java b/src/main/java/org/weakref/jmx/ObjectNames.java
@@ -4,8 +4,6 @@
 
 import java.lang.annotation.Annotation;
 
-import static java.lang.String.format;
-
 /**
  * Generate JMX object names.
  */
@@ -20,9 +18,7 @@ private ObjectNames() {}
      */
     public static String generatedNameOf(Class<?> clazz)
     {
-        return format("%s:name=%s",
-                clazz.getPackage().getName(),
-                clazz.getSimpleName());
+        return builder(clazz).build();
     }
 
     /**
@@ -32,10 +28,7 @@ public static String generatedNameOf(Class<?> clazz)
      */
     public static String generatedNameOf(Class<?> clazz, Annotation annotation)
     {
-        return format("%s:type=%s,name=%s",
-                clazz.getPackage().getName(),
-                clazz.getSimpleName(),
-                annotation.annotationType().getSimpleName());
+        return builder(clazz, annotation).build();
     }
 
     /**
@@ -45,10 +38,7 @@ public static String generatedNameOf(Class<?> clazz, Annotation annotation)
      */
     public static String generatedNameOf(Class<?> clazz, Class<? extends Annotation> annotationClass)
     {
-        return format("%s:type=%s,name=%s",
-                clazz.getPackage().getName(),
-                clazz.getSimpleName(),
-                annotationClass.getSimpleName());
+        return builder(clazz, annotationClass).build();
     }
 
     /**
@@ -58,7 +48,7 @@ public static String generatedNameOf(Class<?> clazz, Class<? extends Annotation>
      */
     public static String generatedNameOf(Class<?> clazz, Named named)
     {
-        return generatedNameOf(clazz, named.value());
+        return builder(clazz, named).build();
     }
 
     /**
@@ -68,10 +58,7 @@ public static String generatedNameOf(Class<?> clazz, Named named)
      */
     public static String generatedNameOf(Class<?> clazz, String name)
     {
-        return format("%s:type=%s,name=%s",
-                clazz.getPackage().getName(),
-                clazz.getSimpleName(),
-                quoteValueIfNecessary(name));
+        return builder(clazz, name).build();
     }
 
     static String quoteValueIfNecessary(String name)

diff --git a/src/test/java/org/weakref/jmx/TestObjectNames.java b/src/test/java/org/weakref/jmx/TestObjectNames.java
@@ -60,6 +60,13 @@ public void testGeneratedNameOf5() {
         "org.weakref.jmx:name=Inner");
   }
 
+   @Test
+   public void testGeneratedNameOfStringWithQuoting() {
+     assertEquals(
+        generatedNameOf(SimpleObject.class, "bar,baz"),
+        "org.weakref.jmx:type=SimpleObject,name=\"bar,baz\"");
+   }
+
   @Test(dataProvider = "names")
   public void testQuotesName(String name, boolean shouldQuote)
           throws MalformedObjectNameException