X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Fcommon.git;a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Faai%2FAaiQuery.java;h=f409c27c57b67a934c53ef74c2f21330331e04bf;hp=b11cafc4fd81255adc297685ad2c78fdf34ea9fe;hb=490fc3c1fafe50d5fb0e23db5cfd10730be96866;hpb=3e5ddaee6984869b67dda89b7f8e1932a2b27045 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 b11cafc..f409c27 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 @@ -13,12 +13,6 @@ */ package org.onap.holmes.common.aai; -import java.io.IOException; -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.apache.http.client.methods.HttpGet; @@ -30,6 +24,12 @@ import org.onap.holmes.common.aai.entity.VnfEntity; import org.onap.holmes.common.exception.CorrelationException; import org.onap.holmes.common.utils.HttpsUtils; +import javax.inject.Inject; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + @Service @Slf4j public class AaiQuery { @@ -94,30 +94,6 @@ public class AaiQuery { return "https://aai.onap:8443" + 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]; - if (conv.length > 1) { - for (int i = 1; i < conv.length; i++) { - addrSplits[2] = addrSplits[2] + conv[i].substring(0, 1).toUpperCase() + conv[i] - .substring(1); - } - } - String ret = addrSplits[1]; - addrSplits[1] = addrSplits[0] + "-" + addrSplits[2]; - addrSplits[2] = ret; - addrSplits[0] = "api"; - StringBuilder stringBuffer = new StringBuilder(); - for (String split : addrSplits) { - stringBuffer.append("/" + split); - } - return stringBuffer.toString(); - } - private String getResponse(String url) throws CorrelationException { String response; CloseableHttpClient httpClient = null;