Merge pull request #348 from jsight/fix_for_overwrite_prompt

WINDUP-379: Overwrite prompt is ignored in non-interactive mode, and res...
windup · Nov 10, 2014 · bd10e53 · bd10e53
2 parents 1413592 + 492a076
commit bd10e53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ui/src/main/java/org/jboss/windup/ui/WindupCommand.java b/ui/src/main/java/org/jboss/windup/ui/WindupCommand.java
@@ -158,7 +158,8 @@ private Object getValueForInput(InputComponent<?, ?> input)
         return value;
     }
 
-    private Resource<?> getResourceResolved(Resource<?> value) {
+    private Resource<?> getResourceResolved(Resource<?> value)
+    {
         Resource<?> resource = (Resource<?>) value;
         File file = (File) resource.getUnderlyingResourceObject();
         return new ResourcePathResolver(resourceFactory, resource, file.getPath()).resolve().get(0);
@@ -195,9 +196,10 @@ public Result execute(UIExecutionContext context) throws Exception
         {
             String promptMsg = "Overwrite all contents of \"" + windupConfiguration.getOutputDirectory().toString()
                         + "\" (anything already in the directory will be deleted)?";
-            if (!context.getPrompt().promptBoolean(promptMsg))
+            if (!context.getPrompt().promptBoolean(promptMsg, false))
             {
-                return Results.fail("Windup execution aborted!");
+                String outputPath = windupConfiguration.getOutputDirectory().toString();
+                return Results.fail("Files exist in " + outputPath + ", but --overwrite not specified. Aborting!");
             }
         }
 

diff --git a/ui/src/test/java/org/jboss/windup/addon/ui/WindupCommandTest.java b/ui/src/test/java/org/jboss/windup/addon/ui/WindupCommandTest.java
@@ -122,7 +122,7 @@ public void testOverwriteConfirmation() throws Exception
 
                 // make sure that it failed to run (since the user's response to the overwrite question is false)
                 Assert.assertTrue(result instanceof Failed);
-                Assert.assertTrue(result.getMessage().contains("Windup execution aborted"));
+                Assert.assertTrue(result.getMessage().contains("overwrite not specified"));
             }
             finally
             {