*/
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;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.impl.client.CloseableHttpClient;
import org.jvnet.hk2.annotations.Service;
import org.onap.holmes.common.aai.config.AaiConfig;
import org.onap.holmes.common.aai.entity.VmEntity;
import org.onap.holmes.common.aai.entity.VnfEntity;
-import org.onap.holmes.common.config.MicroServiceConfig;
import org.onap.holmes.common.exception.CorrelationException;
-import org.onap.holmes.common.utils.HttpsUtils;
+import org.onap.holmes.common.utils.JerseyClient;
+
+import javax.inject.Inject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Service
@Slf4j
}
private String getVmUrl(String vserverId, String vserverName) throws CorrelationException {
- String url = "";
String resourceLinkUrl = getVmResourceLinks(vserverId, vserverName);
return getBaseUrl("") + resourceLinkUrl;
}
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;
- HttpGet httpGet = new HttpGet(url);
try {
- httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT);
- HttpResponse httpResponse = HttpsUtils.get(httpGet, getHeaders(), httpClient);
- response = HttpsUtils.extractResponseEntity(httpResponse);
+ return new JerseyClient().headers(getHeaders()).get(url);
} catch (Exception e) {
throw new CorrelationException("Failed to get data from aai", e);
- } finally {
- httpGet.releaseConnection();
- if (httpClient != null) {
- try {
- httpClient.close();
- } catch (IOException e) {
- log.warn("Failed to close http client!");
- }
- }
}
- return response;
}
private Map getHeaders() {