Issue-ID: HOLMES-104
Change-Id: If76dcc6be77f698820fe4c7b9ae4f1d28f75e4c2
Signed-off-by: Shiwei Tian <tian.shiwei@zte.com.cn>
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpResponse;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
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.apache.http.impl.client.CloseableHttpClient;
import org.onap.holmes.common.api.stat.VesAlarm;
import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;
private List<String> getDMaaPData() throws Exception {
String response;
CloseableHttpClient closeableHttpClient = null;
private List<String> getDMaaPData() throws Exception {
String response;
CloseableHttpClient closeableHttpClient = null;
+ HttpGet httpGet = new HttpGet(url + "/" + consumerGroup + "/" + consumer);
try {
closeableHttpClient = HttpsUtils.getHttpClient(timeout);
HttpResponse httpResponse = HttpsUtils
try {
closeableHttpClient = HttpsUtils.getHttpClient(timeout);
HttpResponse httpResponse = HttpsUtils
- .get(url + "/" + consumerGroup + "/" + consumer, new HashMap<>(), closeableHttpClient);
+ .get(httpGet, new HashMap<>(), closeableHttpClient);
response = HttpsUtils.extractResponseEntity(httpResponse);
} catch (Exception e) {
throw e;
} finally {
response = HttpsUtils.extractResponseEntity(httpResponse);
} catch (Exception e) {
throw e;
} finally {
+ httpGet.releaseConnection();
if (closeableHttpClient != null) {
try {
closeableHttpClient.close();
if (closeableHttpClient != null) {
try {
closeableHttpClient.close();
import java.util.HashMap;
import org.apache.http.HttpResponse;
import java.util.HashMap;
import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.glassfish.hk2.api.ServiceLocator;
import org.junit.Before;
import org.apache.http.impl.client.CloseableHttpClient;
import org.glassfish.hk2.api.ServiceLocator;
import org.junit.Before;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
+import static org.easymock.EasyMock.anyObject;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
"\"specificProblem\": \"specificProblem\"," +
"\"vfStatus\": \"vfStatus\"" +
"}}}";
"\"specificProblem\": \"specificProblem\"," +
"\"vfStatus\": \"vfStatus\"" +
"}}}";
+ Subscriber subscriber = new Subscriber();
+ subscriber.setUrl("https://www.onap.org");
+ subscriber.setConsumerGroup("group");
+ subscriber.setConsumer("consumer");
List<String> responseList = new ArrayList<>();
responseList.add(eventString);
String responseJson = GsonUtil.beanToJson(responseList);
PowerMockito.mockStatic(HttpsUtils.class);
HttpResponse httpResponse = PowerMockito.mock(HttpResponse.class);
List<String> responseList = new ArrayList<>();
responseList.add(eventString);
String responseJson = GsonUtil.beanToJson(responseList);
PowerMockito.mockStatic(HttpsUtils.class);
HttpResponse httpResponse = PowerMockito.mock(HttpResponse.class);
- PowerMockito.when(HttpsUtils.get(Matchers.eq("https://www.onap.org/group/consumer"),
+ PowerMockito.when(HttpsUtils.get(Matchers.any(HttpGet.class),
Matchers.any(HashMap.class), Matchers.any(CloseableHttpClient.class))).thenReturn(httpResponse);
PowerMockito.when(HttpsUtils.extractResponseEntity(httpResponse)).thenReturn(responseJson);
PowerMock.replayAll();
Matchers.any(HashMap.class), Matchers.any(CloseableHttpClient.class))).thenReturn(httpResponse);
PowerMockito.when(HttpsUtils.extractResponseEntity(httpResponse)).thenReturn(responseJson);
PowerMock.replayAll();
- Subscriber subscriber = new Subscriber();
- subscriber.setUrl("https://www.onap.org");
- subscriber.setConsumerGroup("group");
- subscriber.setConsumer("consumer");
List<VesAlarm> vesAlarms = subscriber.subscribe();
PowerMock.verifyAll();
List<VesAlarm> vesAlarms = subscriber.subscribe();
PowerMock.verifyAll();
<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.1-SNAPSHOT</version>\r
+ <version>1.1.1</version>\r
</dependency>\r
<dependency>\r
<groupId>org.easymock</groupId>\r
</dependency>\r
<dependency>\r
<groupId>org.easymock</groupId>\r