prune intermediate docker multi-stage build images during cleanup (#95)

* prune intermediate docker multi-stage build images during cleanup

* removed remnants of isCLI, default is to use CLI always

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/CLIDriver.java

@@ -51,7 +51,7 @@ public static void main(String[] args) {
             CommandLine.usage(cliDriver, System.out);
             System.exit(-1);
         } else {
-            CommandResponse response = WLSCommandLine.call(cliDriver, true, args);
+            CommandResponse response = WLSCommandLine.call(cliDriver, args);
             if (response != null) {
                 if (response.getStatus() != 0) {
                     String message = String.format("Response code: %d, message: %s", response.getStatus(),

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/WLSCommandFactory.java

@@ -11,13 +11,8 @@
 
 public class WLSCommandLine {
 
-    public static <C extends Callable<T>, T> T call(C callable, boolean isCLIMode, String... args) {
-        return call(callable, System.out, System.err, CommandLine.Help.Ansi.AUTO, true, isCLIMode, args);
-    }
-
-    // Turn CLIMode off if not provided
     public static <C extends Callable<T>, T> T call(C callable, String... args) {
-        return call(callable, false, args);
+        return call(callable, System.out, System.err, CommandLine.Help.Ansi.AUTO, true, args);
     }
 
     /**
@@ -27,21 +22,16 @@ public static <C extends Callable<T>, T> T call(C callable, String... args) {
      * @param err error stream
      * @param ansi ANSI mode
      * @param ignoreCaseForEnums ignore case for Enums
-     * @param isCLIMode true to use WLSCommandFactory
      * @param args command line arguments
      * @param <C> Callable class
      * @param <T> Callable Type
      * @return the result
      */
     public static <C extends Callable<T>, T> T call(C callable, PrintStream out, PrintStream err,
                                                     CommandLine.Help.Ansi ansi, boolean ignoreCaseForEnums,
-                                                    boolean isCLIMode, String... args) {
+                                                    String... args) {
         CommandLine cmd;
-        if (isCLIMode) {
-            cmd = new CommandLine(callable, new WLSCommandFactory());
-        } else {
-            cmd = new CommandLine(callable);
-        }
+        cmd = new CommandLine(callable);
         cmd.setCaseInsensitiveEnumValuesAllowed(ignoreCaseForEnums);
         cmd.setToggleBooleanFlags(false);
         cmd.setUnmatchedArgumentsAllowed(false);

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/WLSCommandLine.java

@@ -17,10 +17,6 @@ public class AddEntry extends CacheOperation {
     public AddEntry() {
     }
 
-    public AddEntry(boolean isCLIMode) {
-        super(isCLIMode);
-    }
-
     @Override
     public CommandResponse call() {
         if (!Utils.isEmptyString(key) && !Utils.isEmptyString(location)) {
@@ -37,9 +33,7 @@ public CommandResponse call() {
                 return new CommandResponse(-1, "Command Failed");
             }
         }
-        if (isCLIMode) {
-            spec.commandLine().usage(System.out);
-        }
+        spec.commandLine().usage(System.out);
         return new CommandResponse(-1, "Invalid arguments. --key & --path required.");
     }
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddEntry.java

@@ -23,10 +23,6 @@ public class AddInstallerEntry extends CacheOperation {
     public AddInstallerEntry() {
     }
 
-    public AddInstallerEntry(boolean isCLIMode) {
-        super(isCLIMode);
-    }
-
     @Override
     public CommandResponse call() {
         if (location != null && Files.isRegularFile(location) && !Utils.isEmptyString(version)) {

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddInstallerEntry.java

@@ -30,10 +30,6 @@ public class AddPatchEntry extends CacheOperation {
     public AddPatchEntry() {
     }
 
-    public AddPatchEntry(boolean isCLIMode) {
-        super(isCLIMode);
-    }
-
     @Override
     public CommandResponse call() throws Exception {
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddPatchEntry.java

@@ -34,20 +34,12 @@ public class CacheCLI implements Callable<CommandResponse> {
     public CacheCLI() {
     }
 
-    public CacheCLI(boolean isCLIMode) {
-        this.isCLIMode = isCLIMode;
-    }
-
     @Override
     public CommandResponse call() {
-        if (isCLIMode) {
-            spec.commandLine().usage(System.out);
-        }
+        spec.commandLine().usage(System.out);
         return new CommandResponse(-1, "Invalid arguments");
     }
 
-    private boolean isCLIMode;
-
     @Spec
     CommandSpec spec;
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/CacheCLI.java

@@ -16,15 +16,6 @@
 
 public abstract class CacheOperation implements Callable<CommandResponse> {
 
-    boolean isCLIMode;
-
-    CacheOperation() {
-    }
-
-    CacheOperation(boolean isCLIMode) {
-        this.isCLIMode = isCLIMode;
-    }
-
     protected CacheStore cacheStore = new CacheStoreFactory().get();
 
     @Unmatched

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/CacheOperation.java

@@ -22,10 +22,6 @@ public class DeleteEntry extends CacheOperation {
     public DeleteEntry() {
     }
 
-    public DeleteEntry(boolean isCLIMode) {
-        super(isCLIMode);
-    }
-
     @Override
     public CommandResponse call() {
         if (!Utils.isEmptyString(key)) {
@@ -47,9 +43,7 @@ public CommandResponse call() {
                 }
             }
         }
-        if (isCLIMode) {
-            spec.commandLine().usage(System.out);
-        }
+        spec.commandLine().usage(System.out);
         return new CommandResponse(-1, "Invalid arguments. --key should correspond to a valid entry in cache");
     }
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/DeleteEntry.java

@@ -15,16 +15,10 @@ public class GetCacheDir extends CacheOperation {
     public GetCacheDir() {
     }
 
-    public GetCacheDir(boolean isCLIMode) {
-        super(isCLIMode);
-    }
-
     @Override
     public CommandResponse call() {
         String path = cacheStore.getCacheDir();
-        if (isCLIMode) {
-            System.out.println("Cache Dir: " + path);
-        }
+        System.out.println("Cache Dir: " + path);
         return new CommandResponse(0, "Cache Dir location: ", path);
     }