From c81506b44d2edf8da66dbb77b22b91a6003a007f Mon Sep 17 00:00:00 2001 From: mlobstein Date: Sun, 27 Mar 2022 08:53:21 -0500 Subject: [PATCH] [yamahareceiver] Remove Apache commons libraries (#12527) Signed-off-by: Michael Lobstein --- .../protocol/xml/InputWithPresetControlXML.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/InputWithPresetControlXML.java b/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/InputWithPresetControlXML.java index 5a6868f0b..609f80c3e 100644 --- a/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/InputWithPresetControlXML.java +++ b/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/xml/InputWithPresetControlXML.java @@ -18,8 +18,6 @@ import static org.openhab.binding.yamahareceiver.internal.protocol.xml.XMLUtils. import java.io.IOException; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; import org.openhab.binding.yamahareceiver.internal.protocol.AbstractConnection; import org.openhab.binding.yamahareceiver.internal.protocol.InputWithPresetControl; import org.openhab.binding.yamahareceiver.internal.protocol.ReceivedMessageParseException; @@ -50,6 +48,8 @@ import org.w3c.dom.Node; */ public class InputWithPresetControlXML extends AbstractInputControlXML implements InputWithPresetControl { + private static final String PRESET_LETTERS = "ABCD"; + protected CommandTemplate preset = new CommandTemplate( "%s", "Play_Control/Preset/Preset_Sel"); @@ -147,7 +147,7 @@ public class InputWithPresetControlXML extends AbstractInputControlXML implement private int convertToPresetNumber(String presetValue) { if (!presetValue.isEmpty()) { - if (StringUtils.isNumeric(presetValue)) { + if (presetValue.chars().allMatch(Character::isDigit)) { return Integer.parseInt(presetValue); } else { // special handling for RX-V3900, where 'A1' becomes 101 and 'B2' becomes 202 preset @@ -156,7 +156,7 @@ public class InputWithPresetControlXML extends AbstractInputControlXML implement if (Character.isLetter(presetAlpha) && Character.isUpperCase(presetAlpha) && Character.isDigit(presetValue.charAt(1))) { int presetNumber = Integer.parseInt(presetValue.substring(1)); - return (ArrayUtils.indexOf(LETTERS, presetAlpha) + 1) * 100 + presetNumber; + return (PRESET_LETTERS.indexOf(presetAlpha) + 1) * 100 + presetNumber; } } } @@ -177,7 +177,7 @@ public class InputWithPresetControlXML extends AbstractInputControlXML implement // special handling for RX-V3900, where 'A1' becomes 101 and 'B2' becomes 202 preset if (presetChannel > 100) { int presetNumber = presetChannel % 100; - char presetAlpha = LETTERS[presetChannel / 100 - 1]; + char presetAlpha = PRESET_LETTERS.charAt(presetChannel / 100 - 1); presetValue = Character.toString(presetAlpha) + presetNumber; } else { presetValue = Integer.toString(presetChannel); @@ -187,6 +187,4 @@ public class InputWithPresetControlXML extends AbstractInputControlXML implement comReference.get().send(cmd); update(); } - - private static final Character[] LETTERS = new Character[] { 'A', 'B', 'C', 'D' }; }