[smartmeter] Remove org.apache.common (#14436)

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

diff --git a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterHandler.java b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterHandler.java
index 1134310e850a6dbbc02279c4b7157dc6ce921c99..2f9a5dec1190a3a80b0d388d56272c1285e7a9d1 100644 (file)
--- a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterHandler.java
+++ b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterHandler.java
@@ -25,7 +25,6 @@ import java.util.function.Supplier;
 import javax.measure.Quantity;
 import javax.measure.Unit;
 
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.DefaultLocation;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -101,7 +100,7 @@ public class SmartMeterHandler extends BaseThingHandler {
                     "Parameter 'port' is mandatory and must be configured");
         } else {
             byte[] pullSequence = config.initMessage == null ? null
-                    : HexUtils.hexToBytes(StringUtils.deleteWhitespace(config.initMessage));
+                    : HexUtils.hexToBytes(config.initMessage.replaceAll("\\s+", ""));
             int baudrate = config.baudrate == null ? Baudrate.AUTO.getBaudrate()
                     : Baudrate.fromString(config.baudrate).getBaudrate();
             this.conformity = config.conformity == null ? Conformity.NONE : Conformity.valueOf(config.conformity);

diff --git a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/helper/SerialParameter.java b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/helper/SerialParameter.java
index bc51e0fed945d2dfb10d9143ba1f9125bd351edc..23cbc214d563e29a64923038740ba3ed038aab1b 100644 (file)
--- a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/helper/SerialParameter.java
+++ b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/helper/SerialParameter.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.binding.smartmeter.internal.helper;
 
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.io.transport.serial.SerialPort;
 
@@ -66,7 +65,7 @@ public enum SerialParameter {
      */
     public static SerialParameter fromString(String params) {
         try {
-            return valueOf("_" + StringUtils.upperCase(params));
+            return valueOf("_" + params.toUpperCase());
         } catch (IllegalArgumentException e) {
             return SerialParameter._8N1;
         }