Added FMW Platform and Java Require Files ARU product IDs (#264)

Author: ddsharpe

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

@@ -9,6 +9,8 @@
 public enum AruProduct {
     WLS("15991", "Oracle WebLogic Server"),
     COH("13964", "Oracle Coherence"),
+    JRF("10120", "Oracle Java Required Files"),
+    FMWPLAT("27638", "FMW Platform"),
     OSB("16011", "Oracle Service Bus"),
     SOA("12745", "Oracle SOA Suite"),
     B2B("12745", "Oracle B2B"),
@@ -22,8 +24,8 @@ public enum AruProduct {
     //FIT("33256", "Fusion Internal Tools") No longer used after July 2020 PSU
     ;
 
-    private String productId;
-    private String description;
+    private final String productId;
+    private final String description;
     AruProduct(String productId, String description) {
         this.productId = productId;
         this.description = description;

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

@@ -156,7 +156,7 @@ List<AruPatch> getRecommendedPatches(AruProduct product, String version, String
             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()));
+                patches.forEach(p -> logger.fine("Discarding recommended patch {0} {1}", p.patchId(), p.description()));
                 logger.fine("Recommended patch list contains a PSU, getting recommendations for PSU version {0}",
                     psuVersion);
                 // get release number for PSU

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

@@ -20,14 +20,15 @@ public enum FmwInstallerType {
     // data from https://updates.oracle.com/Orion/Services/metadata?table=aru_products
 
     // Oracle WebLogic Server
-    WLSSLIM(Arrays.asList(AruProduct.WLS, AruProduct.COH),
+    WLS(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.FMWPLAT),
+        InstallerType.WLS),
+    WLSSLIM(Utils.list(WLS.products),
         InstallerType.WLSSLIM),
-    WLSDEV(Arrays.asList(AruProduct.WLS, AruProduct.COH),
+    WLSDEV(Utils.list(WLS.products),
         InstallerType.WLSDEV),
-    WLS(Arrays.asList(AruProduct.WLS, AruProduct.COH),
-        InstallerType.WLS),
+
     // Oracle WebLogic Server Infrastructure (JRF)
-    FMW(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.JDEV),
+    FMW(Utils.list(WLS.products, AruProduct.JRF, AruProduct.JDEV),
         InstallerType.FMW),
     // Oracle Service Bus
     OSB(Utils.list(FMW.products, AruProduct.OSB),
@@ -70,8 +71,8 @@ public enum FmwInstallerType {
         InstallerType.FMW, InstallerType.WCS)
     ;
 
-    private InstallerType[] installers;
-    private List<AruProduct> products;
+    private final InstallerType[] installers;
+    private final List<AruProduct> products;
     FmwInstallerType(List<AruProduct> products, InstallerType... installers) {
         this.installers = installers;
         this.products = products;

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

@@ -30,12 +30,12 @@ void fmwInstallerTypeListTest() {
 
     @Test
     void fmwInstallerProductIds() {
-        assertEquals(Arrays.asList(AruProduct.WLS, AruProduct.COH), FmwInstallerType.WLS.products(),
+        assertEquals(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.FMWPLAT), FmwInstallerType.WLS.products(),
             "WLS product list is incorrect or out of order");
-        assertEquals(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.JDEV),
+        assertEquals(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.FMWPLAT, AruProduct.JRF, 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");
+        assertEquals(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.FMWPLAT, AruProduct.JRF, AruProduct.JDEV,
+            AruProduct.SOA), FmwInstallerType.SOA.products(), "SOA product list is incorrect or out of order");
     }
 
     @Test

imagetool/src/test/resources/releases.xml

@@ -77,4 +77,6 @@
     <release id="606" name="12.1.0.1.0"><![CDATA[OSB 12.1.0.1.0]]></release>
     <release id="701" name="12.2.1.4.0"><![CDATA[Oracle Coherence 12.2.1.4.0]]></release>
     <release id="702" name="12.2.1.3.0"><![CDATA[Oracle Coherence 12.2.1.3.0]]></release>
+    <release id="801" name="12.2.1.3.0"><![CDATA[FMW Platform 12.2.1.3.0]]></release>
+    <release id="802" name="12.2.1.4.0"><![CDATA[FMW Platform 12.2.1.4.0]]></release>
 </results>