Null bundle (#208)

* prevent NPE when resource bundle fails to load

* fix NPE for PatchNotFoundException

* remove ANSI color markers from log messages sent to a file

* improve usability when version of OPatch is provided by user

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruUtil.java

@@ -359,7 +359,7 @@ void verifyResponse(Document response) throws AruException, XPathExpressionExcep
             String errorId = XPathUtil.string(response, "/results/error/id");
             AruException error;
             if ("10-016".equals(errorId)) {
-                error = new NoPatchesFoundException();
+                error = new NoPatchesFoundException(errorMessage);
             } else {
                 error = new AruException(errorMessage);
             }
@@ -394,7 +394,11 @@ private List<AruPatch> getPatches(String bugNumber, String userId, String passwo
         String url = String.format(BUG_SEARCH_URL, bugNumber);
         logger.info("IMG-0063", bugNumber);
         Document response = HttpUtil.getXMLContent(url, userId, password);
-        verifyResponse(response);
+        try {
+            verifyResponse(response);
+        } catch (NoPatchesFoundException patchEx) {
+            throw new NoPatchesFoundException(Utils.getMessage("IMG-0086", bugNumber), patchEx);
+        }
         return AruPatch.getPatches(response, patchSelector);
     }
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/NoPatchesFoundException.java

@@ -4,7 +4,11 @@
 package com.oracle.weblogic.imagetool.aru;
 
 public class NoPatchesFoundException extends AruException {
-    public NoPatchesFoundException() {
-        super();
+    public NoPatchesFoundException(String msg) {
+        super(msg);
+    }
+
+    public NoPatchesFoundException(String msg, Throwable throwable) {
+        super(msg, throwable);
     }
 }

imagetool/src/main/java/com/oracle/weblogic/imagetool/cachestore/OPatchFile.java

@@ -36,15 +36,23 @@ public OPatchFile(String patchId, String userId, String password, CacheStore cac
 
         // when offline, use the local cache to determine newest version available for OPatch
         if (userId == null && password == null) {
-            setVersion(getLatestCachedVersion(cache, getDefaultBugNum(patchId)));
+            if (patchId != null && patchId.contains(CacheStore.CACHE_KEY_SEPARATOR)) {
+                setVersion(patchId.substring(patchId.indexOf(CacheStore.CACHE_KEY_SEPARATOR) + 1));
+            } else {
+                setVersion(getLatestCachedVersion(cache, getDefaultBugNum(patchId)));
+            }
         }
     }
 
     private static String getDefaultBugNum(String patchId) {
         if (patchId == null) {
             return DEFAULT_BUG_NUM;
         } else {
-            return patchId;
+            if (patchId.contains(CacheStore.CACHE_KEY_SEPARATOR)) {
+                return patchId.substring(0, patchId.indexOf(CacheStore.CACHE_KEY_SEPARATOR));
+            } else {
+                return patchId;
+            }
         }
     }
 

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

@@ -58,9 +58,7 @@ public static void main(String[] args) {
 
         if (response != null) {
             if (response.getStatus() != 0) {
-                String message = String.format("Response code: %d, message: %s", response.getStatus(),
-                    response.getMessage());
-                logger.severe(message);
+                logger.severe(response.getMessage());
             } else if (!response.getMessage().isEmpty()) {
                 logger.info(response.getMessage());
             }

imagetool/src/main/java/com/oracle/weblogic/imagetool/logging/ConsoleFormatter.java

@@ -18,7 +18,7 @@
  */
 public class ConsoleFormatter extends Formatter {
     private static final String LINE_SEPARATOR = System.getProperty("line.separator");
-    private static final Pattern colorPattern = Pattern.compile("\\[\\[([a-z]+): (.+?)]]");
+    public static final Pattern colorPattern = Pattern.compile("\\[\\[([a-z]+): (.+?)]]");
 
     static {
         // if user is redirecting output, do not print color codes

imagetool/src/main/java/com/oracle/weblogic/imagetool/logging/FileFormatter.java

@@ -9,6 +9,7 @@
 import java.util.Date;
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -34,6 +35,31 @@ public FileFormatter() {
         this.formatter = new MessageFormat(DATE_FORMAT_STRING);
     }
 
+    /**
+     * Remove ANSI color tokens from messages to be logged to a file.
+     * @param text message to be logged
+     * @return message with color tokens removed
+     */
+    private String replaceColorTokens(String text) {
+        Matcher matcher = ConsoleFormatter.colorPattern.matcher(text);
+
+        StringBuilder builder = new StringBuilder();
+        int i = 0;
+        while (matcher.find()) {
+            AnsiColor replacement = AnsiColor.fromValue(matcher.group(1));
+            builder.append(text, i, matcher.start());
+            if (replacement == null) {
+                builder.append(matcher.group(0));
+            } else {
+                // remove color flags from messages logged to file
+                builder.append(matcher.group(2));
+            }
+            i = matcher.end();
+        }
+        builder.append(text.substring(i));
+        return builder.toString();
+    }
+
     /**
      * Formats the log record.
      *
@@ -74,7 +100,7 @@ public synchronized String format(LogRecord record) {
         sb.append(">");
 
         String messageKey = record.getMessage();
-        String message = formatMessage(record);
+        String message = replaceColorTokens(formatMessage(record));
 
         if (messageKey != null) {
             sb.append(" <");

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

@@ -726,7 +726,7 @@ private static boolean validFile(Path file) throws IOException {
      */
     public static String getMessage(@PropertyKey(resourceBundle = "ImageTool") String key, Object... params) {
         String message = key;
-        if (bundle.containsKey(key)) {
+        if (bundle != null && bundle.containsKey(key)) {
             message = bundle.getString(key);
         }
         if (params == null || params.length == 0) {

imagetool/src/main/resources/ImageTool.properties

@@ -84,3 +84,4 @@ IMG-0082=Failed to determine release number for product {0}, version {1}
 IMG-0083=Version {0} for patch ID {1} was not found in the available versions: {2}
 IMG-0084=No recommended patches found for {0}
 IMG-0085=The recommended ADR patch was skipped for the WLS installer, use --patch {0} to apply this patch
+IMG-0086=Failed to find patch number [[brightred: {0}]] on Oracle servers, verify the patch number is correct using My Oracle Support.

imagetool/src/test/java/com/oracle/weblogic/imagetool/cachestore/CachedFileTest.java

@@ -107,4 +107,12 @@ void latestOpatchVersion() throws IOException, AruException, XPathExpressionExce
         assertEquals(DEFAULT_BUG_NUM + "_13.9.4.0.0", patchFile.getKey(),
             "failed to get latest Opatch version from the cache");
     }
+
+    @Test
+    void specificOpatchVersion() throws IOException, AruException, XPathExpressionException {
+        // OPatch file should default to the default OPatch bug number and the latest version found in cache
+        OPatchFile patchFile = new OPatchFile(DEFAULT_BUG_NUM + "_13.9.2.2.2", null, null, cacheStore);
+        assertEquals(DEFAULT_BUG_NUM + "_13.9.2.2.2", patchFile.getKey(),
+            "failed to get specific Opatch version from the cache");
+    }
 }