public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MQTT transport deprecations (#8570) 

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born 2020-09-24 22:50:46 +02:00 committed by GitHub
parent 5788ad095e
commit b503dce9fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bundles/org.openhab.binding.mqtt.generic/src/test/java/org/openhab/binding/mqtt/generic/ChannelStateTests.java
View File

@ -79,7 +79,6 @@ public class ChannelStateTests {
doReturn(voidFutureComplete).when(connection).unsubscribeAll();
doReturn(CompletableFuture.completedFuture(true)).when(connection).subscribe(any(), any());
doReturn(CompletableFuture.completedFuture(true)).when(connection).unsubscribe(any(), any());
doReturn(CompletableFuture.completedFuture(true)).when(connection).publish(any(), any());
doReturn(CompletableFuture.completedFuture(true)).when(connection).publish(any(), any(), anyInt(),
anyBoolean());

1
bundles/org.openhab.binding.mqtt.generic/src/test/java/org/openhab/binding/mqtt/generic/internal/handler/GenericThingHandlerTests.java
View File

@ -84,7 +84,6 @@ public class GenericThingHandlerTests {
doReturn(voidFutureComplete).when(connection).unsubscribeAll();
doReturn(CompletableFuture.completedFuture(true)).when(connection).subscribe(any(), any());
doReturn(CompletableFuture.completedFuture(true)).when(connection).unsubscribe(any(), any());
doReturn(CompletableFuture.completedFuture(true)).when(connection).publish(any(), any());
doReturn(CompletableFuture.completedFuture(true)).when(connection).publish(any(), any(), anyInt(),
anyBoolean());

23
bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/action/MQTTActions.java
View File

@ -63,9 +63,9 @@ public class MQTTActions implements ThingActions, IMQTTActions {
@Override
@RuleAction(label = "@text/actionLabel", description = "@text/actionDesc")
public void publishMQTT(
@ActionInput(name = "topic", label = "@text/actionInputTopicLabel", description = "@text/actionInputTopicDesc") @Nullable String topic,
@ActionInput(name = "value", label = "@text/actionInputValueLabel", description = "@text/actionInputValueDesc") @Nullable String value,
@ActionInput(name = "retain", label = "@text/actionInputRetainlabel", description = "@text/actionInputRetainDesc") @Nullable Boolean retain) {
@ActionInput(name = "topic", label = "@text/actionInputTopicLabel", description = "@text/actionInputTopicDesc") @Nullable final String topic,
@ActionInput(name = "value", label = "@text/actionInputValueLabel", description = "@text/actionInputValueDesc") @Nullable final String value,
@ActionInput(name = "retain", label = "@text/actionInputRetainlabel", description = "@text/actionInputRetainDesc") @Nullable final Boolean retain) {
AbstractBrokerHandler brokerHandler = handler;
if (brokerHandler == null) {
logger.warn("MQTT Action service ThingHandler is null!");
@ -84,15 +84,14 @@ public class MQTTActions implements ThingActions, IMQTTActions {
logger.debug("skipping MQTT publishing of value '{}' as topic is null.", value);
return;
}
if (retain == null) {
retain = connection.isRetain();
}
connection.publish(topic, value.getBytes(), connection.getQos(), retain).thenRun(() -> {
logger.debug("MQTT publish to {} performed", topic);
}).exceptionally(e -> {
logger.warn("MQTT publish to {} failed!", topic);
return null;
});
connection.publish(topic, value.getBytes(), connection.getQos(), retain != null && retain.booleanValue())
.thenRun(() -> {
logger.debug("MQTT publish to {} performed", topic);
}).exceptionally(e -> {
logger.warn("MQTT publish to {} failed!", topic);
return null;
});
}
public static void publishMQTT(@Nullable ThingActions actions, @Nullable String topic, @Nullable String value) {

8
bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/discovery/MQTTTopicDiscoveryService.java
View File

@ -42,8 +42,10 @@ public interface MQTTTopicDiscoveryService {
/**
* Publish a message to all connected brokers
*
* @param topic The topic to publish on
* @param payload The message to publish
* @param topic The topic
* @param payload The message payload
* @param qos The quality of service for this message
* @param retain Set to true to retain the message on the broker
*/
void publish(String topic, byte[] payload);
void publish(String topic, byte[] payload, int qos, boolean retain);
}

2
bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/BrokerHandler.java
View File

@ -223,8 +223,6 @@ public class BrokerHandler extends AbstractBrokerHandler implements PinnedCallba
connection.setTimeoutExecutor(scheduler, TIMEOUT_DEFAULT);
}
connection.setRetain(config.retainMessages);
return connection;
}

1
bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/SystemBrokerHandler.java
View File

@ -69,7 +69,6 @@ public class SystemBrokerHandler extends AbstractBrokerHandler implements MqttSe
properties.put(PROPERTY_PASSWORD, password);
}
properties.put(PROPERTY_QOS, String.valueOf(connection.getQos()));
properties.put(PROPERTY_RETAIN, String.valueOf(connection.isRetain()));
final MqttWillAndTestament lastWill = connection.getLastWill();
if (lastWill != null) {
properties.put(PROPERTY_LAST_WILL, lastWill.toString());

12
bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/internal/MqttBrokerHandlerFactory.java
View File

@ -12,7 +12,13 @@
*/
package org.openhab.binding.mqtt.internal;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -127,10 +133,10 @@ public class MqttBrokerHandlerFactory extends BaseThingHandlerFactory implements
}
@Override
public void publish(String topic, byte[] payload) {
public void publish(String topic, byte[] payload, int qos, boolean retain) {
handlers.forEach(handler -> {
handler.getConnectionAsync().thenAccept(connection -> {
connection.publish(topic, payload);
connection.publish(topic, payload, qos, retain);
});
});
}

9
bundles/org.openhab.io.mqttembeddedbroker/src/test/java/org/openhab/io/mqttembeddedbroker/internal/MqttEmbeddedBrokerServiceTest.java
View File

@ -42,6 +42,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.openhab.core.OpenHAB;
import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
import org.openhab.core.io.transport.mqtt.MqttBrokerConnection.MqttVersion;
import org.openhab.core.io.transport.mqtt.MqttBrokerConnection.Protocol;
import org.openhab.core.io.transport.mqtt.MqttConnectionObserver;
import org.openhab.core.io.transport.mqtt.MqttConnectionState;
@ -115,8 +116,8 @@ public class MqttEmbeddedBrokerServiceTest extends JavaTest {
verify(service).addBrokerConnection(anyString(), eq(c));
// Connect with a second connection but wrong credentials
MqttBrokerConnection wrongCredentials = new MqttBrokerConnection(Protocol.TCP, c.getHost(), c.getPort(), false,
"wrongCred");
MqttBrokerConnection wrongCredentials = new MqttBrokerConnection(Protocol.TCP, MqttVersion.V3, c.getHost(),
c.getPort(), false, "wrongCred");
wrongCredentials.setCredentials("someUser", "somePassword");
if (wrongCredentials.start().get()) {
@ -126,8 +127,8 @@ public class MqttEmbeddedBrokerServiceTest extends JavaTest {
wrongCredentials.stop().get();
// Connect with a second connection but correct credentials
MqttBrokerConnection correctCredentials = new MqttBrokerConnection(Protocol.TCP, c.getHost(), c.getPort(),
false, "correctCred");
MqttBrokerConnection correctCredentials = new MqttBrokerConnection(Protocol.TCP, MqttVersion.V3, c.getHost(),
c.getPort(), false, "correctCred");
correctCredentials.setCredentials(c.getUser(), c.getPassword());
if (!correctCredentials.start().get()) {