optimze imports and add error when wrong

Author: jshum2479

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/UpdateImage.java

@@ -11,10 +11,9 @@
 import com.oracle.weblogic.imagetool.util.Constants;
 import com.oracle.weblogic.imagetool.util.Utils;
 import com.oracle.weblogic.imagetool.util.ValidationResult;
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -26,9 +25,11 @@
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
-import java.util.logging.FileHandler;
 import java.util.logging.Logger;
 
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+
 @Command(
         name = "update",
         description = "Update WebLogic docker image with selected patches",
@@ -90,17 +91,27 @@ public CommandResponse call() throws Exception {
             String opatchVersion = baseImageProperties.getProperty("OPATCH_VERSION");
 
             // We need to find out the actual version number of the opatchBugNumber - what if useCache=always ?
+            String opatchBugNumberVersion = "";
 
             if (useCache == CachePolicy.ALWAYS) {
-                opatch_1394_required = (latestPSU || !patches.isEmpty()) &&
-                    (Utils.compareVersions(installerVersion, Constants.DEFAULT_WLS_VERSION) >= 0);
+                String opatchFile = cacheStore.getValueFromCache(opatchBugNumber + "_opatch");
+                if (opatchFile != null ) {
+                    opatchBugNumberVersion = Utils.getOpatchVersionFromZip(opatchFile);
+                    logger.info(String.format("OPatch patch number %s cached file %s version %s", opatchBugNumber,
+                        opatchFile, opatchBugNumberVersion ));
+                } else {
+                    String msg = String.format("OPatch patch number --opatchBugNumber %s cannot be found in cache",
+                        opatchBugNumber);
+                    logger.severe(msg);
+                    throw new IOException(msg);
+                }
             } else {
-                String opatchBugNumberVersion = ARUUtil.getOPatchVersionByBugNumber(opatchBugNumber, userId, password);
-                opatch_1394_required = (latestPSU || !patches.isEmpty()) &&
-                    (Utils.compareVersions(installerVersion, Constants.DEFAULT_WLS_VERSION) >= 0 &&
-                        Utils.compareVersions(opatchVersion, opatchBugNumberVersion) < 0);
+                opatchBugNumberVersion = ARUUtil.getOPatchVersionByBugNumber(opatchBugNumber, userId, password);
             }
 
+            opatch_1394_required = (latestPSU || !patches.isEmpty()) &&
+                (Utils.compareVersions(installerVersion, Constants.DEFAULT_WLS_VERSION) >= 0 &&
+                    Utils.compareVersions(opatchVersion, opatchBugNumberVersion) < 0);
 
             //Do not update or install packages in offline only mode
             if (useCache != CachePolicy.ALWAYS) {

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java

@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,6 +37,8 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 public class Utils {
 
@@ -566,4 +569,38 @@ public static String getBuildWorkingDir() throws IOException {
 
         return workingDir;
     }
+
+    /**
+     * Return the version number inside a opatch file
+     * @param fileName full path to the opatch patch
+     * @return version number of the patch
+     */
+
+    public static String getOpatchVersionFromZip(String fileName) {
+
+        try {
+            ZipFile zipFile = new ZipFile(fileName);
+
+            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+
+            while (entries.hasMoreElements()) {
+                ZipEntry entry = entries.nextElement();
+                if (entry.getName().endsWith("/version.txt")) {
+                    InputStream stream = zipFile.getInputStream(entry);
+                    BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(stream));
+                    StringBuilder out = new StringBuilder();
+                    String line;
+                    while ((line = bufferedReader.readLine()) != null) {
+                        out.append(line);
+                    }
+                    return out.toString();
+                }
+            }
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return null;
+    }
+
+
 }