Merge branch 'master' into copyrights-and-licenses

Author: gosurya-oracle

src/main/java/com/oracle/weblogicx/imagebuilder/cli/CLIDriver.java

@@ -53,13 +53,10 @@ public static void main(String[] args) {
             CommandResponse response = WLSCommandLine.call(cliDriver, true, args);
 
             if (response != null) {
-
-                String message = String.format("Response code: %d, message: %s", response.getStatus(),
-                        response.getMessage());
                 if (response.getStatus() != 0) {
+                    String message = String.format("Response code: %d, message: %s", response.getStatus(),
+                            response.getMessage());
                     logger.severe(message);
-                } else {
-                    logger.info(message);
                 }
                 System.exit(response.getStatus());
             }

src/main/java/com/oracle/weblogicx/imagebuilder/cli/cache/AddInstallerEntry.java

@@ -7,6 +7,7 @@
 import com.oracle.weblogicx.imagebuilder.api.model.CommandResponse;
 import com.oracle.weblogicx.imagebuilder.api.model.InstallerType;
 import com.oracle.weblogicx.imagebuilder.util.Constants;
+import com.oracle.weblogicx.imagebuilder.util.Utils;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
@@ -31,7 +32,7 @@ public AddInstallerEntry(boolean isCLIMode) {
 
     @Override
     public CommandResponse call() {
-        if (location != null && Files.isRegularFile(location)) {
+        if (location != null && Files.isRegularFile(location) && !Utils.isEmptyString(version)) {
             String key = String.format("%s%s%s", type, CACHE_KEY_SEPARATOR, version);
             cacheStore.addToCache(key, location.toAbsolutePath().toString());
             return new CommandResponse(0, String.format("Successfully added to cache. %s=%s", key,
@@ -51,8 +52,7 @@ public CommandResponse call() {
     @Option(
             names = {"--version"},
             description = "Installer version. Ex: For WLS|FMW use 12.2.1.3.0 For jdk, use 8u201",
-            required = true,
-            defaultValue = Constants.DEFAULT_WLS_VERSION
+            required = true
     )
     private String version;
 

src/main/java/com/oracle/weblogicx/imagebuilder/cli/cache/ListCacheItems.java

@@ -5,11 +5,14 @@
 package com.oracle.weblogicx.imagebuilder.cli.cache;
 
 import com.oracle.weblogicx.imagebuilder.api.model.CommandResponse;
+import com.oracle.weblogicx.imagebuilder.util.Utils;
 import picocli.CommandLine.Command;
 
 import java.util.Collections;
 import java.util.Map;
 
+import static com.oracle.weblogicx.imagebuilder.util.Constants.CACHE_DIR_KEY;
+
 @Command(
         name = "listItems",
         description = "List cache contents"
@@ -34,9 +37,12 @@ public CommandResponse call() {
         } else {
             if (isCLIMode) {
                 System.out.println("Cache contents");
-                resultMap.forEach((key, value) -> {
-                    System.out.println(key + "=" + value);
-                });
+                String cacheDir = resultMap.getOrDefault(CACHE_DIR_KEY, null);
+                if (!Utils.isEmptyString(cacheDir)) {
+                    System.out.println(CACHE_DIR_KEY + "=" + cacheDir);
+                    resultMap.remove(CACHE_DIR_KEY);
+                }
+                resultMap.forEach((key, value) -> System.out.println(key + "=" + value));
             }
             return new CommandResponse(0, "Cache contents", resultMap);
         }