From e99308c4d18ef928d728b04f6d50ced10c0f64e5 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sun, 13 Mar 2022 21:45:59 +0100 Subject: [PATCH] Remove MQTT system broker leftovers (#12472) The MqttService was used to keep track of the system MQTT brokers. Since there are none the dependency can be removed. Related to: openhab/openhab-core#2842 See also: #12157 Signed-off-by: Wouter Born Signed-off-by: Andras Uhrin --- .../binding/mqtt/handler/AbstractBrokerHandler.java | 4 +--- .../openhab/binding/mqtt/handler/BrokerHandler.java | 4 +--- .../mqtt/internal/MqttBrokerHandlerFactory.java | 13 ------------- .../binding/mqtt/handler/BrokerHandlerTest.java | 4 +--- .../internal/MQTTTopicDiscoveryServiceTest.java | 6 +----- 5 files changed, 4 insertions(+), 27 deletions(-) diff --git a/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/AbstractBrokerHandler.java b/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/AbstractBrokerHandler.java index f68f65f69e987..f05def3c478b3 100644 --- a/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/AbstractBrokerHandler.java +++ b/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/AbstractBrokerHandler.java @@ -27,7 +27,6 @@ import org.openhab.core.io.transport.mqtt.MqttBrokerConnection; import org.openhab.core.io.transport.mqtt.MqttConnectionObserver; import org.openhab.core.io.transport.mqtt.MqttConnectionState; -import org.openhab.core.io.transport.mqtt.MqttService; import org.openhab.core.thing.Bridge; import org.openhab.core.thing.Channel; import org.openhab.core.thing.ChannelUID; @@ -41,8 +40,7 @@ /** * This base implementation handles connection changes of the {@link MqttBrokerConnection} - * and puts the Thing on or offline. It also handles adding/removing notifications of the - * {@link MqttService} and provides a basic dispose() implementation. + * and puts the Thing on or offline. It also provides a basic dispose() implementation. * * @author David Graeff - Initial contribution */ diff --git a/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/BrokerHandler.java b/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/BrokerHandler.java index c48da5ccd0974..129f6cc78fe24 100644 --- a/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/BrokerHandler.java +++ b/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/BrokerHandler.java @@ -30,7 +30,6 @@ import org.openhab.core.config.core.Configuration; import org.openhab.core.io.transport.mqtt.MqttBrokerConnection; import org.openhab.core.io.transport.mqtt.MqttConnectionState; -import org.openhab.core.io.transport.mqtt.MqttService; import org.openhab.core.io.transport.mqtt.MqttWillAndTestament; import org.openhab.core.io.transport.mqtt.reconnect.PeriodicReconnectStrategy; import org.openhab.core.thing.Bridge; @@ -41,8 +40,7 @@ /** * This handler provided more detailed connection information from a * {@link MqttBrokerConnection} via a Thing property, put the Thing - * offline or online depending on the connection and adds the configured - * connection to the {@link MqttService}. + * offline or online depending on the connection. * * @author David Graeff - Initial contribution * @author Jimmy Tanagra - Add birth and shutdown message diff --git a/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/internal/MqttBrokerHandlerFactory.java b/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/internal/MqttBrokerHandlerFactory.java index f68b75dde5e42..8c1f1adff16ce 100644 --- a/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/internal/MqttBrokerHandlerFactory.java +++ b/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/internal/MqttBrokerHandlerFactory.java @@ -27,16 +27,13 @@ import org.openhab.binding.mqtt.discovery.MQTTTopicDiscoveryService; import org.openhab.binding.mqtt.handler.AbstractBrokerHandler; import org.openhab.binding.mqtt.handler.BrokerHandler; -import org.openhab.core.io.transport.mqtt.MqttService; import org.openhab.core.thing.Bridge; import org.openhab.core.thing.Thing; import org.openhab.core.thing.ThingTypeUID; import org.openhab.core.thing.binding.BaseThingHandlerFactory; import org.openhab.core.thing.binding.ThingHandler; import org.openhab.core.thing.binding.ThingHandlerFactory; -import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.Reference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,13 +66,6 @@ public class MqttBrokerHandlerFactory extends BaseThingHandlerFactory implements protected final Set handlers = Collections .synchronizedSet(Collections.newSetFromMap(new WeakHashMap<>())); - private MqttService mqttService; - - @Activate - public MqttBrokerHandlerFactory(@Reference MqttService mqttService) { - this.mqttService = mqttService; - } - @Override public boolean supportsThingType(ThingTypeUID thingTypeUID) { return SUPPORTED_THING_TYPES_UIDS.contains(thingTypeUID); @@ -96,9 +86,6 @@ protected void createdHandler(AbstractBrokerHandler handler) { @Override protected @Nullable ThingHandler createHandler(Thing thing) { - if (mqttService == null) { - throw new IllegalStateException("MqttService must be bound, before ThingHandlers can be created"); - } if (!(thing instanceof Bridge)) { throw new IllegalStateException("A bridge type is expected"); } diff --git a/bundles/org.openhab.binding.mqtt/src/test/java/org/openhab/binding/mqtt/handler/BrokerHandlerTest.java b/bundles/org.openhab.binding.mqtt/src/test/java/org/openhab/binding/mqtt/handler/BrokerHandlerTest.java index 28d01587cfc16..7414b3a076a26 100644 --- a/bundles/org.openhab.binding.mqtt/src/test/java/org/openhab/binding/mqtt/handler/BrokerHandlerTest.java +++ b/bundles/org.openhab.binding.mqtt/src/test/java/org/openhab/binding/mqtt/handler/BrokerHandlerTest.java @@ -34,7 +34,6 @@ import org.openhab.core.io.transport.mqtt.MqttBrokerConnection; import org.openhab.core.io.transport.mqtt.MqttConnectionState; import org.openhab.core.io.transport.mqtt.MqttException; -import org.openhab.core.io.transport.mqtt.MqttService; import org.openhab.core.test.java.JavaTest; import org.openhab.core.thing.Bridge; import org.openhab.core.thing.ThingStatus; @@ -54,7 +53,6 @@ public class BrokerHandlerTest extends JavaTest { private @Mock ThingHandlerCallback callback; private @Mock Bridge thing; - private @Mock MqttService service; private MqttBrokerConnectionEx connection; @@ -83,7 +81,7 @@ public void tearDown() { public void handlerInitWithoutUrl() throws IllegalArgumentException { // Assume it is a real handler and not a mock as defined above handler = new BrokerHandler(thing); - assertThrows(IllegalArgumentException.class, () -> initializeHandlerWaitForTimeout()); + assertThrows(IllegalArgumentException.class, this::initializeHandlerWaitForTimeout); } @Test diff --git a/bundles/org.openhab.binding.mqtt/src/test/java/org/openhab/binding/mqtt/internal/MQTTTopicDiscoveryServiceTest.java b/bundles/org.openhab.binding.mqtt/src/test/java/org/openhab/binding/mqtt/internal/MQTTTopicDiscoveryServiceTest.java index 8f22e3d5398c7..e41f4dffb06a9 100644 --- a/bundles/org.openhab.binding.mqtt/src/test/java/org/openhab/binding/mqtt/internal/MQTTTopicDiscoveryServiceTest.java +++ b/bundles/org.openhab.binding.mqtt/src/test/java/org/openhab/binding/mqtt/internal/MQTTTopicDiscoveryServiceTest.java @@ -34,7 +34,6 @@ import org.openhab.binding.mqtt.handler.BrokerHandlerEx; import org.openhab.binding.mqtt.handler.MqttBrokerConnectionEx; import org.openhab.core.config.core.Configuration; -import org.openhab.core.io.transport.mqtt.MqttService; import org.openhab.core.thing.Bridge; import org.openhab.core.thing.binding.ThingHandlerCallback; @@ -50,9 +49,6 @@ public class MQTTTopicDiscoveryServiceTest { private MqttBrokerHandlerFactory subject; - @Mock - private MqttService mqttService; - @Mock private Bridge thing; @@ -83,7 +79,7 @@ public void setUp() { handler = spy(new BrokerHandlerEx(thing, connection)); handler.setCallback(callback); - subject = new MqttBrokerHandlerFactory(mqttService); + subject = new MqttBrokerHandlerFactory(); } @AfterEach