[insteon] Fix SAT warnings (#10688)

Signed-off-by: Rob Nielsen <rob.nielsen@yahoo.com>

diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/command/InsteonCommandExtension.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/command/InsteonCommandExtension.java
index 10e2a613def5e3bc092c8088f4377a88698ab5ad..71755823bd100be6b0e5fc65d6137e693650135d 100644 (file)
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/command/InsteonCommandExtension.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/command/InsteonCommandExtension.java
@@ -218,7 +218,7 @@ public class InsteonCommandExtension extends AbstractConsoleCommandExtension imp
     }
 
     private void startMonitoring(Console console, String addr) {
-        if (addr.equalsIgnoreCase("all")) {
+        if ("all".equalsIgnoreCase(addr)) {
             if (!monitorAllDevices) {
                 monitorAllDevices = true;
                 monitoredAddresses.clear();
@@ -255,7 +255,7 @@ public class InsteonCommandExtension extends AbstractConsoleCommandExtension imp
             return;
         }
 
-        if (addr.equalsIgnoreCase("all")) {
+        if ("all".equalsIgnoreCase(addr)) {
             if (monitorAllDevices) {
                 monitorAllDevices = false;
                 console.println("Stopped monitoring all devices.");

diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/DeviceTypeLoader.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/DeviceTypeLoader.java
index f4fe134bc2aae52216154f3e7f93f1253729a7c6..96b8b8f5daab49a6ee6d58f22a07eb7806279d4d 100644 (file)
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/DeviceTypeLoader.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/DeviceTypeLoader.java
@@ -18,7 +18,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -119,7 +118,7 @@ public class DeviceTypeLoader {
      */
     private void processDevice(Element e) throws SAXException {
         String productKey = e.getAttribute("productKey");
-        if (productKey.equals("")) {
+        if ("".equals(productKey)) {
             throw new SAXException("device in device_types file has no product key!");
         }
         if (deviceTypes.containsKey(productKey)) {
@@ -135,13 +134,14 @@ public class DeviceTypeLoader {
                 continue;
             }
             Element subElement = (Element) node;
-            if (subElement.getNodeName().equals("model")) {
+            String nodeName = subElement.getNodeName();
+            if ("model".equals(nodeName)) {
                 devType.setModel(subElement.getTextContent());
-            } else if (subElement.getNodeName().equals("description")) {
+            } else if ("description".equals(nodeName)) {
                 devType.setDescription(subElement.getTextContent());
-            } else if (subElement.getNodeName().equals("feature")) {
+            } else if ("feature".equals(nodeName)) {
                 processFeature(devType, subElement);
-            } else if (subElement.getNodeName().equals("feature_group")) {
+            } else if ("feature_group".equals(nodeName)) {
                 processFeatureGroup(devType, subElement);
             }
             deviceTypes.put(productKey, devType);
@@ -150,7 +150,7 @@ public class DeviceTypeLoader {
 
     private String processFeature(DeviceType devType, Element e) throws SAXException {
         String name = e.getAttribute("name");
-        if (name.equals("")) {
+        if ("".equals(name)) {
             throw new SAXException("feature " + e.getNodeName() + " has feature without name!");
         }
         if (!name.equals(name.toLowerCase())) {
@@ -164,11 +164,11 @@ public class DeviceTypeLoader {
 
     private String processFeatureGroup(DeviceType devType, Element e) throws SAXException {
         String name = e.getAttribute("name");
-        if (name.equals("")) {
+        if ("".equals(name)) {
             throw new SAXException("feature group " + e.getNodeName() + " has no name attr!");
         }
         String type = e.getAttribute("type");
-        if (type.equals("")) {
+        if ("".equals(type)) {
             throw new SAXException("feature group " + e.getNodeName() + " has no type attr!");
         }
         FeatureGroup fg = new FeatureGroup(name, type);
@@ -179,9 +179,10 @@ public class DeviceTypeLoader {
                 continue;
             }
             Element subElement = (Element) node;
-            if (subElement.getNodeName().equals("feature")) {
+            String nodeName = subElement.getNodeName();
+            if ("feature".equals(nodeName)) {
                 fg.addFeature(processFeature(devType, subElement));
-            } else if (subElement.getNodeName().equals("feature_group")) {
+            } else if ("feature_group".equals(nodeName)) {
                 fg.addFeature(processFeatureGroup(devType, subElement));
             }
         }
@@ -191,16 +192,6 @@ public class DeviceTypeLoader {
         return (name);
     }
 
-    /**
-     * Helper function for debugging
-     */
-    private void logDeviceTypes() {
-        for (Entry<String, DeviceType> dt : getDeviceTypes().entrySet()) {
-            String msg = String.format("%-10s->", dt.getKey()) + dt.getValue();
-            logger.debug("{}", msg);
-        }
-    }
-
     /**
      * Singleton instance function, creates DeviceTypeLoader
      *

diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/FeatureTemplateLoader.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/FeatureTemplateLoader.java
index b297bfdb9d4c2b3cbe57972b0c98ae4b69c78078..ff05e9f4e37f12d1ae3954b300f496d9cbf14337 100644 (file)
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/FeatureTemplateLoader.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/FeatureTemplateLoader.java
@@ -70,7 +70,7 @@ public class FeatureTemplateLoader {
                 Node node = nodes.item(i);
                 if (node.getNodeType() == Node.ELEMENT_NODE) {
                     Element e = (Element) node;
-                    if (e.getTagName().equals("feature")) {
+                    if ("feature".equals(e.getTagName())) {
                         features.add(parseFeature(e));
                     }
                 }
@@ -126,7 +126,7 @@ public class FeatureTemplateLoader {
 
     private static void parseMessageHandler(Element e, FeatureTemplate f) throws DOMException, ParsingException {
         HandlerEntry he = makeHandlerEntry(e);
-        if (e.getAttribute("default").equals("true")) {
+        if ("true".equals(e.getAttribute("default"))) {
             f.setDefaultMessageHandler(he);
         } else {
             String attr = e.getAttribute("cmd");
@@ -137,7 +137,7 @@ public class FeatureTemplateLoader {
 
     private static void parseCommandHandler(Element e, FeatureTemplate f) throws ParsingException {
         HandlerEntry he = makeHandlerEntry(e);
-        if (e.getAttribute("default").equals("true")) {
+        if ("true".equals(e.getAttribute("default"))) {
             f.setDefaultCommandHandler(he);
         } else {
             Class<? extends Command> command = parseCommandClass(e.getAttribute("command"));
@@ -156,13 +156,13 @@ public class FeatureTemplateLoader {
     }
 
     private static Class<? extends Command> parseCommandClass(String c) throws ParsingException {
-        if (c.equals("OnOffType")) {
+        if ("OnOffType".equals(c)) {
             return OnOffType.class;
-        } else if (c.equals("PercentType")) {
+        } else if ("PercentType".equals(c)) {
             return PercentType.class;
-        } else if (c.equals("DecimalType")) {
+        } else if ("DecimalType".equals(c)) {
             return DecimalType.class;
-        } else if (c.equals("IncreaseDecreaseType")) {
+        } else if ("IncreaseDecreaseType".equals(c)) {
             return IncreaseDecreaseType.class;
         } else {
             throw new ParsingException("Unknown Command Type");

diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/MessageHandler.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/MessageHandler.java
index 3faf7307e1edb4eeaef249589c9858f89f68dd6d..a01db6f6f0613ddd971a9164aaed09777d91e9f8 100644 (file)
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/MessageHandler.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/MessageHandler.java
@@ -1078,9 +1078,9 @@ public abstract class MessageHandler {
                 @Nullable
                 State state;
                 String scale = getStringParameter("scale", null);
-                if (scale != null && scale.equals("celsius")) {
+                if ("celsius".equals(scale)) {
                     state = new QuantityType<>(dvalue, SIUnits.CELSIUS);
-                } else if (scale != null && scale.equals("fahrenheit")) {
+                } else if ("fahrenheit".equals(scale)) {
                     state = new QuantityType<>(dvalue, ImperialUnits.FAHRENHEIT);
                 } else {
                     state = new DecimalType(dvalue);
@@ -1102,7 +1102,7 @@ public abstract class MessageHandler {
                 return 0;
             }
             int value = 0;
-            if (lowByte.equals("group")) {
+            if ("group".equals(lowByte)) {
                 value = group;
             } else {
                 value = msg.getByte(lowByte) & 0xFF;

diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/driver/SerialIOStream.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/driver/SerialIOStream.java
index 746a5b1f203a0a63e92914a5076d36f86c3aba2a..f9b953cc63672683a9a5c2d7780cd515dd80e637 100644 (file)
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/driver/SerialIOStream.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/driver/SerialIOStream.java
@@ -58,7 +58,7 @@ public class SerialIOStream extends IOStream {
             } else {
                 String key = paramParts[0];
                 String value = paramParts[1];
-                if (key.equals("baudRate")) {
+                if ("baudRate".equals(key)) {
                     try {
                         baudRate = Integer.parseInt(value);
                     } catch (NumberFormatException e) {

diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonNetworkHandler.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonNetworkHandler.java
index 708693dbb38b518acd1ade17bac602979917266e..cea0cd66f4bdb60cbe5e2bc38172fe56e2ea365a 100644 (file)
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonNetworkHandler.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonNetworkHandler.java
@@ -52,7 +52,6 @@ public class InsteonNetworkHandler extends BaseBridgeHandler {
 
     private final Logger logger = LoggerFactory.getLogger(InsteonNetworkHandler.class);
 
-    private @Nullable InsteonNetworkConfiguration config;
     private @Nullable InsteonBinding insteonBinding;
     private @Nullable InsteonDeviceDiscoveryService insteonDeviceDiscoveryService;
     private @Nullable ScheduledFuture<?> pollingJob = null;
@@ -77,17 +76,9 @@ public class InsteonNetworkHandler extends BaseBridgeHandler {
     @Override
     public void initialize() {
         logger.debug("Starting Insteon bridge");
-        config = getConfigAs(InsteonNetworkConfiguration.class);
+        InsteonNetworkConfiguration config = getConfigAs(InsteonNetworkConfiguration.class);
 
         scheduler.execute(() -> {
-            InsteonNetworkConfiguration config = this.config;
-            if (config == null) {
-                String msg = "Initialization failed, configuration is null.";
-                logger.warn(msg);
-
-                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, msg);
-                return;
-            }
             SerialPortManager serialPortManager = this.serialPortManager;
             if (serialPortManager == null) {
                 String msg = "Initialization failed, serial port manager is null.";