change return type

Former-commit-id: 6ccfcdbb4a16c7f7d33f49663dc61c177f0460d4

Author: jshum2479

src/main/java/com/oracle/weblogicx/imagebuilder/builder/util/ARUUtil.java

@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -75,10 +76,11 @@ public static void getAllFMWReleases(String userId, String password) throws IOEx
      * @param userId userid for support account
      * @param password password for support account
      * @throws IOException  when failed to access the aru api
+     * @return String bug number
      */
-    public static void getLatestWLSPSU(String version, String userId, String password) throws IOException {
+    public static String getLatestWLSPSU(String version, String userId, String password) throws IOException {
         String releaseNumber = getReleaseNumber("wls", version, userId, password);
-        getLatestPSU("wls", releaseNumber, userId, password);
+        return getLatestPSU("wls", releaseNumber, userId, password);
     }
 
     /**
@@ -88,10 +90,11 @@ public static void getLatestWLSPSU(String version, String userId, String passwor
      * @param userId userid for support account
      * @param password password for support account
      * @throws IOException  when failed to access the aru api
+     * @return String bug number
      */
-    public static  void getLatestFMWPSU(String version, String userId, String password) throws IOException {
+    public static String getLatestFMWPSU(String version, String userId, String password) throws IOException {
         String releaseNumber = getReleaseNumber("wls", version, userId, password);
-        getLatestPSU("fmw", releaseNumber, userId, password);
+        return getLatestPSU("fmw", releaseNumber, userId, password);
     }
 
     /**
@@ -102,10 +105,16 @@ public static  void getLatestFMWPSU(String version, String userId, String passwo
      * @param password password for support account
      * @throws IOException  when failed to access the aru api
      */
-    public static  void getWLSPatches(List<String> patches, String userId, String password) throws
+    public static  List<String>  getWLSPatches(List<String> patches, String userId, String password) throws
         IOException {
-        for (String patch : patches)
-            getPatch("wls", patch, userId, password);
+        List<String> results = new ArrayList<>();
+        for (String patch : patches) {
+            String rs = getPatch("wls", patch, userId, password);
+            if (rs != null) {
+                results.add(rs);
+            }
+        }
+        return results;
     }
 
     /**
@@ -116,10 +125,17 @@ public static  void getWLSPatches(List<String> patches, String userId, String pa
      * @param password password for support account
      * @throws IOException  when failed to access the aru api
      */
-    public static  void getFMWPatches(String category, List<String> patches, String userId, String password) throws
+    public static List<String> getFMWPatches(String category, List<String> patches, String userId, String password)
+        throws
         IOException {
-        for (String patch : patches)
-            getPatch("fmw", patch, userId, password);
+        List<String> results = new ArrayList<>();
+        for (String patch : patches) {
+            String rs = getPatch("fmw", patch, userId, password);
+            if (rs != null) {
+                results.add(rs);
+            }
+        }
+        return results;
     }
 
     /**
@@ -201,7 +217,8 @@ private static  Document getAllReleases(String category, String userId, String p
 
     }
 
-    private static  void getLatestPSU(String category, String release, String userId, String password) throws IOException {
+    private static String getLatestPSU(String category, String release, String userId, String password) throws
+        IOException {
 
         String xpath = "https://updates.oracle"
             + ".com/Orion/Services/search?product=%s&release=%s";
@@ -214,10 +231,10 @@ private static  void getLatestPSU(String category, String release, String userId
         Document allPatches = HttpUtil.getXMLContent(expression, userId, password);
 
         //XPathUtil.prettyPrint(allPatches);
-        savePatch(allPatches, userId, password);
+        return savePatch(allPatches, userId, password);
     }
 
-    private static void getPatch(String category, String patchNumber, String userId, String password) throws
+    private static String getPatch(String category, String patchNumber, String userId, String password) throws
         IOException {
 
         //        HTTP_STATUS=$(curl -v -w "%{http_code}" -b cookies.txt -L --header 'Authorization: Basic ${basicauth}' "https://updates.oracle.com/Orion/Services/search?product=15991&release=$releaseid&include_prereqs=true" -o latestpsu.xml)
@@ -233,13 +250,10 @@ private static void getPatch(String category, String patchNumber, String userId,
 
         Document allPatches = HttpUtil.getXMLContent(url, userId, password);
 
-        savePatch(allPatches, userId, password);
-
-
-
+        return savePatch(allPatches, userId, password);
     }
 
-    private static void savePatch(Document allPatches, String userId, String password) throws IOException {
+    private static String savePatch(Document allPatches, String userId, String password) throws IOException {
         try {
 
             // TODO: needs to make sure there is one and some filtering if not sorting
@@ -264,12 +278,14 @@ private static void savePatch(Document allPatches, String userId, String passwor
                 }
 
                 CacheDownLoadUtil.updateTableOfContext(bugName, fileName);
+                return bugName;
             }
 
         } catch (XPathExpressionException xpe) {
             throw new IOException(xpe);
         }
 
+        return null;
     }
 
     private static String getReleaseNumber(String category, String version, String userId, String password) throws