WINDUP-885 Upgrade windup-maven-plugin to latest WindUp core version

windup · Feb 25, 2016 · 6f50a40 · 6f50a40
1 parent 9c74980
commit 6f50a40
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 1 deletion.
diff --git a/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/RunWindupCommand.java b/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/RunWindupCommand.java
@@ -48,6 +48,11 @@
 import org.jboss.windup.util.Logging;
 import org.jboss.windup.util.exception.WindupException;
 
+
+/**
+ * This is the interactive command-line user interface of Windup
+ * which does basic validation of the input and then runs WindupProcessorImpl.
+ */
 public class RunWindupCommand implements Command, FurnaceDependent
 {
     private static final Logger log = Logging.get(RunWindupCommand.class);
@@ -255,6 +260,7 @@ else if (Boolean.class.isAssignableFrom(option.getType()))
             windupConfiguration
                         .setProgressMonitor(progressMonitor)
                         .setGraphContext(graphContext);
+            // Run Windup.
             getWindupProcessor().execute(windupConfiguration);
 
             Path indexHtmlPath = windupConfiguration.getOutputDirectory().resolve("index.html").normalize().toAbsolutePath();

diff --git a/config-xml/addon/src/main/java/org/jboss/windup/config/parser/XMLRuleProviderLoader.java b/config-xml/addon/src/main/java/org/jboss/windup/config/parser/XMLRuleProviderLoader.java
@@ -108,7 +108,15 @@ public List<RuleProvider> getProviders(GraphContext context)
         WindupConfigurationModel cfg = WindupConfigurationService.getConfigurationModel(context);
         for (FileModel userRulesFileModel : cfg.getUserRulesPaths())
         {
-            for (URL resource : getWindupUserDirectoryXmlFiles(userRulesFileModel))
+            // Log the files found
+            final Collection<URL> userXmlRulesetFiles = getWindupUserDirectoryXmlFiles(userRulesFileModel);
+            StringBuilder sb = new StringBuilder("\nFound " + userXmlRulesetFiles.size() + " user XML rules in: " + userRulesFileModel.getFilePath());
+            for (URL resource : userXmlRulesetFiles)
+                sb.append("\n\t" + resource.toString());
+            LOG.info(sb.toString());
+
+            // Parse each file
+            for (URL resource : userXmlRulesetFiles)
             {
                 try
                 {

diff --git a/exec/api/src/main/java/org/jboss/windup/exec/rulefilters/SourceAndTargetPredicate.java b/exec/api/src/main/java/org/jboss/windup/exec/rulefilters/SourceAndTargetPredicate.java
@@ -61,4 +61,11 @@ private Set<String> initSet(Collection<String> values)
             return new HashSet<>(values);
         }
     }
+
+
+    @Override
+    public String toString()
+    {
+        return "SourceAndTargetPredicate{" + "sources=" + sources + ", targets=" + targets + '}';
+    }
 }
diff --git a/exec/api/src/main/java/org/jboss/windup/exec/rulefilters/TaggedRuleProviderPredicate.java b/exec/api/src/main/java/org/jboss/windup/exec/rulefilters/TaggedRuleProviderPredicate.java
@@ -84,4 +84,12 @@ public boolean accept(RuleProvider provider)
 
         return result;
     }
+
+
+    @Override
+    public String toString()
+    {
+        return "TaggedRuleProviderPredicate{incl " + includeTags.size() + ", excl" + excludeTags.size() + ", requireAllIncl=" + requireAllIncludeTags + ", requireAllExcl=" + requireAllExcludeTags + '}';
+    }
+
 }
diff --git a/exec/impl/src/main/java/org/jboss/windup/exec/WindupProcessorImpl.java b/exec/impl/src/main/java/org/jboss/windup/exec/WindupProcessorImpl.java
@@ -5,6 +5,7 @@
 import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
 
@@ -77,6 +78,7 @@ public void execute(WindupConfiguration configuration)
         long startTime = System.currentTimeMillis();
 
         validateConfig(configuration);
+        printConfigInfo(configuration);
 
         GraphContext context = configuration.getGraphContext();
         context.setOptions(configuration.getOptionMap());
@@ -248,4 +250,29 @@ private void validateConfig(WindupConfiguration windupConfiguration)
         Checks.checkDirectoryToBeFilled(outputDirectory.toFile(), "Output directory");
     }
 
+    private void printConfigInfo(WindupConfiguration windupConfiguration)
+    {
+        LOG.info("");
+        if (windupConfiguration.getInputPaths().size() == 1)
+        {
+            LOG.info("Input Application:" + windupConfiguration.getInputPaths().iterator().next());
+        }
+        else
+        {
+            LOG.info("Input Applications:");
+            for (Path inputPath : windupConfiguration.getInputPaths())
+            {
+                LOG.info("\t" + inputPath);
+            }
+            LOG.info("");
+        }
+        LOG.info("Output Path:" + windupConfiguration.getOutputDirectory());
+        LOG.info("");
+
+        for (Map.Entry<String, Object> entrySet : windupConfiguration.getOptionMap().entrySet())
+        {
+            LOG.info("\t" + entrySet.getKey() + ": " + entrySet.getValue());
+        }
+    }
+
 }