Code Review
/
holmes
/
common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change HTTP Requests into HTTPS Ones
[holmes/common.git]
/
holmes-actions
/
src
/
main
/
java
/
org
/
onap
/
holmes
/
common
/
aai
/
AaiQuery.java
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
48e6ec0
..
ef96476
100644
(file)
--- 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;
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 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;
import org.jvnet.hk2.annotations.Service;
import org.onap.holmes.common.aai.config.AaiConfig;
import org.onap.holmes.common.aai.entity.VmEntity;
@@
-65,7
+67,11
@@
public class AaiQuery {
private String getVmResourceLinks(String vserverId, String vserverName) throws CorrelationException {
String response = getResourceLinksResponse(vserverId, vserverName);
private String getVmResourceLinks(String vserverId, String vserverName) throws CorrelationException {
String response = getResourceLinksResponse(vserverId, vserverName);
- return aaiResponseUtil.convertJsonToVmResourceLink(response).get(0).getResourceLink();
+ List linkList = aaiResponseUtil.convertJsonToVmResourceLink(response);
+ if (linkList.size() != 0) {
+ return aaiResponseUtil.convertJsonToVmResourceLink(response).get(0).getResourceLink();
+ }
+ return "";
}
private String getResourceLinksResponse(String vserverId, String vserverName) throws CorrelationException {
}
private String getResourceLinksResponse(String vserverId, String vserverName) throws CorrelationException {
@@
-108,6
+114,9
@@
public class AaiQuery {
}
private String getMsbSuffixAddr(String suffixUrl) {
}
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];
String[] addrSplits = suffixUrl.substring(1).split("/");
String[] conv = addrSplits[2].split("-");
addrSplits[2] = conv[0];
@@
-129,9
+138,10
@@
public class AaiQuery {
}
private String getResponse(String url) throws CorrelationException {
}
private String getResponse(String url) throws CorrelationException {
- String response
= ""
;
+ String response;
try {
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);
}
} catch (Exception e) {
throw new CorrelationException("Failed to get data from aai", e);
}