From cd3636d4e35880ecdc4d529aa4de2e7af7e37240 Mon Sep 17 00:00:00 2001 From: Leo Siepel Date: Tue, 17 Oct 2023 22:58:37 +0200 Subject: [PATCH] adapt to core StringUtils Signed-off-by: Leo Siepel --- .../binding/phc/internal/PHCHelper.java | 2 +- .../internal/handler/PHCBridgeHandler.java | 2 +- .../phc/internal/util/StringUtils.java | 32 ---------------- .../phc/internal/util/StringUtilsTest.java | 38 ------------------- 4 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/util/StringUtils.java delete mode 100644 bundles/org.openhab.binding.phc/src/test/java/org/openhab/binding/phc/internal/util/StringUtilsTest.java diff --git a/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/PHCHelper.java b/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/PHCHelper.java index 0bef3dc33b207..b0b8aa8f59a9e 100644 --- a/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/PHCHelper.java +++ b/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/PHCHelper.java @@ -13,9 +13,9 @@ package org.openhab.binding.phc.internal; 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; +import org.openhab.core.util.StringUtils; /** * The {@link PHCHelper} is responsible for finding the appropriate Thing(UID) diff --git a/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/handler/PHCBridgeHandler.java b/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/handler/PHCBridgeHandler.java index 534e3a2208a54..8d67b7950dcf9 100644 --- a/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/handler/PHCBridgeHandler.java +++ b/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/handler/PHCBridgeHandler.java @@ -28,7 +28,6 @@ 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; @@ -48,6 +47,7 @@ import org.openhab.core.thing.binding.BaseBridgeHandler; import org.openhab.core.types.Command; import org.openhab.core.util.HexUtils; +import org.openhab.core.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/util/StringUtils.java b/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/util/StringUtils.java deleted file mode 100644 index 69b768bcdb8f3..0000000000000 --- a/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/util/StringUtils.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * 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/bundles/org.openhab.binding.phc/src/test/java/org/openhab/binding/phc/internal/util/StringUtilsTest.java b/bundles/org.openhab.binding.phc/src/test/java/org/openhab/binding/phc/internal/util/StringUtilsTest.java deleted file mode 100644 index e8000a8a76b2c..0000000000000 --- a/bundles/org.openhab.binding.phc/src/test/java/org/openhab/binding/phc/internal/util/StringUtilsTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * 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")); - } -}