wrap search result in an object

Former-commit-id: 1a0edceb57a9caab379feb2790f993121f71d410

Author: jshum2479

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

@@ -105,7 +105,8 @@ public static String getLatestPSUFor(String category, String version, String use
      * @return Document listing of all patches (full details)
      * @throws IOException when failed
      */
-    public static Document getAllPSUFor(String category, String version, String userId, String password) throws IOException {
+    public static SearchResult getAllPSUFor(String category, String version, String userId, String password) throws
+        IOException {
         String releaseNumber = getReleaseNumber(category, version, userId, password);
         return getAllPSU(category, releaseNumber, userId, password);
     }
@@ -221,7 +222,7 @@ public static ValidationResult validatePatches(List<String> patches, String cate
      * @return dom document detail about the patch
      * @throws IOException when something goes wrong
      */
-    public static Document getPatchDetail(String category, String version, String bugNumber, String userId, String
+    public static SearchResult getPatchDetail(String category, String version, String bugNumber, String userId, String
         password)
         throws
         IOException {
@@ -233,7 +234,26 @@ public static Document getPatchDetail(String category, String version, String bu
         else
             url = String.format(PATCH_SEARCH_URL, FMW_PROD_ID, bugNumber, releaseNumber);
 
-        return HttpUtil.getXMLContent(url, userId, password);
+        return getSearchResult(HttpUtil.getXMLContent(url, userId, password));
+    }
+
+    private static SearchResult getSearchResult(Document result) throws IOException {
+        SearchResult returnResult = new SearchResult();
+        returnResult.setSuccess(true);
+
+        try {
+            NodeList nodeList = XPathUtil.applyXPathReturnNodeList(result, "/results/error");
+            if (nodeList.getLength() > 0 ) {
+                returnResult.setSuccess(false);
+                returnResult.setErrorMessage(XPathUtil.applyXPathReturnString(result, "/results/error/message"));
+            } else {
+                returnResult.setResults(result);
+            }
+        } catch (XPathExpressionException xpe ) {
+            throw new IOException(xpe);
+        }
+
+        return returnResult;
 
     }
 
@@ -280,26 +300,27 @@ private static  Document getAllReleases(String category, String userId, String p
     private static String getLatestPSU(String category, String release, String userId, String password) throws
         IOException {
 
-        String expression;
+        String url;
         if ("wls".equalsIgnoreCase(category))
-            expression = String.format(LATEST_PSU_URL, WLS_PROD_ID, release);
+            url = String.format(LATEST_PSU_URL, WLS_PROD_ID, release);
         else
-            expression = String.format(LATEST_PSU_URL, FMW_PROD_ID, release);
+            url = String.format(LATEST_PSU_URL, FMW_PROD_ID, release);
 
-        Document allPatches = HttpUtil.getXMLContent(expression, userId, password);
+        Document allPatches = HttpUtil.getXMLContent(url, userId, password);
         return savePatch(allPatches, userId, password);
     }
 
-    private static Document getAllPSU(String category, String release, String userId, String password) throws
+    private static SearchResult getAllPSU(String category, String release, String userId, String password) throws
         IOException {
 
-        String expression;
+        String url;
         if ("wls".equalsIgnoreCase(category))
-            expression = String.format(LATEST_PSU_URL, WLS_PROD_ID, release);
+            url = String.format(LATEST_PSU_URL, WLS_PROD_ID, release);
         else
-            expression = String.format(LATEST_PSU_URL, FMW_PROD_ID, release);
+            url = String.format(LATEST_PSU_URL, FMW_PROD_ID, release);
+
+        return getSearchResult(HttpUtil.getXMLContent(url, userId, password));
 
-        return HttpUtil.getXMLContent(expression, userId, password);
     }
 
     private static String getPatch(String category, String version, String bugNumber, String userId, String password)
@@ -386,7 +407,6 @@ public static boolean checkCredentials(String username, String password) {
         }
         return true;
     }
-
-
+    
 }
 

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

@@ -0,0 +1,53 @@
+package com.oracle.weblogicx.imagebuilder.builder.util;
+
+import org.w3c.dom.Document;
+
+public class SearchResult {
+    private boolean success;
+    private Document results;
+    private String errorMessage;
+
+    /**
+     * Get the error errorMessage
+     *
+     * @return
+     */
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    /**
+     * Set the error errorMessage
+     *
+     * @param errorMessage
+     */
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    /**
+     *
+     * @return  true if no conflicts ; false if there is conflicts
+     *
+     */
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    /**
+     *
+     * @return dom document detailing about the conflicts
+     */
+    public Document getResults() {
+        return results;
+    }
+
+    public void setResults(Document results) {
+        this.results = results;
+    }
+
+}

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

@@ -10,6 +10,28 @@ public class ValidationResult {
     private boolean success;
     private Document results;
 
+    private String errorMessage;
+
+    /**
+     * Get the error errorMessage
+     *
+     * @return
+     */
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    /**
+     * Set the error errorMessage
+     *
+     * @param errorMessage
+     */
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+
+
     /**
      *
      * @return  true if no conflicts ; false if there is conflicts