merged from origin

Former-commit-id: b762e44e1b3abc15efeed4845e249c7b5c0e5291

Author: gosurya-oracle

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

@@ -4,6 +4,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -16,6 +18,7 @@
 import org.apache.http.client.HttpResponseException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -24,6 +27,7 @@
 import static com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver.CACHE_KEY_SEPARATOR;
 import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.CONFLICTCHECKER_URL;
 import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.FMW_PROD_ID;
+import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.GET_LSINVENTORY_URL;
 import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.LATEST_PSU_URL;
 import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.PATCH_SEARCH_URL;
 import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.REL_URL;
@@ -158,6 +162,7 @@ public static List<String> getPatchesFor(String category, String version, List<S
 
     /** Validate patches conflicts by passing a list of patches
      *
+     * @param lsInventoryPath  opatch lsinventory result path (null if non is passed)
      * @param patches  A list of patches number
      * @param category wls or fmw
      * @param version version of the prduct
@@ -167,18 +172,55 @@ public static List<String> getPatchesFor(String category, String version, List<S
      * @throws IOException  when failed to access the aru api
      */
 
-    public static ValidationResult validatePatches(List<String> patches, String category, String version, String userId, String
-        password) throws IOException {
+    public static ValidationResult validatePatches(String lsInventoryPath, List<String> patches, String category,
+        String version, String userId, String password) throws IOException {
 
 
         ValidationResult validationResult = new ValidationResult();
         validationResult.setSuccess(true);
         validationResult.setResults(null);
 
-        StringBuffer payload = new StringBuffer
-            ("<conflict_check_request><platform>2000</platform><target_patch_list/>");
         String releaseNumber = getReleaseNumber(category, version, userId, password);
 
+        StringBuffer payload = new StringBuffer
+            ("<conflict_check_request><platform>2000</platform>");
+
+        if (lsInventoryPath != null ) {
+            String inventoryContent = new String(Files.readAllBytes(Paths.get(lsInventoryPath)));
+            String upiPayload = "<inventory_upi_request><lsinventory_output>" + inventoryContent +
+                 "</lsinventory_output></inventory_upi_request>";
+
+            Document upiResult = HttpUtil.postCheckConflictRequest(GET_LSINVENTORY_URL, upiPayload, userId,
+                password);
+
+            try {
+                NodeList upi_list = XPathUtil.applyXPathReturnNodeList(upiResult,
+                    "/inventory_upi_response/upi");
+                if (upi_list.getLength() > 0) {
+                    payload.append("<target_patch_list>");
+
+                    for ( int ii=0; ii < upi_list.getLength(); ii++) {
+                        Node upi = upi_list.item(ii);
+                        NamedNodeMap m = upi.getAttributes();
+                        payload.append(String.format("<installed_patch upi=\"%s\"/>",
+                            m.getNamedItem("number").getNodeValue()));
+
+                    }
+                    payload.append("</target_patch_list>");
+                }
+                else {
+                    payload.append("<target_patch_list/>");
+                }
+            } catch(XPathExpressionException xpe) {
+                throw new IOException(xpe);
+
+            }
+
+        } else {
+            payload.append("<target_patch_list/>");
+        }
+
+
         for (String patch : patches) {
             payload.append(String.format("<candidate_patch_list rel_id=\"%s\">%s</conflict_check_request>",
                 releaseNumber, patch));

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

@@ -20,6 +20,7 @@ public final class Constants {
     static final String PATCH_SEARCH_URL="https://updates.oracle"
         + ".com/Orion/Services/search?product=%s&bug=%s&release=%s";
     static final String CONFLICTCHECKER_URL = "https://updates.oracle.com/Orion/Services/conflict_checks";
+    static final String GET_LSINVENTORY_URL = "https://updates.oracle.com/Orion/Services/get_inventory_upi";
     static final String WLS_PROD_ID = "15991";
     static final String FMW_PROD_ID = "27638";
     public static final String CACHE_DIR_KEY = "cache.dir";

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

@@ -104,12 +104,6 @@ private static HttpClient getOraClient(String userId, String password) {
 
     public static void downloadFile(String url, String fileName, String username, String password)
         throws IOException {
-//        HttpClient httpClient;
-//        if (username == null && password == null) {
-//            httpClient = HttpClientBuilder.create().useSystemProperties().build();
-//        } else {
-//            httpClient = getOraClient(username, password);
-//        }
         Executor.newInstance(getOraClient(username, password))
                 .execute(Request.Get(url).connectTimeout(30000).socketTimeout(30000))
                 .saveContent(new File(fileName));
@@ -141,10 +135,15 @@ public static Document postCheckConflictRequest(String url, String payload, Stri
         httpExecutor.use(cookieStore);
 
         // Has to do search first, otherwise results in 302
-        getXMLContent(REL_URL, username, password);
+        // MUST use the same httpExecutor to maintain session
+
+
+        httpExecutor
+            .execute(Request.Get(REL_URL).connectTimeout(30000).socketTimeout(30000))
+            .returnContent().asString();
 
         HttpEntity entity = MultipartEntityBuilder.create().setMode(HttpMultipartMode.BROWSER_COMPATIBLE)
-            .addPart(FormBodyPartBuilder.create("request_xml", new StringBody(payload, ContentType.TEXT_PLAIN)).build())
+            .addTextBody("request_xml", payload)
             .build();
 
         String xmlString =