Added thread-group name as a prefix to the thread-group pattern.

Change-Id: Id804ba00f2391d18a1bc4ea06cd39934208d6c18

@@ -43,6 +43,9 @@ import static java.nio.file.Files.walkFileTree;
 import static org.onlab.util.GroupedThreadFactory.groupedThreadFactory;
 import static org.onlab.util.GroupedThreadFactory.groupedThreadFactory;
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.slf4j.LoggerFactory.getLogger;
 
 
+/**
+ * Miscellaneous utility methods.
+ */
 public abstract class Tools {
 public abstract class Tools {
 
 
     private Tools() {
     private Tools() {
@@ -68,7 +71,9 @@ public abstract class Tools {
      * Returns a thread factory that produces threads named according to the
      * Returns a thread factory that produces threads named according to the
      * supplied name pattern and from the specified thread-group. The thread
      * supplied name pattern and from the specified thread-group. The thread
      * group name is expected to be specified in slash-delimited format, e.g.
      * group name is expected to be specified in slash-delimited format, e.g.
-     * {@code onos/intent}.
+     * {@code onos/intent}. The thread names will be produced by converting
+     * the thread group name into dash-delimited format and pre-pended to the
+     * specified pattern.
      *
      *
      * @param groupName group name in slash-delimited format to indicate hierarchy
      * @param groupName group name in slash-delimited format to indicate hierarchy
      * @param pattern   name pattern
      * @param pattern   name pattern
@@ -77,7 +82,7 @@ public abstract class Tools {
     public static ThreadFactory groupedThreads(String groupName, String pattern) {
     public static ThreadFactory groupedThreads(String groupName, String pattern) {
         return new ThreadFactoryBuilder()
         return new ThreadFactoryBuilder()
                 .setThreadFactory(groupedThreadFactory(groupName))
                 .setThreadFactory(groupedThreadFactory(groupName))
-                .setNameFormat(pattern)
+                .setNameFormat(groupName.replace(GroupedThreadFactory.DELIMITER, "-") + "-" + pattern)
                         // FIXME remove UncaughtExceptionHandler before release
                         // FIXME remove UncaughtExceptionHandler before release
                 .setUncaughtExceptionHandler((t, e) -> log.error("Uncaught exception on {}", t.getName(), e)).build();
                 .setUncaughtExceptionHandler((t, e) -> log.error("Uncaught exception on {}", t.getName(), e)).build();
     }
     }

@@ -55,10 +55,10 @@ public class ToolsTest {
 
 
     @Test
     @Test
     public  void groupedThreads() {
     public  void groupedThreads() {
-        ThreadFactory f = Tools.groupedThreads("foo/bar", "foo-%d");
+        ThreadFactory f = Tools.groupedThreads("foo/bar-me", "foo-%d");
         Thread t = f.newThread(() -> TestTools.print("yo"));
         Thread t = f.newThread(() -> TestTools.print("yo"));
-        assertTrue("wrong pattern", t.getName().startsWith("foo-"));
-        assertTrue("wrong group", t.getThreadGroup().getName().equals("foo/bar"));
+        assertTrue("wrong pattern", t.getName().startsWith("foo-bar-me-foo-"));
+        assertTrue("wrong group", t.getThreadGroup().getName().equals("foo/bar-me"));
     }
     }
 
 
 }
 }