diff options
Diffstat (limited to 'src/main/java/org/traccar/forward/EventForwarderMqtt.java')
-rw-r--r-- | src/main/java/org/traccar/forward/EventForwarderMqtt.java | 70 |
1 files changed, 11 insertions, 59 deletions
diff --git a/src/main/java/org/traccar/forward/EventForwarderMqtt.java b/src/main/java/org/traccar/forward/EventForwarderMqtt.java index 7f4e29384..90e8500ea 100644 --- a/src/main/java/org/traccar/forward/EventForwarderMqtt.java +++ b/src/main/java/org/traccar/forward/EventForwarderMqtt.java @@ -15,86 +15,38 @@ */ package org.traccar.forward; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; -import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; import org.traccar.config.Config; import org.traccar.config.Keys; +import org.traccar.helper.MqttUtil; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.UUID; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient; public class EventForwarderMqtt implements EventForwarder { - private final Mqtt5AsyncClient client; + private final Mqtt3AsyncClient client; private final ObjectMapper objectMapper; private final String topic; public EventForwarderMqtt(Config config, ObjectMapper objectMapper) { - URI url; - try { - url = new URI(config.getString(Keys.EVENT_FORWARD_URL)); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - - String userInfo = url.getUserInfo(); - Mqtt5SimpleAuth simpleAuth = null; - if (userInfo != null) { - int delimiter = userInfo.indexOf(':'); - if (delimiter == -1) { - throw new IllegalArgumentException("Wrong credentials. Should be in format \"username:password\""); - } else { - simpleAuth = Mqtt5SimpleAuth.builder() - .username(userInfo.substring(0, delimiter++)) - .password(userInfo.substring(delimiter).getBytes()) - .build(); - } - } - - String host = url.getHost(); - int port = url.getPort(); - client = Mqtt5Client.builder() - .identifier("traccar-" + UUID.randomUUID()) - .serverHost(host) - .serverPort(port) - .simpleAuth(simpleAuth) - .automaticReconnectWithDefaultConfig() - .buildAsync(); - - client.connectWith() - .send() - .whenComplete((message, e) -> { - if (e != null) { - throw new RuntimeException(e); - } - }); - + this.topic = config.getString(Keys.EVENT_FORWARD_TOPIC); + client = MqttUtil.createClient(config.getString(Keys.EVENT_FORWARD_URL)); this.objectMapper = objectMapper; - topic = config.getString(Keys.EVENT_FORWARD_TOPIC); } @Override public void forward(EventData eventData, ResultHandler resultHandler) { - byte[] payload; + String payload; try { - payload = objectMapper.writeValueAsString(eventData).getBytes(); + payload = objectMapper.writeValueAsString(eventData); } catch (JsonProcessingException e) { resultHandler.onResult(false, e); return; } - client.publishWith() - .topic(topic) - .qos(MqttQos.AT_LEAST_ONCE) - .payload(payload) - .send() - .whenComplete((message, e) -> resultHandler.onResult(e == null, e)); + MqttUtil.publish(client, topic, payload, (message, e) -> resultHandler.onResult(e == null, e)); } -} +}
\ No newline at end of file |