Merge pull request #38 from oracle/fmwfix1

Fix FMW image with latestPSU, it should include base WLS also.

Author: ddsharpe

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

@@ -178,6 +178,11 @@ List<String> handlePatchFiles(Path tmpDir, Path tmpPatchesDir) throws Exception
             if (latestPSU) {
                 toValidateSet.add(ARUUtil.getLatestPSUNumber(installerType.toString(), installerVersion,
                         userId, password));
+                if (installerType.toString().equals(Constants.INSTALLER_FMW)) {
+                    toValidateSet.add(ARUUtil.getLatestPSUNumber(Constants.INSTALLER_WLS, installerVersion,
+                        userId, password));
+                }
+
             }
             toValidateSet.addAll(patches);
 

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

@@ -143,6 +143,10 @@ public CommandResponse call() throws Exception {
                         if (latestPSU) {
                             toValidateSet.add(ARUUtil.getLatestPSUNumber(installerType.toString(), installerVersion,
                                     userId, password));
+                            if (installerType.toString().equals(Constants.INSTALLER_FMW)) {
+                                toValidateSet.add(ARUUtil.getLatestPSUNumber(Constants.INSTALLER_WLS, installerVersion,
+                                    userId, password));
+                            }
                         }
                         toValidateSet.addAll(patches);
                         ValidationResult validationResult =

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

@@ -225,6 +225,10 @@ public static ValidationResult validatePatches(String inventoryContent, List<Str
             payload.append("<candidate_patch_list>");
             for (String patch : patches) {
 
+                if (patch == null) {
+                    logger.finest("Skipping null patch");
+                    continue;
+                }
                 checkForMultiplePatches(patch, userId, password);
                 logger.info("Passed patch multiple versions test");
 

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

@@ -31,7 +31,8 @@ public final class Constants {
     public static final String METADATA_PREF_KEY = "metadata.file";
     public static final String DEFAULT_META_FILE = ".metadata";
     public static final String DELETE_ALL_FOR_SURE = "deleteAll4Sure";
-
+    public static final String INSTALLER_WLS = "wls";
+    public static final String INSTALLER_FMW = "fmw";
     public static final List<String> REQD_WDT_BUILD_ARGS = Stream.of(
             "DOMAIN_NAME", "ADMIN_NAME", "ADMIN_HOST", "ADMIN_PORT", "MANAGED_SERVER_PORT"
     ).collect(Collectors.toList());