An Interface method should not allow for throwing a generic Exception (…

…#3467) * An Interface method should not allow for throwing a generic Exception * Loglevel reduced to trace with exception * Removed placeholder for exception from log message Fixes #2396 Signed-off-by: Stefan Triller <stefan.triller@telekom.de>
eclipse-archived · May 22, 2017 · 38b3e20 · 38b3e20
1 parent c1270f0
commit 38b3e20
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/...ansport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttSenderChannel.java b/...ansport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttSenderChannel.java
@@ -7,6 +7,8 @@
  */
 package org.eclipse.smarthome.io.transport.mqtt;
 
+import java.io.IOException;
+
 /**
  * Callback interface for sending a message to the MqttBrokerConnection.
  *
@@ -19,8 +21,8 @@ public interface MqttSenderChannel {
      *
      * @param topic Topic to publish the message to.
      * @param message message payload.
-     * @throws Exception if an error occurs during sending.
+     * @throws IOException if an error occurs during sending.
      */
-    public void publish(String topic, byte[] message) throws Exception;
+    public void publish(String topic, byte[] message) throws IOException;
 
 }
diff --git a/.../src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttBrokerConnection.java b/.../src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttBrokerConnection.java
@@ -7,6 +7,7 @@
  */
 package org.eclipse.smarthome.io.transport.mqtt.internal;
 
+import java.io.IOException;
 import java.security.cert.X509Certificate;
 import java.util.List;
 import java.util.Properties;
@@ -443,7 +444,7 @@ private void startProducer(MqttMessageProducer publisher) {
         publisher.setSenderChannel(new MqttSenderChannel() {
 
             @Override
-            public void publish(String topic, byte[] payload) throws Exception {
+            public void publish(String topic, byte[] payload) throws IOException {
 
                 if (!started) {
                     logger.warn("Broker connection not started. Cannot publish message to topic '{}'", topic);
@@ -457,19 +458,22 @@ public void publish(String topic, byte[] payload) throws Exception {
 
                 // publish message asynchronously
                 MqttTopic mqttTopic = client.getTopic(topic);
-                MqttDeliveryToken deliveryToken = mqttTopic.publish(message);
-
-                logger.debug("Publishing message {} to topic '{}'", deliveryToken.getMessageId(), topic);
-                if (!async) {
-                    // wait for publish confirmation
-                    deliveryToken.waitForCompletion(10000);
-                    if (!deliveryToken.isComplete()) {
-                        logger.error(
-                                "Did not receive completion message within timeout limit whilst publishing to topic '{}'",
-                                topic);
+                MqttDeliveryToken deliveryToken;
+                try {
+                    deliveryToken = mqttTopic.publish(message);
+                    logger.debug("Publishing message {} to topic '{}'", deliveryToken.getMessageId(), topic);
+                    if (!async) {
+                        // wait for publish confirmation
+                        deliveryToken.waitForCompletion(10000);
+                        if (!deliveryToken.isComplete()) {
+                            logger.error(
+                                    "Did not receive completion message within timeout limit whilst publishing to topic '{}'",
+                                    topic);
+                        }
                     }
+                } catch (MqttException e) {
+                    logger.error("Could not publish message to topic {}", topic, e);
                 }
-
             }
         });