[plugwise] Prevent possible chomp bug

bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/PlugwiseMessageProcessor.java

@@ -30,6 +30,7 @@
 import org.openhab.core.io.transport.serial.SerialPort;
 import org.openhab.core.io.transport.serial.SerialPortEvent;
 import org.openhab.core.io.transport.serial.SerialPortEventListener;
+import org.openhab.core.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -93,7 +94,7 @@ public PlugwiseMessageProcessor(PlugwiseCommunicationContext context) {
  */
  private void parseAndQueue(ByteBuffer readBuffer) {
  String response = new String(readBuffer.array(), 0, readBuffer.limit());
- response = response.replace("\r", "").replace("\n", "");
+ response = StringUtils.chomp(response);
 
  Matcher matcher = RESPONSE_PATTERN.matcher(response);
 

bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/PlugwiseUtils.java

@@ -76,10 +76,6 @@ public static DeviceType getDeviceType(ThingTypeUID uid) {
  }
  }
 
- public static String lowerCamelToUpperUnderscore(String text) {
- return text.replaceAll("([a-z])([A-Z]+)", "$1_$2").toUpperCase();
- }
-
  public static <T extends Comparable<T>> T minComparable(T first, T second) {
  return first.compareTo(second) <= 0 ? first : second;
  }

bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/config/PlugwiseRelayConfig.java

@@ -12,13 +12,15 @@
  */
 package org.openhab.binding.plugwise.internal.config;
 
-import static org.openhab.binding.plugwise.internal.PlugwiseUtils.*;
 import static org.openhab.binding.plugwise.internal.config.PlugwiseRelayConfig.PowerStateChanging.COMMAND_SWITCHING;
 
 import java.time.Duration;
+import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.plugwise.internal.protocol.field.MACAddress;
+import org.openhab.binding.plugwise.internal.util.StringUtil;
+import org.openhab.core.util.StringUtils;
 
 /**
  * The {@link PlugwiseRelayConfig} class represents the configuration for a Plugwise relay device (Circle, Circle+,
@@ -36,7 +38,8 @@ public enum PowerStateChanging {
  }
 
  private String macAddress = "";
- private String powerStateChanging = upperUnderscoreToLowerCamel(COMMAND_SWITCHING.name());
+ private String powerStateChanging = Objects
+ .requireNonNull(StringUtils.capitalizeByUnderscore(COMMAND_SWITCHING.name()));
  private boolean suppliesPower = false;
  private int measurementInterval = 60; // minutes
  private boolean temporarilyNotInNetwork = false;
@@ -47,7 +50,7 @@ public MACAddress getMACAddress() {
  }
 
  public PowerStateChanging getPowerStateChanging() {
- return PowerStateChanging.valueOf(lowerCamelToUpperUnderscore(powerStateChanging));
+ return PowerStateChanging.valueOf(StringUtil.lowerCamelToUpperUnderscore(powerStateChanging));
  }
 
  public boolean isSuppliesPower() {

bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/config/PlugwiseScanConfig.java

@@ -12,14 +12,16 @@
  */
 package org.openhab.binding.plugwise.internal.config;
 
-import static org.openhab.binding.plugwise.internal.PlugwiseUtils.*;
 import static org.openhab.binding.plugwise.internal.protocol.field.Sensitivity.MEDIUM;
 
 import java.time.Duration;
+import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.plugwise.internal.protocol.field.MACAddress;
 import org.openhab.binding.plugwise.internal.protocol.field.Sensitivity;
+import org.openhab.binding.plugwise.internal.util.StringUtil;
+import org.openhab.core.util.StringUtils;
 
 /**
  * The {@link PlugwiseScanConfig} class represents the configuration for a Plugwise Scan.
@@ -30,7 +32,7 @@
 public class PlugwiseScanConfig {
 
  private String macAddress = "";
- private String sensitivity = upperUnderscoreToLowerCamel(MEDIUM.name());
+ private String sensitivity = Objects.requireNonNull(StringUtils.capitalizeByUnderscore(MEDIUM.name()));
  private int switchOffDelay = 5; // minutes
  private boolean daylightOverride = false;
  private int wakeupInterval = 1440; // minutes (1 day)
@@ -43,7 +45,7 @@ public MACAddress getMACAddress() {
  }
 
  public Sensitivity getSensitivity() {
- return Sensitivity.valueOf(lowerCamelToUpperUnderscore(sensitivity));
+ return Sensitivity.valueOf(StringUtil.lowerCamelToUpperUnderscore(sensitivity));
  }
 
  public Duration getSwitchOffDelay() {

bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/config/PlugwiseSenseConfig.java

@@ -12,18 +12,20 @@
  */
 package org.openhab.binding.plugwise.internal.config;
 
-import static org.openhab.binding.plugwise.internal.PlugwiseUtils.*;
 import static org.openhab.binding.plugwise.internal.protocol.field.BoundaryAction.OFF_BELOW_ON_ABOVE;
 import static org.openhab.binding.plugwise.internal.protocol.field.BoundaryType.NONE;
 
 import java.time.Duration;
+import java.util.Optional;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.plugwise.internal.protocol.field.BoundaryAction;
 import org.openhab.binding.plugwise.internal.protocol.field.BoundaryType;
 import org.openhab.binding.plugwise.internal.protocol.field.Humidity;
 import org.openhab.binding.plugwise.internal.protocol.field.MACAddress;
 import org.openhab.binding.plugwise.internal.protocol.field.Temperature;
+import org.openhab.binding.plugwise.internal.util.StringUtil;
+import org.openhab.core.util.StringUtils;
 
 /**
  * The {@link PlugwiseScanConfig} class represents the configuration for a Plugwise Sense.
@@ -35,8 +37,9 @@ public class PlugwiseSenseConfig {
 
  private String macAddress = "";
  private int measurementInterval = 15; // minutes
- private String boundaryType = upperUnderscoreToLowerCamel(NONE.name());
- private String boundaryAction = upperUnderscoreToLowerCamel(OFF_BELOW_ON_ABOVE.name());
+ private String boundaryType = Optional.ofNullable(StringUtils.capitalizeByUnderscore(NONE.name())).orElse("");
+ private String boundaryAction = Optional.ofNullable(StringUtils.capitalizeByUnderscore(OFF_BELOW_ON_ABOVE.name()))
+ .orElse("");
  private int temperatureBoundaryMin = 15; // degrees Celsius
  private int temperatureBoundaryMax = 25; // degrees Celsius
  private int humidityBoundaryMin = 45; // relative humidity (RH)
@@ -54,11 +57,11 @@ public Duration getMeasurementInterval() {
  }
 
  public BoundaryType getBoundaryType() {
- return BoundaryType.valueOf(lowerCamelToUpperUnderscore(boundaryType));
+ return BoundaryType.valueOf(StringUtil.lowerCamelToUpperUnderscore(boundaryType));
  }
 
  public BoundaryAction getBoundaryAction() {
- return BoundaryAction.valueOf(lowerCamelToUpperUnderscore(boundaryAction));
+ return BoundaryAction.valueOf(StringUtil.lowerCamelToUpperUnderscore(boundaryAction));
  }
 
  public Temperature getTemperatureBoundaryMin() {

bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/util/StringUtil.java

@@ -0,0 +1,28 @@
+/**
+ * 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.plugwise.internal.util;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * Utility class for sharing string utility methods.
+ *
+ * @author Leo Siepel - Initial contribution
+ */
+@NonNullByDefault
+public final class StringUtil {
+
+ public static String lowerCamelToUpperUnderscore(String text) {
+ return text.replaceAll("([a-z])([A-Z]+)", "$1_$2").toUpperCase();
+ }
+}