diff options
author | Shiwei Tian <tian.shiwei@zte.com.cn> | 2018-03-06 08:48:24 +0800 |
---|---|---|
committer | Shiwei Tian <tian.shiwei@zte.com.cn> | 2018-03-06 09:17:02 +0800 |
commit | f831daf1d824b91697819a5d680fba87dcf91337 (patch) | |
tree | b13ddeaf08df679c998ef1459b7dee98302a6dcf /dmaap-dsa/src/main/java/org | |
parent | 7605bdd5ca1ab64f449c930bbab5440f88b4386b (diff) |
Change HTTP Requests into HTTPS Ones
Issue-ID: HOLMES-104
Change-Id: I17677ce9bcdf14548fe43408382ebaba7e861ac3
Signed-off-by: Shiwei Tian <tian.shiwei@zte.com.cn>
Diffstat (limited to 'dmaap-dsa/src/main/java/org')
-rw-r--r-- | dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java b/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java index d67b901..4d0b058 100644 --- a/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java +++ b/dmaap-dsa/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java @@ -18,16 +18,16 @@ package org.onap.holmes.dsa.dmaappolling; import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; import lombok.Getter; import lombok.Setter; +import org.apache.http.HttpResponse; 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.utils.GsonUtil; +import org.onap.holmes.common.utils.HttpsUtils; @Getter @Setter @@ -75,11 +75,16 @@ public class Subscriber { } } - private List<String> getDMaaPData() { - Client client = ClientBuilder.newClient(); - WebTarget webTarget = client.target(url + "/" + consumerGroup + "/" + consumer); - Response response = webTarget.queryParam("timeout", timeout).request().get(); - return response.readEntity(List.class); + private List<String> getDMaaPData() throws Exception { + String response; + try { + HttpResponse httpResponse = HttpsUtils + .get(url + "/" + consumerGroup + "/" + consumer, new HashMap<>(), timeout); + response = HttpsUtils.extractResponseEntity(httpResponse); + } catch (Exception e) { + throw e; + } + return GsonUtil.jsonToBean(response, List.class); } private List<VesAlarm> extractVesAlarm(List<String> responseEntity) throws IOException { |