X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Faai%2FAaiQuery.java;h=ef96476603aa0ecfb5cedd58362255f64061f46d;hb=bf20ddf00200c5468da7a0090caf28beebb93e9c;hp=b80c40ebfa13316cb036bce9b028f3cfdab9d3c5;hpb=1be6bdd6b55219294a9ce6f708433fef3737cc13;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
index b80c40e..ef96476 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
@@ -14,9 +14,11 @@
 package org.onap.holmes.common.aai;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import javax.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
 import org.jvnet.hk2.annotations.Service;
 import org.onap.holmes.common.aai.config.AaiConfig;
 import org.onap.holmes.common.aai.entity.VmEntity;
@@ -65,11 +67,11 @@ public class AaiQuery {
 
     private String getVmResourceLinks(String vserverId, String vserverName) throws CorrelationException {
         String response = getResourceLinksResponse(vserverId, vserverName);
-        try {
+        List linkList = aaiResponseUtil.convertJsonToVmResourceLink(response);
+        if (linkList.size() != 0) {
             return aaiResponseUtil.convertJsonToVmResourceLink(response).get(0).getResourceLink();
-        } catch (Exception e) {
-            throw new CorrelationException("Failed to get aai resource link", e);
         }
+        return  "";
     }
 
     private String getResourceLinksResponse(String vserverId, String vserverName) throws CorrelationException {
@@ -112,6 +114,9 @@ public class AaiQuery {
     }
 
     private String getMsbSuffixAddr(String suffixUrl) {
+        if (suffixUrl.length() <= 0) {
+            return "";
+        }
         String[] addrSplits = suffixUrl.substring(1).split("/");
         String[] conv = addrSplits[2].split("-");
         addrSplits[2] = conv[0];
@@ -133,9 +138,10 @@ public class AaiQuery {
     }
 
     private String getResponse(String url) throws CorrelationException {
-        String response = "";
+        String response;
         try {
-            response = HttpsUtils.get(url, getHeaders());
+            HttpResponse httpResponse = HttpsUtils.get(url, getHeaders());
+            response = HttpsUtils.extractResponseEntity(httpResponse);
         } catch (Exception e) {
             throw new CorrelationException("Failed to get data from aai", e);
         }