WINDUP-1724 Reduce list {source,target,tag} commands execution time: …

…enhanced
windup · Oct 30, 2017 · 8d62b1c · 8d62b1c
1 parent 2784ded
commit 8d62b1c
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 40 deletions.
diff --git a/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/AbstractListCommand.java b/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/AbstractListCommand.java
@@ -1,14 +1,11 @@
 package org.jboss.windup.bootstrap.commands;
 
-import java.util.*;
-
 import org.jboss.forge.furnace.Furnace;
-import org.jboss.windup.bootstrap.help.Help;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
-public abstract class AbstractListCommand implements Command, FurnaceDependent
+public abstract class AbstractListCommand extends AbstractListCommandWithoutFurnace implements Command, FurnaceDependent
 {
     private Furnace furnace;
 
@@ -22,28 +19,4 @@ public void setFurnace(Furnace furnace)
     {
         this.furnace = furnace;
     }
-
-    /**
-     * Print the given values after displaying the provided message.
-     */
-    protected static void printValuesSorted(String message, Set<String> values)
-    {
-        System.out.println();
-        System.out.println(message + ":");
-        List<String> sorted = new ArrayList<>(values);
-        Collections.sort(sorted);
-        for (String value : sorted)
-        {
-            System.out.println("\t" + value);
-        }
-    }
-
-    protected static Set<String> getOptionValuesFromHelp(String optionName)
-    {
-        Set<String> options = new HashSet<>();
-        Help.load().getOptions().stream()
-                .filter(opt -> opt.getName().equals(optionName))
-                .forEach(optionDescription -> options.addAll(optionDescription.getAvailableOptions()));
-        return options;
-    }
 }
diff --git a/.../src/main/java/org/jboss/windup/bootstrap/commands/AbstractListCommandWithoutFurnace.java b/.../src/main/java/org/jboss/windup/bootstrap/commands/AbstractListCommandWithoutFurnace.java
@@ -0,0 +1,36 @@
+package org.jboss.windup.bootstrap.commands;
+
+import org.jboss.forge.furnace.Furnace;
+import org.jboss.windup.bootstrap.help.Help;
+
+import java.util.*;
+
+/**
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ */
+public abstract class AbstractListCommandWithoutFurnace implements Command
+{
+    /**
+     * Print the given values after displaying the provided message.
+     */
+    protected static void printValuesSorted(String message, Set<String> values)
+    {
+        System.out.println();
+        System.out.println(message + ":");
+        List<String> sorted = new ArrayList<>(values);
+        Collections.sort(sorted);
+        for (String value : sorted)
+        {
+            System.out.println("\t" + value);
+        }
+    }
+
+    protected static Set<String> getOptionValuesFromHelp(String optionName)
+    {
+        Set<String> options = new HashSet<>();
+        Help.load().getOptions().stream()
+                .filter(opt -> opt.getName().equals(optionName))
+                .forEach(optionDescription -> options.addAll(optionDescription.getAvailableOptions()));
+        return options;
+    }
+}
diff --git a/...c/main/java/org/jboss/windup/bootstrap/commands/windup/ListSourceTechnologiesCommand.java b/...c/main/java/org/jboss/windup/bootstrap/commands/windup/ListSourceTechnologiesCommand.java
@@ -1,16 +1,15 @@
 package org.jboss.windup.bootstrap.commands.windup;
 
-import org.jboss.windup.bootstrap.commands.AbstractListCommand;
+import org.jboss.windup.bootstrap.commands.AbstractListCommandWithoutFurnace;
 import org.jboss.windup.bootstrap.commands.Command;
 import org.jboss.windup.bootstrap.commands.CommandPhase;
 import org.jboss.windup.bootstrap.commands.CommandResult;
-import org.jboss.windup.bootstrap.commands.FurnaceDependent;
 import org.jboss.windup.exec.configuration.options.SourceOption;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
-public class ListSourceTechnologiesCommand extends AbstractListCommand implements Command, FurnaceDependent
+public class ListSourceTechnologiesCommand extends AbstractListCommandWithoutFurnace implements Command
 {
     @Override
     public CommandResult execute()
@@ -22,6 +21,6 @@ public CommandResult execute()
     @Override
     public CommandPhase getPhase()
     {
-        return CommandPhase.PRE_EXECUTION;
+        return CommandPhase.PRE_CONFIGURATION;
     }
 }
diff --git a/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/ListTagsCommand.java b/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/ListTagsCommand.java
@@ -1,16 +1,15 @@
 package org.jboss.windup.bootstrap.commands.windup;
 
-import org.jboss.windup.bootstrap.commands.AbstractListCommand;
+import org.jboss.windup.bootstrap.commands.AbstractListCommandWithoutFurnace;
 import org.jboss.windup.bootstrap.commands.Command;
 import org.jboss.windup.bootstrap.commands.CommandPhase;
 import org.jboss.windup.bootstrap.commands.CommandResult;
-import org.jboss.windup.bootstrap.commands.FurnaceDependent;
 import org.jboss.windup.exec.configuration.options.IncludeTagsOption;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
-public class ListTagsCommand extends AbstractListCommand implements Command, FurnaceDependent
+public class ListTagsCommand extends AbstractListCommandWithoutFurnace implements Command
 {
     @Override
     public CommandResult execute()
@@ -22,7 +21,7 @@ public CommandResult execute()
     @Override
     public CommandPhase getPhase()
     {
-        return CommandPhase.PRE_EXECUTION;
+        return CommandPhase.PRE_CONFIGURATION;
     }
 
 }
diff --git a/...c/main/java/org/jboss/windup/bootstrap/commands/windup/ListTargetTechnologiesCommand.java b/...c/main/java/org/jboss/windup/bootstrap/commands/windup/ListTargetTechnologiesCommand.java
@@ -1,16 +1,15 @@
 package org.jboss.windup.bootstrap.commands.windup;
 
-import org.jboss.windup.bootstrap.commands.AbstractListCommand;
+import org.jboss.windup.bootstrap.commands.AbstractListCommandWithoutFurnace;
 import org.jboss.windup.bootstrap.commands.Command;
 import org.jboss.windup.bootstrap.commands.CommandPhase;
 import org.jboss.windup.bootstrap.commands.CommandResult;
-import org.jboss.windup.bootstrap.commands.FurnaceDependent;
 import org.jboss.windup.exec.configuration.options.TargetOption;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
-public class ListTargetTechnologiesCommand extends AbstractListCommand implements Command, FurnaceDependent
+public class ListTargetTechnologiesCommand extends AbstractListCommandWithoutFurnace implements Command
 {
     @Override
     public CommandResult execute()
@@ -22,7 +21,7 @@ public CommandResult execute()
     @Override
     public CommandPhase getPhase()
     {
-        return CommandPhase.PRE_EXECUTION;
+        return CommandPhase.PRE_CONFIGURATION;
     }
 
 }