include recommended PSU overlay patches in --recommendedPatches (#228)

Author: ddsharpe

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

@@ -154,6 +154,17 @@ List<AruPatch> getRecommendedPatches(AruProduct product, String version, String
             String releaseNumber = getReleaseNumber(product, version, userId, password);
             Document aruRecommendations = getRecommendedPatchesMetadata(product, releaseNumber, userId, password);
             List<AruPatch> patches = AruPatch.getPatches(aruRecommendations);
+            String psuVersion = getPsuVersion(patches);
+            if (!Utils.isEmptyString(psuVersion)) {
+                patches.forEach(p -> logger.fine("Discarding recommended patch {1} {2}", p.patchId(), p.description()));
+                logger.fine("Recommended patch list contains a PSU, getting recommendations for PSU version {0}",
+                    psuVersion);
+                // get release number for PSU
+                String psuReleaseNumber = getReleaseNumber(product, psuVersion, userId, password);
+                // get recommended patches for PSU release (Overlay patches are only recommended on the PSU release)
+                Document psuRecommendation = getRecommendedPatchesMetadata(product, psuReleaseNumber, userId, password);
+                patches = AruPatch.getPatches(psuRecommendation);
+            }
             patches.forEach(p -> logger.info("IMG-0068", product.description(), p.patchId(), p.description()));
             logger.exiting(patches);
             return patches;
@@ -165,6 +176,17 @@ List<AruPatch> getRecommendedPatches(AruProduct product, String version, String
         }
     }
 
+    private String getPsuVersion(List<AruPatch> patches) {
+        for (AruPatch patch: patches) {
+            if (patch.isPsu()) {
+                // expected pattern "Oracle WebLogic Server 12.2.1.x.xxxxxx"
+                String[] strings = patch.psuBundle().split(" ");
+                return strings[strings.length - 1];
+            }
+        }
+        return null;
+    }
+
     /**
      * Validate patches conflicts by passing a list of patches.
      *

imagetool/src/test/java/com/oracle/weblogic/imagetool/aru/AruUtilTest.java

@@ -67,7 +67,8 @@ Document getRecommendedPatchesMetadata(AruProduct product, String releaseNumber,
                                                String password) throws XPathExpressionException, AruException {
             Document result;
             try {
-                if (releaseNumber.equals("336")) {
+                // these release numbers are fake test data from the fake releases.xml found in test/resources
+                if (releaseNumber.equals("336") || releaseNumber.equals("304")) {
                     result = getResource("/recommended-patches.xml");
                 } else {
                     result = getResource("/no-patches.xml");