X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dmaap-dsa%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fdsa%2Fdmaappolling%2FSubscriber.java;h=4d0b058bd3f0d829268747a28e715cbe5e275ee7;hb=refs%2Fchanges%2F57%2F34157%2F2;hp=572872b1987660065d772cce6b485e998bca1af7;hpb=7f217967fd086a172d89bfb7db21160b4a895504;p=holmes%2Fdsa.git

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 572872b..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,17 +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.glassfish.jersey.client.ClientConfig;
+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
@@ -57,8 +56,8 @@ public class Subscriber {
     private boolean secure;
     private String topic;
     private String url;
-    private String consumerGroup = "homlesGrounp1";
-    private String consumer = "homlesGrounp1";
+    private String consumerGroup = "homlesGroup1";
+    private String consumer = "homles1";
     private String authInfo;
     private String authExpDate;
 
@@ -67,7 +66,7 @@ public class Subscriber {
         try {
             response = getDMaaPData();
         } catch (Exception e) {
-            throw new CorrelationException("Failed to get DMapp data.", e);
+            throw new CorrelationException("Failed to get data from DMaaP.", e);
         }
         try {
             return extractVesAlarm(response);
@@ -76,11 +75,16 @@ public class Subscriber {
         }
     }
 
-    private List<String> getDMaaPData() {
-        Client client = ClientBuilder.newClient(new ClientConfig());
-        WebTarget webTarget = client.target(url + "/" + consumerGroup + "/" + consumer);
-        Response response = webTarget.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 {