[phc] Remove import org.apache.common (openhab#14422)

Signed-off-by: lsiepel <leosiepel@gmail.com>
nemerdaud · Feb 28, 2023 · c5f2beb · c5f2beb
1 parent e651d10
commit c5f2beb
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 5 deletions.
diff --git a/...les/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/PHCHelper.java b/...les/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/PHCHelper.java
@@ -12,8 +12,8 @@
  */
 package org.openhab.binding.phc.internal;
 
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.binding.phc.internal.util.StringUtils;
 import org.openhab.core.thing.ThingTypeUID;
 import org.openhab.core.thing.ThingUID;
 
@@ -35,7 +35,7 @@ public class PHCHelper {
      */
     public static ThingUID getThingUIDreverse(ThingTypeUID thingTypeUID, byte moduleAddr) {
         // convert to 5-bit binary string and reverse in second step
-        String thingID = StringUtils.leftPad(StringUtils.trim(Integer.toBinaryString(moduleAddr & 0xFF)), 5, '0');
+        String thingID = StringUtils.padLeft(Integer.toBinaryString(moduleAddr & 0xFF).trim(), 5, "0");
         thingID = new StringBuilder(thingID).reverse().toString();
 
         ThingUID thingUID = new ThingUID(thingTypeUID, thingID);
@@ -52,7 +52,7 @@ public static ThingUID getThingUIDreverse(ThingTypeUID thingTypeUID, byte module
     public static Object bytesToBinaryString(byte[] bytes) {
         StringBuilder bin = new StringBuilder();
         for (byte b : bytes) {
-            bin.append(StringUtils.leftPad(StringUtils.trim(Integer.toBinaryString(b & 0xFF)), 8, '0'));
+            bin.append(StringUtils.padLeft(Integer.toBinaryString(b & 0xFF).trim(), 8, "0"));
             bin.append(' ');
         }
 

diff --git a/....binding.phc/src/main/java/org/openhab/binding/phc/internal/handler/PHCBridgeHandler.java b/....binding.phc/src/main/java/org/openhab/binding/phc/internal/handler/PHCBridgeHandler.java
@@ -24,11 +24,11 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.phc.internal.PHCBindingConstants;
 import org.openhab.binding.phc.internal.PHCHelper;
+import org.openhab.binding.phc.internal.util.StringUtils;
 import org.openhab.core.io.transport.serial.PortInUseException;
 import org.openhab.core.io.transport.serial.SerialPort;
 import org.openhab.core.io.transport.serial.SerialPortEvent;
@@ -712,7 +712,7 @@ private short crc16Update(short crc, byte messagePart) {
     private void handleIncomingCommand(byte moduleAddress, int channel, OnOffType onOff) {
         ThingUID uid = PHCHelper.getThingUIDreverse(PHCBindingConstants.THING_TYPE_EM, moduleAddress);
         Thing thing = getThing().getThing(uid);
-        String channelId = "em#" + StringUtils.leftPad(Integer.toString(channel), 2, '0');
+        String channelId = "em#" + StringUtils.padLeft(Integer.toString(channel), 2, "0");
 
         if (thing != null && thing.getHandler() != null) {
             logger.debug("Input: {}, {}, {}", thing.getUID(), channelId, onOff);

diff --git a/....openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/util/StringUtils.java b/....openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/util/StringUtils.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2010-2023 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.phc.internal.util;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
+/**
+ * The {@link StringUtils} class defines some static string utility methods
+ *
+ * @author Leo Siepel - Initial contribution
+ */
+@NonNullByDefault
+public class StringUtils {
+
+    public static String padLeft(@Nullable String input, int minSize, String padString) {
+        if (input == null) {
+            input = "";
+        }
+        return String.format("%" + minSize + "s", input).replace(" ", padString);
+    }
+}
diff --git a/...nhab.binding.phc/src/test/java/org/openhab/binding/phc/internal/util/StringUtilsTest.java b/...nhab.binding.phc/src/test/java/org/openhab/binding/phc/internal/util/StringUtilsTest.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2010-2023 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+package org.openhab.binding.phc.internal.util;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.junit.jupiter.api.Test;
+
+/**
+ * The {@link StringUtils} class defines some static string utility methods
+ *
+ * @author Leo Siepel - Initial contribution
+ */
+@NonNullByDefault
+public class StringUtilsTest {
+
+    @Test
+    public void padLeft() {
+        assertEquals("000000", StringUtils.padLeft("", 6, "0"));
+        assertEquals("000000", StringUtils.padLeft(null, 6, "0"));
+        assertEquals("000teststr", StringUtils.padLeft("teststr", 10, "0"));
+        assertEquals("AAAAAAp3RF@CT", StringUtils.padLeft("p3RF@CT", 13, "A"));
+        assertEquals("nopaddingshouldhappen", StringUtils.padLeft("nopaddingshouldhappen", 21, "x"));
+        assertEquals("LongerStringThenMinSize", StringUtils.padLeft("LongerStringThenMinSize", 10, "x"));
+    }
+}