[irtrans] Remove org.apache.common (#14408)

* Fix warnings

Signed-off-by: Leo Siepel <leosiepel@gmail.com>

diff --git a/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/IrCommand.java b/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/IrCommand.java
index b1497e8aa255cf92518e68b0da98390646d01479..657cd551ceeb1e9af984f594bb8b4d2259361822 100644 (file)
--- a/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/IrCommand.java
+++ b/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/IrCommand.java
@@ -43,8 +43,8 @@ public class IrCommand {
      *
      */
     private class PulsePair {
-        public int Pulse;
-        public int Pause;
+        public int pulse;
+        public int pause;
     }
 
     private String remote;
@@ -254,7 +254,7 @@ public class IrCommand {
 
         // Pause timings - 8 Shorts = 16 bytes
         for (int i = 0; i < pulsePairs.size(); i++) {
-            byteBuffer.putShort((short) Math.round(pulsePairs.get(i).Pause / 8));
+            byteBuffer.putShort((short) Math.round(pulsePairs.get(i).pause / 8));
         }
         for (int i = pulsePairs.size(); i <= 7; i++) {
             byteBuffer.putShort((short) 0);
@@ -262,7 +262,7 @@ public class IrCommand {
 
         // Pulse timings - 8 Shorts = 16 bytes
         for (int i = 0; i < pulsePairs.size(); i++) {
-            byteBuffer.putShort((short) Math.round(pulsePairs.get(i).Pulse / 8));
+            byteBuffer.putShort((short) Math.round(pulsePairs.get(i).pulse / 8));
         }
         for (int i = pulsePairs.size(); i <= 7; i++) {
             byteBuffer.putShort((short) 0);

diff --git a/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/BlasterHandler.java b/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/BlasterHandler.java
index 1be5e4d08c58c99fe4fc8e4ad7e008c94c43458c..78a8cbfe891abf4b5528f43e4cd3e8bcc09ba211 100644 (file)
--- a/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/BlasterHandler.java
+++ b/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/BlasterHandler.java
@@ -14,7 +14,6 @@ package org.openhab.binding.irtrans.internal.handler;
 
 import static org.openhab.binding.irtrans.internal.IRtransBindingConstants.CHANNEL_IO;
 
-import org.apache.commons.lang3.StringUtils;
 import org.openhab.binding.irtrans.internal.IRtransBindingConstants.Led;
 import org.openhab.binding.irtrans.internal.IrCommand;
 import org.openhab.core.library.types.StringType;
@@ -70,12 +69,15 @@ public class BlasterHandler extends BaseThingHandler implements TransceiverStatu
         if (!(command instanceof RefreshType)) {
             if (channelUID.getId().equals(CHANNEL_IO)) {
                 if (command instanceof StringType) {
-                    String remoteName = StringUtils.substringBefore(command.toString(), ",");
-                    String irCommandName = StringUtils.substringAfter(command.toString(), ",");
+                    String[] remoteCommand = command.toString().split(",", 2);
+                    if (remoteCommand.length < 2) {
+                        logger.warn("Ignoring invalid command '{}'", command);
+                        return;
+                    }
 
                     IrCommand ircommand = new IrCommand();
-                    ircommand.setRemote(remoteName);
-                    ircommand.setCommand(irCommandName);
+                    ircommand.setRemote(remoteCommand[0]);
+                    ircommand.setCommand(remoteCommand[1]);
 
                     IrCommand thingCompatibleCommand = new IrCommand();
                     thingCompatibleCommand.setRemote((String) getConfig().get(REMOTE));

diff --git a/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/EthernetBridgeHandler.java b/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/EthernetBridgeHandler.java
index 7c179477462b3b58f03caa6da95fbba7f561a731..825616e8d668bfd155242cf91fc52ef9d2cba353 100644 (file)
--- a/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/EthernetBridgeHandler.java
+++ b/bundles/org.openhab.binding.irtrans/src/main/java/org/openhab/binding/irtrans/internal/handler/EthernetBridgeHandler.java
@@ -35,8 +35,6 @@ import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.jdt.annotation.NonNull;
 import org.openhab.binding.irtrans.internal.IRtransBindingConstants;
 import org.openhab.binding.irtrans.internal.IRtransBindingConstants.Led;
 import org.openhab.binding.irtrans.internal.IrCommand;
@@ -51,6 +49,7 @@ import org.openhab.core.thing.binding.BaseBridgeHandler;
 import org.openhab.core.types.Command;
 import org.openhab.core.types.RefreshType;
 import org.openhab.core.util.HexUtils;
+import org.openhab.core.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -179,11 +178,11 @@ public class EthernetBridgeHandler extends BaseBridgeHandler implements Transcei
         }
     }
 
-    public boolean registerTransceiverStatusListener(@NonNull TransceiverStatusListener transceiverStatusListener) {
+    public boolean registerTransceiverStatusListener(TransceiverStatusListener transceiverStatusListener) {
         return transceiverStatusListeners.add(transceiverStatusListener);
     }
 
-    public boolean unregisterTransceiverStatusListener(@NonNull TransceiverStatusListener transceiverStatusListener) {
+    public boolean unregisterTransceiverStatusListener(TransceiverStatusListener transceiverStatusListener) {
         return transceiverStatusListeners.remove(transceiverStatusListener);
     }
 
@@ -277,12 +276,15 @@ public class EthernetBridgeHandler extends BaseBridgeHandler implements Transcei
                 if (channel.getChannelTypeUID() != null
                         && channel.getChannelTypeUID().getId().equals(IRtransBindingConstants.BLASTER_CHANNEL_TYPE)) {
                     if (command instanceof StringType) {
-                        String remoteName = StringUtils.substringBefore(command.toString(), ",");
-                        String irCommandName = StringUtils.substringAfter(command.toString(), ",");
+                        String[] remoteCommand = command.toString().split(",", 2);
+                        if (remoteCommand.length < 2) {
+                            logger.warn("Ignoring invalid command '{}'", command);
+                            return;
+                        }
 
                         IrCommand ircommand = new IrCommand();
-                        ircommand.setRemote(remoteName);
-                        ircommand.setCommand(irCommandName);
+                        ircommand.setRemote(remoteCommand[0]);
+                        ircommand.setCommand(remoteCommand[1]);
 
                         IrCommand thingCompatibleCommand = new IrCommand();
                         thingCompatibleCommand.setRemote((String) channelConfiguration.get(REMOTE));
@@ -343,14 +345,12 @@ public class EthernetBridgeHandler extends BaseBridgeHandler implements Transcei
 
             if (response != null) {
                 String message = stripByteCount(response).split("\0")[0];
-                if (message != null) {
-                    if (message.contains("VERSION")) {
-                        logger.info("'{}' matches an IRtrans device with firmware {}", getThing().getUID(), message);
-                        getConfig().put(FIRMWARE_VERSION, message);
-                    } else {
-                        logger.debug("Received some non-compliant garbage ({})", message);
-                        onConnectionLost();
-                    }
+                if (message.contains("VERSION")) {
+                    logger.info("'{}' matches an IRtrans device with firmware {}", getThing().getUID(), message);
+                    getConfig().put(FIRMWARE_VERSION, message);
+                } else {
+                    logger.debug("Received some non-compliant garbage ({})", message);
+                    onConnectionLost();
                 }
             } else {
                 try {
@@ -441,20 +441,17 @@ public class EthernetBridgeHandler extends BaseBridgeHandler implements Transcei
         if (response != null) {
             String message = stripByteCount(response).split("\0")[0];
             logger.trace("commands returned {}", message);
-            if (message != null) {
-                if (message.contains("COMMANDLIST")) {
-                    commandList = message.split(",");
-                } else {
-                    logger.debug("Received some non-compliant command ({})", message);
-                    onConnectionLost();
-                }
+            if (message.contains("COMMANDLIST")) {
+                commandList = message.split(",");
+            } else {
+                logger.debug("Received some non-compliant command ({})", message);
+                onConnectionLost();
             }
         } else {
             logger.debug("Did not receive an answer from the IRtrans transceiver for '{}' - Parsing is skipped",
                     getThing().getUID());
             onConnectionLost();
         }
-
         return commandList;
     }
 
@@ -466,13 +463,11 @@ public class EthernetBridgeHandler extends BaseBridgeHandler implements Transcei
         if (response != null) {
             String message = stripByteCount(response).split("\0")[0];
             logger.trace("remotes returned {}", message);
-            if (message != null) {
-                if (message.contains("REMOTELIST")) {
-                    remoteList = message.split(",");
-                } else {
-                    logger.debug("Received some non-compliant command ({})", message);
-                    onConnectionLost();
-                }
+            if (message.contains("REMOTELIST")) {
+                remoteList = message.split(",");
+            } else {
+                logger.debug("Received some non-compliant command ({})", message);
+                onConnectionLost();
             }
         } else {
             logger.debug("Did not receive an answer from the IRtrans transceiver for '{}' - Parsing is skipped",
@@ -493,7 +488,7 @@ public class EthernetBridgeHandler extends BaseBridgeHandler implements Transcei
 
             if (response != null) {
                 String message = stripByteCount(response).split("\0")[0];
-                if (message != null && message.contains("RESULT OK")) {
+                if (message.contains("RESULT OK")) {
                     return true;
                 } else {
                     logger.debug("Received an unexpected response from the IRtrans transceiver: '{}'", message);