summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
d464ff6)
Issue-ID: HOLMES-104
Change-Id: I40d490e535923e6c66b9b4ed3ffb822e675797ab
Signed-off-by: Shiwei Tian <tian.shiwei@zte.com.cn>
import lombok.Getter;
import lombok.Setter;
import lombok.Getter;
import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpResponse;
import org.apache.http.HttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
import org.onap.holmes.common.api.stat.VesAlarm;
import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;
import org.onap.holmes.common.exception.CorrelationException;
import org.onap.holmes.common.api.stat.VesAlarm;
import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;
import org.onap.holmes.common.exception.CorrelationException;
public class Subscriber {
private DMaaPResponseUtil dMaaPResponseUtil = ServiceLocatorHolder.getLocator()
public class Subscriber {
private DMaaPResponseUtil dMaaPResponseUtil = ServiceLocatorHolder.getLocator()
private List<String> getDMaaPData() throws Exception {
String response;
private List<String> getDMaaPData() throws Exception {
String response;
+ CloseableHttpClient closeableHttpClient = null;
+ closeableHttpClient = HttpsUtils.getHttpClient(timeout);
HttpResponse httpResponse = HttpsUtils
HttpResponse httpResponse = HttpsUtils
- .get(url + "/" + consumerGroup + "/" + consumer, new HashMap<>(), timeout);
+ .get(url + "/" + consumerGroup + "/" + consumer, new HashMap<>(), closeableHttpClient);
response = HttpsUtils.extractResponseEntity(httpResponse);
} catch (Exception e) {
throw e;
response = HttpsUtils.extractResponseEntity(httpResponse);
} catch (Exception e) {
throw e;
+ } finally {
+ if (closeableHttpClient != null) {
+ try {
+ closeableHttpClient.close();
+ } catch (IOException e) {
+ log.warn("Failed to close http client!");
+ }
+ }
}
return GsonUtil.jsonToBean(response, List.class);
}
}
return GsonUtil.jsonToBean(response, List.class);
}
import java.util.HashMap;
import org.apache.http.HttpResponse;
import java.util.HashMap;
import org.apache.http.HttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
import org.glassfish.hk2.api.ServiceLocator;
import org.junit.Before;
import org.junit.Test;
import org.glassfish.hk2.api.ServiceLocator;
import org.junit.Before;
import org.junit.Test;
PowerMockito.mockStatic(HttpsUtils.class);
HttpResponse httpResponse = PowerMockito.mock(HttpResponse.class);
PowerMockito.when(HttpsUtils.get(Matchers.eq("https://www.onap.org/group/consumer"),
PowerMockito.mockStatic(HttpsUtils.class);
HttpResponse httpResponse = PowerMockito.mock(HttpResponse.class);
PowerMockito.when(HttpsUtils.get(Matchers.eq("https://www.onap.org/group/consumer"),
- Matchers.any(HashMap.class), Matchers.eq(15000))).thenReturn(httpResponse);
+ Matchers.any(HashMap.class), Matchers.any(CloseableHttpClient.class))).thenReturn(httpResponse);
PowerMockito.when(HttpsUtils.extractResponseEntity(httpResponse)).thenReturn(responseJson);
PowerMock.replayAll();
PowerMockito.when(HttpsUtils.extractResponseEntity(httpResponse)).thenReturn(responseJson);
PowerMock.replayAll();
<dependency>\r
<groupId>org.onap.msb.java-sdk</groupId>\r
<artifactId>msb-java-sdk</artifactId>\r
<dependency>\r
<groupId>org.onap.msb.java-sdk</groupId>\r
<artifactId>msb-java-sdk</artifactId>\r
- <version>1.1.0-SNAPSHOT</version>\r
+ <version>1.1.1-SNAPSHOT</version>\r
</dependency>\r
<dependency>\r
<groupId>org.easymock</groupId>\r
</dependency>\r
<dependency>\r
<groupId>org.easymock</groupId>\r