Refactored JerseyClient

[holmes/common.git] / holmes-actions / src / main / java / org / onap / holmes / common / dmaap / Publisher.java

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
index 7201f36..23a04d6 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
@@ -15,45 +15,23 @@
  */\r
 package org.onap.holmes.common.dmaap;\r
 \r
-import com.alibaba.fastjson.JSON;\r
-import javax.ws.rs.client.Client;\r
-import javax.ws.rs.client.ClientBuilder;\r
-import javax.ws.rs.client.Entity;\r
-import javax.ws.rs.client.WebTarget;\r
-import javax.ws.rs.core.MediaType;\r
-import javax.ws.rs.core.Response;\r
 import lombok.Getter;\r
 import lombok.Setter;\r
-import org.apache.http.HttpStatus;\r
 import org.jvnet.hk2.annotations.Service;\r
 import org.onap.holmes.common.dmaap.entity.PolicyMsg;\r
-import org.onap.holmes.common.exception.CorrelationException;\r
+import org.onap.holmes.common.utils.JerseyClient;\r
+\r
+import javax.ws.rs.client.Entity;\r
+import java.util.concurrent.TimeUnit;\r
 \r
 @Getter\r
 @Setter\r
 @Service\r
 public class Publisher {\r
-\r
-    private String topic;\r
     private String url;\r
-    private String authInfo;\r
-    private String authExpDate;\r
-\r
-    public boolean publish(PolicyMsg msg) throws CorrelationException {\r
-        Client client = ClientBuilder.newClient();\r
-        String content = JSON.toJSONString(msg);\r
-        WebTarget webTarget = client.target(url);\r
-        Response response = null;\r
-        try {\r
-            response = webTarget.request(MediaType.APPLICATION_JSON)\r
-                    .post(Entity.entity(content, MediaType.APPLICATION_JSON));\r
-        } catch (Exception e) {\r
-            throw new CorrelationException("Failed to connect to DCAE.", e);\r
-        }\r
-        return checkStatus(response);\r
-    }\r
+    private JerseyClient client = JerseyClient.newInstance(TimeUnit.SECONDS.toMillis(30));\r
 \r
-    private boolean checkStatus(Response response) {\r
-        return response.getStatus() == HttpStatus.SC_OK;\r
+    public void publish(PolicyMsg msg) {\r
+        client.post(url, Entity.json(msg));\r
     }\r
 }\r