100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
QoS is used properly now in MQTT subscriptions
Michael Rademakerabb05fef9c53
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.javaindex 3a53377d0..1827e0b75 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java@@ -167,12 +167,12 @@ public class MqttBrokerService implements ContainerService {topicCustomHandlerMap.values().removeIf(h -> h == customHandler);}- public void sendToSession(String sessionId, String topic, Object data) {+ public void sendToSession(String sessionId, String topic, Object data, MqttQoS qoS) {try {ByteBuf payload = Unpooled.copiedBuffer(ValueUtil.asJSON(data).orElseThrow(() -> new IllegalStateException("Failed to convert payload to JSON string: " + data)), Charset.defaultCharset());MqttPublishMessage publishMessage = MqttMessageBuilders.publish()- .qos(MqttQoS.AT_MOST_ONCE)+ .qos(qoS).topicName(topic).payload(payload).build();@@ -328,7 +328,7 @@ public class MqttBrokerService implements ContainerService {}});}- protected Consumer<SharedEvent> getEventConsumer(MqttConnection connection, String topic, boolean isValueSubscription) {+ protected Consumer<SharedEvent> getEventConsumer(MqttConnection connection, String topic, boolean isValueSubscription, MqttQoS mqttQoS) {return ev -> {List<String> topicTokens = Arrays.asList(topic.split("/"));int wildCardIndex = Math.max(topicTokens.indexOf(MULTI_LEVEL_WILDCARD), topicTokens.indexOf(SINGLE_LEVEL_WILDCARD));@@ -338,7 +338,7 @@ public class MqttBrokerService implements ContainerService {if (wildCardIndex > 0) {topicTokens.set(wildCardIndex, assetEvent.getAssetId());}- sendToSession(connection.getSessionId(), String.join("/", topicTokens), ev);+ sendToSession(connection.getSessionId(), String.join("/", topicTokens), ev, mqttQoS);}if (ev instanceof AttributeEvent) {@@ -357,9 +357,9 @@ public class MqttBrokerService implements ContainerService {}}if(isValueSubscription) {- sendToSession(connection.getSessionId(), String.join("/", topicTokens), attributeEvent.getValue().orElse(null));+ sendToSession(connection.getSessionId(), String.join("/", topicTokens), attributeEvent.getValue().orElse(null), mqttQoS);} else {- sendToSession(connection.getSessionId(), String.join("/", topicTokens), ev);+ sendToSession(connection.getSessionId(), String.join("/", topicTokens), ev, mqttQoS);}}};diff --git a/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.javaindex 17a99cd93..d4562fc6d 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java@@ -143,7 +143,7 @@ public class ORInterceptHandler extends AbstractInterceptHandler {String[] realmAndUsername = msg.getUsername().split(":");String realm = realmAndUsername[0];- String username = realmAndUsername[1];+ String username = realmAndUsername[1];MqttConnection connection = sessionIdConnectionMap.get(msg.getClientID());if (connection == null) {@@ -179,7 +179,7 @@ public class ORInterceptHandler extends AbstractInterceptHandler {subscriptionId);- Consumer<SharedEvent> eventConsumer = brokerService.getEventConsumer(connection, subscriptionId, isValueSubscription);+ Consumer<SharedEvent> eventConsumer = brokerService.getEventConsumer(connection, subscriptionId, isValueSubscription, msg.getRequestedQos());connection.subscriptionHandlerMap.put(subscriptionId, eventConsumer);Map<String, Object> headers = prepareHeaders(connection);messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, subscription, headers);diff --git a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovyindex 3fc5d330b..f1531136b 100644--- a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy+++ b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy@@ -2,6 +2,7 @@ package org.openremote.test.mqttimport com.google.common.collect.Listsimport io.moquette.BrokerConstants+import io.netty.handler.codec.mqtt.MqttQoSimport org.openremote.agent.protocol.simulator.SimulatorProtocolimport org.openremote.container.util.UniqueIdentifierGeneratorimport org.openremote.manager.agent.AgentService@@ -36,8 +37,8 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {def mqttBrokerServiceAttributeValueCalls = 0def spyMqttBrokerService = Spy(MqttBrokerService) {- getEventConsumer(_ as MqttConnection, _ as String, _ as Boolean) >> {- connection, topic, isValueSubscription ->+ getEventConsumer(_ as MqttConnection, _ as String, _ as Boolean, _ as MqttQoS) >> {+ connection, topic, isValueSubscription, qos ->return {if (isValueSubscription) {if (it instanceof AttributeEvent) {