WINDUP-1767 CLI to describe what parameters are required: reordering

windup · Nov 9, 2017 · 0579fa1 · 0579fa1
1 parent 71b791e
commit 0579fa1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/DisplayHelpCommand.java b/bootstrap/src/main/java/org/jboss/windup/bootstrap/commands/windup/DisplayHelpCommand.java
@@ -45,6 +45,9 @@ public CommandResult execute()
 
         sb.append(System.lineSeparator()).append(" Forge Options:").append(System.lineSeparator());
 
+        sb.append("-b, --batchMode").append(System.lineSeparator());
+        sb.append("\t run Forge in batch mode and does not prompt for confirmation (exits immediately after running) ").append(System.lineSeparator());
+
         sb.append("-i, --install GROUP_ID:ARTIFACT_ID[:VERSION]").append(System.lineSeparator());
         sb.append("\t install the required addons and exit. ex: `"+Util.WINDUP_CLI_NAME+" -i core-addon-x` or `"+Util.WINDUP_CLI_NAME+" -i org.example.addon:example:1.0.0` ").append(System.lineSeparator());
 
@@ -60,9 +63,6 @@ public CommandResult execute()
         sb.append("-m, --immutableAddonDir DIR").append(System.lineSeparator());
         sb.append("\t add the given directory for use as a custom immutable addon repository (read only) ").append(System.lineSeparator());
 
-        sb.append("-b, --batchMode").append(System.lineSeparator());
-        sb.append("\t run Forge in batch mode and does not prompt for confirmation (exits immediately after running) ").append(System.lineSeparator());
-
         sb.append("-d, --debug").append(System.lineSeparator());
         sb.append("\t run Forge in debug mode (wait on port 8000 for a debugger to attach) ").append(System.lineSeparator());
 

diff --git a/exec/api/src/main/java/org/jboss/windup/exec/configuration/WindupConfiguration.java b/exec/api/src/main/java/org/jboss/windup/exec/configuration/WindupConfiguration.java
@@ -170,7 +170,22 @@ public static Iterable<ConfigurationOption> getWindupConfigurationOptions(Furnac
             @Override
             public int compare(ConfigurationOption o1, ConfigurationOption o2)
             {
-                return o2.getPriority() - o1.getPriority();
+                // if the 1st is required and...
+                if (o1.isRequired())
+                {
+                    // the 2nd isn't, the 1st is "before" than the 2nd
+                    if (!o2.isRequired()) return -1;
+                    // otherwise if also the 2nd is required, then order is priority-based
+                    else return o2.getPriority() - o1.getPriority();
+                }
+                // if the 1st is not required and...
+                else
+                {
+                    // the 2nd is, the 1st is "after" than the 2nd
+                    if (o2.isRequired()) return 1;
+                    // otherwise also the 2nd isn't and order is priority-based
+                    else return o2.getPriority() - o1.getPriority();
+                }
             }
         });
         return results;

diff --git a/exec/api/src/main/java/org/jboss/windup/exec/configuration/options/OverwriteOption.java b/exec/api/src/main/java/org/jboss/windup/exec/configuration/options/OverwriteOption.java
@@ -55,4 +55,10 @@ public ValidationResult validate(Object valueObj)
     {
         return ValidationResult.SUCCESS;
     }
+
+    @Override
+    public int getPriority()
+    {
+        return 8500;
+    }
 }