added JDeveloper product patches to FMW install types for recommendedPatches and LatestPSU (#198)

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/AruProduct.java

@@ -16,7 +16,8 @@ public enum AruProduct {
     OUD("19748", "Oracle Unified Directory"),
     WCC("13946", "Oracle WebCenter Content"),
     WCP("15224", "Oracle WebCenter Portal"),
-    WCS("20995", "Oracle WebCenter Sites")
+    WCS("20995", "Oracle WebCenter Sites"),
+    JDEV("11281", "Oracle JDeveloper")
     //FIT("33256", "Fusion Internal Tools") No longer used after July 2020 PSU
     ;
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java

@@ -26,43 +26,43 @@ public enum FmwInstallerType {
     WLS(Arrays.asList(AruProduct.WLS, AruProduct.COH),
         InstallerType.WLS),
     // Oracle WebLogic Server Infrastructure (JRF)
-    FMW(Arrays.asList(AruProduct.WLS, AruProduct.COH),
+    FMW(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.JDEV),
         InstallerType.FMW),
     // Oracle Service Bus
-    OSB(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.OSB),
+    OSB(Utils.list(FMW.products, AruProduct.OSB),
         InstallerType.FMW, InstallerType.OSB),
     // Oracle SOA Suite
-    SOA(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.SOA),
+    SOA(Utils.list(FMW.products, AruProduct.SOA),
         InstallerType.FMW, InstallerType.SOA),
     // Oracle SOA Suite (with Service Bus)
-    SOA_OSB(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.SOA, AruProduct.OSB),
+    SOA_OSB(Utils.list(FMW.products, AruProduct.SOA, AruProduct.OSB),
         InstallerType.FMW, InstallerType.SOA, InstallerType.OSB),
     // Oracle Identity Manager
-    IDM(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.IDM),
+    IDM(Utils.list(FMW.products, AruProduct.IDM),
         InstallerType.FMW, InstallerType.IDM),
     // Oracle Identity Manager
     IDM_WLS(Collections.singletonList(AruProduct.IDM),
         InstallerType.IDM),
     // Oracle Access Manager
-    OAM(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.OAM),
+    OAM(Utils.list(FMW.products, AruProduct.OAM),
         InstallerType.FMW, InstallerType.OAM),
     // Oracle Identity Governance
-    OIG(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.SOA, AruProduct.OSB, AruProduct.IDM),
+    OIG(Utils.list(FMW.products, AruProduct.SOA, AruProduct.OSB, AruProduct.IDM),
         InstallerType.FMW, InstallerType.SOA, InstallerType.OSB, InstallerType.IDM),
     // Oracle Unified Directory
     OUD(Collections.singletonList(AruProduct.OUD),
         InstallerType.OUD),
     // Oracle Unified Directory
-    OUD_WLS(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.OUD),
+    OUD_WLS(Utils.list(FMW.products, AruProduct.OUD),
         InstallerType.FMW, InstallerType.OUD),
     // Oracle WebCenter Content
-    WCC(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.WCC),
+    WCC(Utils.list(FMW.products, AruProduct.WCC),
         InstallerType.FMW, InstallerType.WCC),
     // Oracle WebCenter Portal
-    WCP(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.WCP),
+    WCP(Utils.list(FMW.products, AruProduct.WCP),
         InstallerType.FMW, InstallerType.WCP),
     // Oracle WebCenter Sites
-    WCS(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.WCS),
+    WCS(Utils.list(FMW.products, AruProduct.WCS),
         InstallerType.FMW, InstallerType.WCS)
     ;
 

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

@@ -21,8 +21,11 @@
 import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.List;
@@ -769,4 +772,18 @@ public static String getPsuVersion(String lsInventory) {
         logger.exiting(result);
         return result;
     }
+
+    /**
+     * Create a new list from an existing collection and adding additional elements, if desired.
+     * @param start a set of elements to start from
+     * @param elements zero to many additional elements to add to the new list
+     * @param <T> the class of the elements to add
+     * @return a new list of element T
+     */
+    @SafeVarargs
+    public static <T> List<T> list(Collection<? extends T> start, T... elements) {
+        List<T> result = new ArrayList<>(start);
+        Collections.addAll(result, elements);
+        return result;
+    }
 }

imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/InstallerTest.java

@@ -31,6 +31,10 @@ void fmwInstallerTypeListTest() {
     void fmwInstallerProductIds() {
         assertEquals(Arrays.asList(AruProduct.WLS, AruProduct.COH), FmwInstallerType.WLS.products(),
             "WLS product list is incorrect or out of order");
+        assertEquals(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.JDEV),
+            FmwInstallerType.FMW.products(), "FMW product list is incorrect or out of order");
+        assertEquals(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.JDEV, AruProduct.SOA),
+            FmwInstallerType.SOA.products(), "SOA product list is incorrect or out of order");
     }
 
     @Test