From 492a07652300a4d55fb166768883405de1eb9983 Mon Sep 17 00:00:00 2001 From: Jess Sightler Date: Fri, 7 Nov 2014 10:49:37 -0500 Subject: [PATCH] WINDUP-379: Overwrite prompt is ignored in non-interactive mode, and results in automatic deletion of the output folder --- ui/src/main/java/org/jboss/windup/ui/WindupCommand.java | 8 +++++--- .../java/org/jboss/windup/addon/ui/WindupCommandTest.java | 2 +- 2 files changed, 6 insertions(+), 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 index d8c2b107cd..3c86ee66ae 100644 --- 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 index 7f0207ce0e..c8ea39c63b 100644 --- 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 {