Fix logging of loaded Model types, and loaded WindupRuleProvider impls

windup · Sep 18, 2014 · 53a4984 · 53a4984
1 parent 86b099a
commit 53a4984
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 7 deletions.
diff --git a/graph/api/src/main/java/org/jboss/windup/graph/GraphTypeRegistry.java b/graph/api/src/main/java/org/jboss/windup/graph/GraphTypeRegistry.java
@@ -1,15 +1,19 @@
 package org.jboss.windup.graph;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jboss.forge.furnace.util.Iterators;
+import org.jboss.forge.furnace.util.OperatingSystemUtils;
 import org.jboss.windup.graph.model.WindupVertexFrame;
-import org.jboss.windup.util.ServiceLogger;
 import org.jboss.windup.util.furnace.FurnaceClasspathScanner;
 import org.jboss.windup.util.furnace.FurnaceScannerFilenameFilter;
 
@@ -50,10 +54,8 @@ public boolean accept(String name)
 
         Iterable<Class<?>> classes = scanner.scanClasses(modelClassFilter);
 
-        ServiceLogger.logLoadedServices(LOG, WindupVertexFrame.class, Iterators.asList(classes));
         for (Class<?> clazz : classes)
         {
-            // Add those extending WindupVertexFrame.
             if (WindupVertexFrame.class.isAssignableFrom(clazz))
             {
                 @SuppressWarnings("unchecked")
@@ -62,10 +64,43 @@ public boolean accept(String name)
             }
             else
             {
-                LOG.log(Level.FINE, "Not adding to GraphTypeRegistry, not a subclass of WindupVertexFrame: "
-                            + clazz.getCanonicalName());
+                LOG.log(Level.FINE, "Not adding [" + clazz.getCanonicalName()
+                            + "] to GraphTypeRegistry");
             }
         }
+
+        logLoadedModelTypes(graphTypeManager.getRegisteredTypes());
+    }
+
+    private void logLoadedModelTypes(Set<Class<? extends WindupVertexFrame>> types)
+    {
+        List<Class<? extends WindupVertexFrame>> list = new ArrayList<>(types);
+        Collections.sort(list, new Comparator<Class<? extends WindupVertexFrame>>()
+        {
+            @Override
+            public int compare(Class<? extends WindupVertexFrame> left, Class<? extends WindupVertexFrame> right)
+            {
+                if (left == right)
+                    return 0;
+                if (left == null)
+                    return 1;
+                if (right == null)
+                    return -1;
+                return left.getCanonicalName().compareTo(right.getCanonicalName());
+            }
+        });
+        StringBuilder result = new StringBuilder();
+        for (int i = 0; i < list.size(); i++)
+        {
+            Class<?> type = list.get(i);
+            result.append(type.getName());
+            if ((i + 1) < list.size())
+            {
+                result.append(OperatingSystemUtils.getLineSeparator());
+            }
+        }
+        LOG.info("Loaded [" + list.size() + "] WindupVertexFrame sub-types [" + OperatingSystemUtils.getLineSeparator()
+                    + result.toString() + OperatingSystemUtils.getLineSeparator() + "]");
     }
 
     /**

diff --git a/utils/src/main/java/org/jboss/windup/util/ServiceLogger.java b/utils/src/main/java/org/jboss/windup/util/ServiceLogger.java
@@ -28,7 +28,7 @@ private static String joinTypeNames(final List<?> list)
         for (int i = 0; i < list.size(); i++)
         {
             Object service = list.get(i);
-            result.append(service.getClass().getName());
+            result.append(service.getClass().getName().replaceAll("_\\$\\$_.*$", ""));
             if (service instanceof Weighted)
             {
                 result.append("<" + ((Weighted) service).priority() + ">");