Remove MQTT system broker leftovers (openhab#2842)

The MqttService was used to keep track of the system MQTT brokers. Since there are none it can be removed as well as the observer, tests, configuration and translations. Fixes openhab#2841 Signed-off-by: Wouter Born <github@maindrain.net>
ConnectorIO · Mar 17, 2022 · 9e33db6 · 9e33db6
1 parent 7ae37f8
commit 9e33db6
Show file tree

Hide file tree

Showing 22 changed files with 6 additions and 1,204 deletions.
diff --git a/...ort.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java b/...ort.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java
@@ -16,7 +16,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 
 /**
- * Contains configuration for a MqttBrokerConnection. Necessary to add a new broker connection the {@link MqttService}.
+ * Contains configuration for a MqttBrokerConnection.
  *
  * @author David Graeff - Initial contribution
  * @author Mark Herwege - Added flag for hostname validation
@@ -53,7 +53,7 @@ public String getBrokerID() {
         if (name != null && name.length() > 0) {
             return name;
         } else {
-            StringBuffer b = new StringBuffer();
+            StringBuilder b = new StringBuilder();
             if (host != null) {
                 b.append(host);
             }
@@ -74,7 +74,7 @@ public String getBrokerID() {
      */
     @Override
     public String toString() {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
         if (name != null) {
             b.append(name);
             b.append(", ");

diff --git a/....transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java b/....transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java
@@ -12,11 +12,14 @@
  */
 package org.openhab.core.io.transport.mqtt;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The connection state of a {@link MqttBrokerConnection}.
  *
  * @author David Graeff - Initial contribution
  */
+@NonNullByDefault
 public enum MqttConnectionState {
     DISCONNECTED,
     CONNECTING,

diff --git a/....core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java b/....core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java
diff --git a/....transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java b/....transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java
diff --git a/...java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java b/...java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java
diff --git a/...rg/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java b/...rg/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java