Merge branch 'java-poc' of gitlab-odx.oracledx.com:weblogic/image-builder into java-poc

Former-commit-id: f9d9a81b7a86a47dcb08b886ff08bea1214fb715

Author: gosurya-oracle

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

@@ -1,5 +1,6 @@
 package com.oracle.weblogicx.imagebuilder.builder.util;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
@@ -70,25 +71,27 @@ public static void getAllFMWReleases(String userId, String password) throws IOEx
     /**
      * Download the latest WLS patches(PSU) for the release
      *
-     * @param release release number
+     * @param version release number
      * @param userId userid for support account
      * @param password password for support account
      * @throws IOException  when failed to access the aru api
      */
-    public static void getLatestWLSPatches(String release, String userId, String password) throws IOException {
-        getLatestPSU("wls", release, userId, password);
+    public static void getLatestWLSPSU(String version, String userId, String password) throws IOException {
+        String releaseNumber = getReleaseNumber("wls", version, userId, password);
+        getLatestPSU("wls", releaseNumber, userId, password);
     }
 
     /**
      * Download the latest FMW patches(PSU) for the release
      *
-     * @param release release number
+     * @param version version number 12.2.1.3.0
      * @param userId userid for support account
      * @param password password for support account
      * @throws IOException  when failed to access the aru api
      */
-    public static  void getLatestFMWPatches(String release, String userId, String password) throws IOException {
-        getLatestPSU("fmw", release, userId, password);
+    public static  void getLatestFMWPSU(String version, String userId, String password) throws IOException {
+        String releaseNumber = getReleaseNumber("wls", version, userId, password);
+        getLatestPSU("fmw", releaseNumber, userId, password);
     }
 
     /**
@@ -187,7 +190,7 @@ private static  Document getAllReleases(String category, String userId, String p
             }
 
             doc.appendChild(element);
-            XPathUtil.prettyPrint(doc);
+            //XPathUtil.prettyPrint(doc);
 
             return doc;
 
@@ -210,7 +213,8 @@ private static  void getLatestPSU(String category, String release, String userId
 
         Document allPatches = HttpUtil.getXMLContent(expression, userId, password);
 
-        savepatch(allPatches, userId, password);
+        //XPathUtil.prettyPrint(allPatches);
+        savePatch(allPatches, userId, password);
     }
 
     private static void getPatch(String category, String patchNumber, String userId, String password) throws
@@ -229,33 +233,38 @@ private static void getPatch(String category, String patchNumber, String userId,
 
         Document allPatches = HttpUtil.getXMLContent(url, userId, password);
 
-        savepatch(allPatches, userId, password);
+        savePatch(allPatches, userId, password);
 
 
 
     }
 
-    private static  void savepatch(Document allPatches, String userId, String password) throws IOException {
+    private static void savePatch(Document allPatches, String userId, String password) throws IOException {
         try {
 
             // TODO: needs to make sure there is one and some filtering if not sorting
 
             String downLoadLink = XPathUtil.applyXPathReturnString(allPatches, "string"
                 + "(/results/patch[1]/files/file/download_url/text())");
 
-            String doloadHost = XPathUtil.applyXPathReturnString(allPatches, "string"
+            String downLoadHost = XPathUtil.applyXPathReturnString(allPatches, "string"
                 + "(/results/patch[1]/files/file/download_url/@host)");
 
-            String bugname  = XPathUtil.applyXPathReturnString(allPatches, "string"
-                + "(/results/patch[1]/name");
+            String bugName  = XPathUtil.applyXPathReturnString(allPatches, "/results/patch[1]/name");
 
-            // TODO find the download location
 
-            String fileName = bugname + ".zip";
+            int index = downLoadLink.indexOf("patch_file=");
 
-            HttpUtil.downloadFile(doloadHost+downLoadLink, fileName, userId, password);
+            if (index > 0) {
+                String fileName = CacheDownLoadUtil.getDownloadRoot() + File.separator + downLoadLink.substring
+                    (index+"patch_file=".length());
 
-            // TODO need method to update the cache data table ?
+                if (!CacheDownLoadUtil.existsInCache(bugName, fileName)) {
+                    HttpUtil.downloadFile(downLoadHost+downLoadLink, fileName, userId, password);
+                }
+
+                CacheDownLoadUtil.updateTableOfContext(bugName, fileName);
+            }
 
         } catch (XPathExpressionException xpe) {
             throw new IOException(xpe);
@@ -278,7 +287,7 @@ private static String getReleaseNumber(String category, String version, String u
     }
 
     public static void main(String args[]) throws Exception {
-        String release = ARUUtil.getWLSReleaseNumber("121.2.1.3.0","[email protected]", "iJCPiUah7jdmLk1E");
+        ARUUtil.getLatestWLSPSU("12.2.1.3.0","[email protected]", "iJCPiUah7jdmLk1E");
     }
 
 

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

@@ -0,0 +1,26 @@
+package com.oracle.weblogicx.imagebuilder.builder.util;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class CacheDownLoadUtil {
+    public static String getDownloadRoot() {
+        return "/tmp";
+    }
+
+    public static boolean existsInCache(String bugNumber, String fileName) {
+        String fullPatchName = getDownloadRoot() + File.separator + fileName;
+        Path path = Paths.get(fullPatchName);
+        if (Files.exists(path))
+            return true;
+        else
+            System.out.println("already downloaded");
+
+        return false;
+    }
+
+    public static void updateTableOfContext(String bugNumber, String fileName) {}
+
+}

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

@@ -79,13 +79,13 @@ public static Document getXMLContent(String url, String username, String passwor
      * Downlod a file from the url
      *
      * @param url  url of the aru server
-     * @param destination full path to save the file
+     * @param fileName full path to save the file
      * @param username userid for support account
      * @param password password for support account
      * @throws IOException when it fails to access the url
      */
 
-    public static void downloadFile(String url, String destination, String username, String password)
+    public static void downloadFile(String url, String fileName, String username, String password)
         throws IOException {
         RequestConfig.Builder config = RequestConfig.custom();
         config.setCircularRedirectsAllowed(true);
@@ -103,7 +103,7 @@ public static void downloadFile(String url, String destination, String username,
         httpExecutor.use(cookieStore);
 
         httpExecutor.execute(Request.Get(url).connectTimeout(30000).socketTimeout(30000))
-            .saveContent(new File(destination));
+            .saveContent(new File(fileName));
 
     }
 
@@ -117,7 +117,7 @@ public static void downloadFile(String url, String destination, String username,
      * @return
      * @throws IOException
      */
-    
+
     public static String checkConflicts(String url, String payload, String username, String password)
         throws IOException {
         RequestConfig.Builder config = RequestConfig.custom();