refactor the amqp client logic to have a separated class

1 files changed, 8 insertions, 41 deletions

diff --git a/src/main/java/org/traccar/forward/EventForwarderAmqp.java b/src/main/java/org/traccar/forward/EventForwarderAmqp.java
index 97f14d4ea..5c38a4459 100644
--- a/src/main/java/org/traccar/forward/EventForwarderAmqp.java
+++ b/src/main/java/org/traccar/forward/EventForwarderAmqp.java
@@ -15,64 +15,31 @@
  */
 package org.traccar.forward;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.rabbitmq.client.AMQP.BasicProperties;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
+
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
 
 import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Properties;
-import java.util.concurrent.TimeoutException;
 
 public class EventForwarderAmqp implements EventForwarder {
 
-    private final Channel channel;
+    private final AmqpClient amqpClient;
     private final ObjectMapper objectMapper;
 
-    private final String exchange;
-    private final String topic;
-
     public EventForwarderAmqp(Config config, ObjectMapper objectMapper) {
-        ConnectionFactory factory = new ConnectionFactory();
-        try {
-            factory.setUri(config.getString(Keys.EVENT_FORWARD_URL));
-        } catch (NoSuchAlgorithmException | URISyntaxException | KeyManagementException e) {
-            throw new RuntimeException(e);
-        }
-
-        try {
-            Connection connection  = factory.newConnection();
-            exchange = config.getString(Keys.EVENT_FORWARD_EXCHANGE);
-            topic = config.getString(Keys.EVENT_FORWARD_TOPIC);
-            channel = connection.createChannel();
-            channel.exchangeDeclare(exchange, "topic", true);
-            this.objectMapper = objectMapper;
-        } catch (IOException | TimeoutException e) {
-            throw new RuntimeException(e);
-        }
+        String connectionUrl = config.getString(Keys.EVENT_FORWARD_URL);
+        String exchange = config.getString(Keys.EVENT_FORWARD_EXCHANGE);
+        String topic = config.getString(Keys.EVENT_FORWARD_TOPIC);
+        this.objectMapper = objectMapper;
+        amqpClient = new AmqpClient(connectionUrl, exchange, topic);
     }
 
     @Override
     public void forward(EventData eventData, ResultHandler resultHandler) {
         try {
             String value = objectMapper.writeValueAsString(eventData);
-
-            BasicProperties properties = new BasicProperties.Builder()
-                    .contentType("application/json")
-                    .contentEncoding("string")
-                    .deliveryMode(2)
-                    .priority(10)
-                    .build();
-
-            channel.basicPublish(exchange, topic, properties, value.getBytes());
+            amqpClient.publishMessage(value);
             resultHandler.onResult(true, null);
         } catch (IOException e) {
             resultHandler.onResult(false, e);