From 34857cb82abb413100fa4aed668cdca7761e54c4 Mon Sep 17 00:00:00 2001 From: Supriyo Date: Mon, 11 Mar 2024 13:09:38 +0530 Subject: feat: add configuration for event forwarding with mqtt --- src/main/java/org/traccar/MainModule.java | 14 +--- .../org/traccar/forward/EventForwarderMqtt.java | 70 +++--------------- .../org/traccar/forward/PositionForwarderMqtt.java | 55 ++++++++++++++ src/main/java/org/traccar/helper/MqttUtil.java | 83 ++++++++++++++++++++++ 4 files changed, 152 insertions(+), 70 deletions(-) create mode 100644 src/main/java/org/traccar/forward/PositionForwarderMqtt.java create mode 100644 src/main/java/org/traccar/helper/MqttUtil.java (limited to 'src/main/java/org/traccar') diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java index 3fec4d1e6..c3c3586be 100644 --- a/src/main/java/org/traccar/MainModule.java +++ b/src/main/java/org/traccar/MainModule.java @@ -35,17 +35,7 @@ import org.traccar.config.Keys; import org.traccar.database.LdapProvider; import org.traccar.database.OpenIdProvider; import org.traccar.database.StatisticsManager; -import org.traccar.forward.EventForwarder; -import org.traccar.forward.EventForwarderJson; -import org.traccar.forward.EventForwarderAmqp; -import org.traccar.forward.EventForwarderKafka; -import org.traccar.forward.EventForwarderMqtt; -import org.traccar.forward.PositionForwarder; -import org.traccar.forward.PositionForwarderJson; -import org.traccar.forward.PositionForwarderAmqp; -import org.traccar.forward.PositionForwarderKafka; -import org.traccar.forward.PositionForwarderRedis; -import org.traccar.forward.PositionForwarderUrl; +import org.traccar.forward.*; import org.traccar.geocoder.AddressFormat; import org.traccar.geocoder.BanGeocoder; import org.traccar.geocoder.BingMapsGeocoder; @@ -386,6 +376,8 @@ public class MainModule extends AbstractModule { return new PositionForwarderAmqp(config, objectMapper); case "kafka": return new PositionForwarderKafka(config, objectMapper); + case "mqtt": + return new PositionForwarderMqtt(config, objectMapper); case "redis": return new PositionForwarderRedis(config, objectMapper); case "url": 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 diff --git a/src/main/java/org/traccar/forward/PositionForwarderMqtt.java b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java new file mode 100644 index 000000000..e530c76a1 --- /dev/null +++ b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java @@ -0,0 +1,55 @@ +/* + * Copyright 2022 - 2023 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.forward; + +import org.traccar.config.Config; +import org.traccar.config.Keys; +import org.traccar.helper.MqttUtil; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient; + +public class PositionForwarderMqtt implements PositionForwarder { + private final Mqtt3AsyncClient client; + + @Override + public void forward(final PositionData positionData, final ResultHandler resultHandler) { + publish(topic, positionData, resultHandler); + } + private final ObjectMapper objectMapper; + + protected final String topic; + + + public PositionForwarderMqtt(final Config config, final ObjectMapper objectMapper) { + this.topic = config.getString(Keys.FORWARD_TOPIC); + this.client = MqttUtil.createClient(config.getString(Keys.FORWARD_URL)); + this.objectMapper = objectMapper; + } + + protected void publish(final String pubTopic, final Object object, final ResultHandler resultHandler) { + final String payload; + try { + payload = objectMapper.writeValueAsString(object); + } catch (JsonProcessingException e) { + resultHandler.onResult(false, e); + return; + } + MqttUtil.publish(client, pubTopic, payload, (message, e) -> resultHandler.onResult(e == null, e)); + } + +} \ No newline at end of file diff --git a/src/main/java/org/traccar/helper/MqttUtil.java b/src/main/java/org/traccar/helper/MqttUtil.java new file mode 100644 index 000000000..54167f65c --- /dev/null +++ b/src/main/java/org/traccar/helper/MqttUtil.java @@ -0,0 +1,83 @@ +/* + * Copyright 2023 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.helper; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.UUID; +import java.util.function.BiConsumer; + +import com.hivemq.client.mqtt.datatypes.MqttQos; +import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient; +import com.hivemq.client.mqtt.mqtt3.Mqtt3Client; +import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientBuilder; +import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; +import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; + +public final class MqttUtil { + + private MqttUtil() { + + } + + public static Mqtt3AsyncClient createClient(final String url) { + URI uri; + try { + uri = new URI(url); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + + final Mqtt3SimpleAuth simpleAuth = getSimpleAuth(uri); + + final String host = uri.getHost(); + final int port = uri.getPort(); + final Mqtt3ClientBuilder builder = Mqtt3Client.builder().identifier("traccar-" + UUID.randomUUID()) + .serverHost(host).serverPort(port).simpleAuth(simpleAuth).automaticReconnectWithDefaultConfig(); + final Mqtt3AsyncClient client; + + client = builder.buildAsync(); + + + client.connectWith().send().whenComplete((message, e) -> { + throw new RuntimeException(e); + }); + + return client; + } + + private static Mqtt3SimpleAuth getSimpleAuth(final URI uri) { + final String userInfo = uri.getUserInfo(); + Mqtt3SimpleAuth simpleAuth = null; + if (userInfo != null) { + int delimiter = userInfo.indexOf(':'); + if (delimiter == -1) { + throw new IllegalArgumentException("Wrong MQTT credentials. Should be in format \"username:password\""); + } else { + simpleAuth = Mqtt3SimpleAuth.builder().username(userInfo.substring(0, delimiter++)) + .password(userInfo.substring(delimiter).getBytes()).build(); + } + } + return simpleAuth; + } + + public static void publish(final Mqtt3AsyncClient client, final String pubTopic, final String payload, + final BiConsumer whenComplete) { + client.publishWith().topic(pubTopic).qos(MqttQos.AT_LEAST_ONCE).payload(payload.getBytes()).send() + .whenComplete(whenComplete); + } + +} \ No newline at end of file -- cgit v1.2.3 From 87df697b992234caa6e89229dd7fe1ee194859f5 Mon Sep 17 00:00:00 2001 From: Supriyo Date: Tue, 12 Mar 2024 00:08:04 +0530 Subject: linting changes and upgrade mqqt3 to mqtt5 --- src/main/java/org/traccar/MainModule.java | 13 ++++++- .../org/traccar/forward/EventForwarderMqtt.java | 6 ++-- .../org/traccar/forward/PositionForwarderMqtt.java | 6 ++-- src/main/java/org/traccar/helper/MqttUtil.java | 40 ++++++++++------------ 4 files changed, 37 insertions(+), 28 deletions(-) (limited to 'src/main/java/org/traccar') diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java index c3c3586be..d5b7f7d75 100644 --- a/src/main/java/org/traccar/MainModule.java +++ b/src/main/java/org/traccar/MainModule.java @@ -35,7 +35,18 @@ import org.traccar.config.Keys; import org.traccar.database.LdapProvider; import org.traccar.database.OpenIdProvider; import org.traccar.database.StatisticsManager; -import org.traccar.forward.*; +import org.traccar.forward.EventForwarder; +import org.traccar.forward.EventForwarderJson; +import org.traccar.forward.EventForwarderAmqp; +import org.traccar.forward.EventForwarderKafka; +import org.traccar.forward.EventForwarderMqtt; +import org.traccar.forward.PositionForwarder; +import org.traccar.forward.PositionForwarderJson; +import org.traccar.forward.PositionForwarderAmqp; +import org.traccar.forward.PositionForwarderKafka; +import org.traccar.forward.PositionForwarderRedis; +import org.traccar.forward.PositionForwarderUrl; +import org.traccar.forward.PositionForwarderMqtt; import org.traccar.geocoder.AddressFormat; import org.traccar.geocoder.BanGeocoder; import org.traccar.geocoder.BingMapsGeocoder; diff --git a/src/main/java/org/traccar/forward/EventForwarderMqtt.java b/src/main/java/org/traccar/forward/EventForwarderMqtt.java index 90e8500ea..83df795b1 100644 --- a/src/main/java/org/traccar/forward/EventForwarderMqtt.java +++ b/src/main/java/org/traccar/forward/EventForwarderMqtt.java @@ -21,11 +21,11 @@ import org.traccar.helper.MqttUtil; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient; +import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; public class EventForwarderMqtt implements EventForwarder { - private final Mqtt3AsyncClient client; + private final Mqtt5AsyncClient client; private final ObjectMapper objectMapper; private final String topic; @@ -49,4 +49,4 @@ public class EventForwarderMqtt implements EventForwarder { MqttUtil.publish(client, topic, payload, (message, e) -> resultHandler.onResult(e == null, e)); } -} \ No newline at end of file +} diff --git a/src/main/java/org/traccar/forward/PositionForwarderMqtt.java b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java index e530c76a1..a6d0965b8 100644 --- a/src/main/java/org/traccar/forward/PositionForwarderMqtt.java +++ b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java @@ -21,10 +21,10 @@ import org.traccar.helper.MqttUtil; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient; +import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; public class PositionForwarderMqtt implements PositionForwarder { - private final Mqtt3AsyncClient client; + private final Mqtt5AsyncClient client; @Override public void forward(final PositionData positionData, final ResultHandler resultHandler) { @@ -52,4 +52,4 @@ public class PositionForwarderMqtt implements PositionForwarder { MqttUtil.publish(client, pubTopic, payload, (message, e) -> resultHandler.onResult(e == null, e)); } -} \ No newline at end of file +} diff --git a/src/main/java/org/traccar/helper/MqttUtil.java b/src/main/java/org/traccar/helper/MqttUtil.java index 54167f65c..9fc16012f 100644 --- a/src/main/java/org/traccar/helper/MqttUtil.java +++ b/src/main/java/org/traccar/helper/MqttUtil.java @@ -21,11 +21,11 @@ import java.util.UUID; import java.util.function.BiConsumer; import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient; -import com.hivemq.client.mqtt.mqtt3.Mqtt3Client; -import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientBuilder; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; +import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; +import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientBuilder; +import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; public final class MqttUtil { @@ -33,7 +33,7 @@ public final class MqttUtil { } - public static Mqtt3AsyncClient createClient(final String url) { + public static Mqtt5AsyncClient createClient(final String url) { URI uri; try { uri = new URI(url); @@ -41,17 +41,14 @@ public final class MqttUtil { throw new RuntimeException(e); } - final Mqtt3SimpleAuth simpleAuth = getSimpleAuth(uri); + Mqtt5SimpleAuth simpleAuth = getSimpleAuth(uri); - final String host = uri.getHost(); - final int port = uri.getPort(); - final Mqtt3ClientBuilder builder = Mqtt3Client.builder().identifier("traccar-" + UUID.randomUUID()) + String host = uri.getHost(); + int port = uri.getPort(); + Mqtt5ClientBuilder builder = Mqtt5Client.builder().identifier("traccar-" + UUID.randomUUID()) .serverHost(host).serverPort(port).simpleAuth(simpleAuth).automaticReconnectWithDefaultConfig(); - final Mqtt3AsyncClient client; - + Mqtt5AsyncClient client; client = builder.buildAsync(); - - client.connectWith().send().whenComplete((message, e) -> { throw new RuntimeException(e); }); @@ -59,25 +56,26 @@ public final class MqttUtil { return client; } - private static Mqtt3SimpleAuth getSimpleAuth(final URI uri) { - final String userInfo = uri.getUserInfo(); - Mqtt3SimpleAuth simpleAuth = null; + private static Mqtt5SimpleAuth getSimpleAuth(final URI uri) { + String userInfo = uri.getUserInfo(); + Mqtt5SimpleAuth simpleAuth = null; if (userInfo != null) { int delimiter = userInfo.indexOf(':'); if (delimiter == -1) { throw new IllegalArgumentException("Wrong MQTT credentials. Should be in format \"username:password\""); } else { - simpleAuth = Mqtt3SimpleAuth.builder().username(userInfo.substring(0, delimiter++)) + simpleAuth = Mqtt5SimpleAuth.builder().username(userInfo.substring(0, delimiter++)) .password(userInfo.substring(delimiter).getBytes()).build(); } } return simpleAuth; } - public static void publish(final Mqtt3AsyncClient client, final String pubTopic, final String payload, - final BiConsumer whenComplete) { + public static void publish(final Mqtt5AsyncClient client, final String pubTopic, final String payload, + final BiConsumer whenComplete) { client.publishWith().topic(pubTopic).qos(MqttQos.AT_LEAST_ONCE).payload(payload.getBytes()).send() .whenComplete(whenComplete); } -} \ No newline at end of file +} -- cgit v1.2.3 From 22b0611d9c00e70f4b70787e314075afcd4538ec Mon Sep 17 00:00:00 2001 From: Supriyo Date: Sat, 16 Mar 2024 12:36:48 +0530 Subject: feat: refractor mqtt utils to MqttClient like EmqxClient --- .../org/traccar/forward/EventForwarderMqtt.java | 10 +-- src/main/java/org/traccar/forward/MqttClient.java | 76 ++++++++++++++++++++ .../org/traccar/forward/PositionForwarderMqtt.java | 9 +-- src/main/java/org/traccar/helper/MqttUtil.java | 81 ---------------------- 4 files changed, 82 insertions(+), 94 deletions(-) create mode 100644 src/main/java/org/traccar/forward/MqttClient.java delete mode 100644 src/main/java/org/traccar/helper/MqttUtil.java (limited to 'src/main/java/org/traccar') diff --git a/src/main/java/org/traccar/forward/EventForwarderMqtt.java b/src/main/java/org/traccar/forward/EventForwarderMqtt.java index 83df795b1..7d1c7dd3c 100644 --- a/src/main/java/org/traccar/forward/EventForwarderMqtt.java +++ b/src/main/java/org/traccar/forward/EventForwarderMqtt.java @@ -17,22 +17,20 @@ package org.traccar.forward; import org.traccar.config.Config; import org.traccar.config.Keys; -import org.traccar.helper.MqttUtil; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; public class EventForwarderMqtt implements EventForwarder { - private final Mqtt5AsyncClient client; + private final MqttClient mqttClient; private final ObjectMapper objectMapper; private final String topic; public EventForwarderMqtt(Config config, ObjectMapper objectMapper) { this.topic = config.getString(Keys.EVENT_FORWARD_TOPIC); - client = MqttUtil.createClient(config.getString(Keys.EVENT_FORWARD_URL)); + mqttClient = new MqttClient(config.getString(Keys.FORWARD_URL)); this.objectMapper = objectMapper; } @@ -41,12 +39,10 @@ public class EventForwarderMqtt implements EventForwarder { String payload; try { payload = objectMapper.writeValueAsString(eventData); + mqttClient.publish(topic, payload, (message, e) -> resultHandler.onResult(e == null, e)); } catch (JsonProcessingException e) { resultHandler.onResult(false, e); - return; } - - MqttUtil.publish(client, topic, payload, (message, e) -> resultHandler.onResult(e == null, e)); } } diff --git a/src/main/java/org/traccar/forward/MqttClient.java b/src/main/java/org/traccar/forward/MqttClient.java new file mode 100644 index 000000000..9059fc876 --- /dev/null +++ b/src/main/java/org/traccar/forward/MqttClient.java @@ -0,0 +1,76 @@ +/* + * Copyright 2023 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.forward; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.UUID; +import java.util.function.BiConsumer; + +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.Mqtt5ClientBuilder; +import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; + +public class MqttClient { + private final Mqtt5AsyncClient client; + MqttClient(String url) { + URI uri; + try { + uri = new URI(url); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + + Mqtt5SimpleAuth simpleAuth = this.getSimpleAuth(uri); + + String host = uri.getHost(); + int port = uri.getPort(); + Mqtt5ClientBuilder builder = Mqtt5Client.builder().identifier("traccar-" + UUID.randomUUID()) + .serverHost(host).serverPort(port).simpleAuth(simpleAuth).automaticReconnectWithDefaultConfig(); + + client = builder.buildAsync(); + client.connectWith().send().whenComplete((message, e) -> { + throw new RuntimeException(e); + }); + } + + + private Mqtt5SimpleAuth getSimpleAuth(final URI uri) { + String userInfo = uri.getUserInfo(); + Mqtt5SimpleAuth simpleAuth = null; + if (userInfo != null) { + int delimiter = userInfo.indexOf(':'); + if (delimiter == -1) { + throw new IllegalArgumentException("Wrong MQTT credentials. Should be in format \"username:password\""); + } else { + simpleAuth = Mqtt5SimpleAuth.builder().username(userInfo.substring(0, delimiter++)) + .password(userInfo.substring(delimiter).getBytes()).build(); + } + } + return simpleAuth; + } + + public void publish(final String pubTopic, final String payload, + final BiConsumer whenComplete) { + client.publishWith().topic(pubTopic).qos(MqttQos.AT_LEAST_ONCE).payload(payload.getBytes()).send() + .whenComplete(whenComplete); + } + +} diff --git a/src/main/java/org/traccar/forward/PositionForwarderMqtt.java b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java index a6d0965b8..a22c3bee6 100644 --- a/src/main/java/org/traccar/forward/PositionForwarderMqtt.java +++ b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java @@ -17,14 +17,12 @@ package org.traccar.forward; import org.traccar.config.Config; import org.traccar.config.Keys; -import org.traccar.helper.MqttUtil; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; public class PositionForwarderMqtt implements PositionForwarder { - private final Mqtt5AsyncClient client; + private final MqttClient mqttClient; @Override public void forward(final PositionData positionData, final ResultHandler resultHandler) { @@ -37,7 +35,7 @@ public class PositionForwarderMqtt implements PositionForwarder { public PositionForwarderMqtt(final Config config, final ObjectMapper objectMapper) { this.topic = config.getString(Keys.FORWARD_TOPIC); - this.client = MqttUtil.createClient(config.getString(Keys.FORWARD_URL)); + mqttClient = new MqttClient(config.getString(Keys.FORWARD_URL)); this.objectMapper = objectMapper; } @@ -45,11 +43,10 @@ public class PositionForwarderMqtt implements PositionForwarder { final String payload; try { payload = objectMapper.writeValueAsString(object); + mqttClient.publish(pubTopic, payload, (message, e) -> resultHandler.onResult(e == null, e)); } catch (JsonProcessingException e) { resultHandler.onResult(false, e); - return; } - MqttUtil.publish(client, pubTopic, payload, (message, e) -> resultHandler.onResult(e == null, e)); } } diff --git a/src/main/java/org/traccar/helper/MqttUtil.java b/src/main/java/org/traccar/helper/MqttUtil.java deleted file mode 100644 index 9fc16012f..000000000 --- a/src/main/java/org/traccar/helper/MqttUtil.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2023 Anton Tananaev (anton@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.helper; - -import java.net.URI; -import java.net.URISyntaxException; -import java.util.UUID; -import java.util.function.BiConsumer; - -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.Mqtt5ClientBuilder; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; - -public final class MqttUtil { - - private MqttUtil() { - - } - - public static Mqtt5AsyncClient createClient(final String url) { - URI uri; - try { - uri = new URI(url); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - - Mqtt5SimpleAuth simpleAuth = getSimpleAuth(uri); - - String host = uri.getHost(); - int port = uri.getPort(); - Mqtt5ClientBuilder builder = Mqtt5Client.builder().identifier("traccar-" + UUID.randomUUID()) - .serverHost(host).serverPort(port).simpleAuth(simpleAuth).automaticReconnectWithDefaultConfig(); - Mqtt5AsyncClient client; - client = builder.buildAsync(); - client.connectWith().send().whenComplete((message, e) -> { - throw new RuntimeException(e); - }); - - return client; - } - - private static Mqtt5SimpleAuth getSimpleAuth(final URI uri) { - String userInfo = uri.getUserInfo(); - Mqtt5SimpleAuth simpleAuth = null; - if (userInfo != null) { - int delimiter = userInfo.indexOf(':'); - if (delimiter == -1) { - throw new IllegalArgumentException("Wrong MQTT credentials. Should be in format \"username:password\""); - } else { - simpleAuth = Mqtt5SimpleAuth.builder().username(userInfo.substring(0, delimiter++)) - .password(userInfo.substring(delimiter).getBytes()).build(); - } - } - return simpleAuth; - } - - public static void publish(final Mqtt5AsyncClient client, final String pubTopic, final String payload, - final BiConsumer whenComplete) { - client.publishWith().topic(pubTopic).qos(MqttQos.AT_LEAST_ONCE).payload(payload.getBytes()).send() - .whenComplete(whenComplete); - } - -} -- cgit v1.2.3 From ad1e5c4aba6d97673e7b065b061c8f964aedf447 Mon Sep 17 00:00:00 2001 From: supriyo Date: Sat, 16 Mar 2024 20:03:11 +0530 Subject: update copyright text. --- src/main/java/org/traccar/forward/MqttClient.java | 2 +- src/main/java/org/traccar/forward/PositionForwarderMqtt.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/org/traccar') diff --git a/src/main/java/org/traccar/forward/MqttClient.java b/src/main/java/org/traccar/forward/MqttClient.java index 9059fc876..ad3065b58 100644 --- a/src/main/java/org/traccar/forward/MqttClient.java +++ b/src/main/java/org/traccar/forward/MqttClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2023 Anton Tananaev (anton@traccar.org) + * Copyright 2024 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/traccar/forward/PositionForwarderMqtt.java b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java index a22c3bee6..abbdc538a 100644 --- a/src/main/java/org/traccar/forward/PositionForwarderMqtt.java +++ b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 - 2023 Anton Tananaev (anton@traccar.org) + * Copyright 2024 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -- cgit v1.2.3