public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[plugwise] Remove org.apache.common (#14432)

Browse Source 
Signed-off-by: lsiepel <leosiepel@gmail.com>
This commit is contained in:
lsiepel
2023-03-03 15:11:08 +01:00
committed by GitHub
parent 660ec10d4b
commit 36201dd6d1
3 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,6 @@ import java.util.TooManyListenersException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.plugwise.internal.protocol.AcknowledgementMessage;
@@ -95,7 +94,7 @@ public class PlugwiseMessageProcessor implements SerialPortEventListener {
*/
private void parseAndQueue(ByteBuffer readBuffer) {
String response = new String(readBuffer.array(), 0, readBuffer.limit());
response = StringUtils.chomp(response);
response = response.replaceAll("\r", "").replaceAll("\n", "");
Matcher matcher = RESPONSE_PATTERN.matcher(response);

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

@@ -20,8 +20,6 @@ import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.text.WordUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.plugwise.internal.protocol.InformationResponseMessage;
@@ -102,8 +100,19 @@ public final class PlugwiseUtils {
}
public static String upperUnderscoreToLowerCamel(String text) {
String upperCamel = StringUtils.remove(WordUtils.capitalizeFully(text, new char[] { '_' }), "_");
return upperCamel.substring(0, 1).toLowerCase() + upperCamel.substring(1);
final String delimiter = "_";
StringBuilder upperCamelBuilder = new StringBuilder(text.length());
for (String str : text.split(delimiter)) {
if (upperCamelBuilder.isEmpty() && str.length() > 0) {
upperCamelBuilder.append(str.substring(0, 1).toLowerCase());
} else if (str.length() > 0) {
upperCamelBuilder.append(str.substring(0, 1).toUpperCase());
}
if (str.length() > 1) {
upperCamelBuilder.append(str.substring(1).toLowerCase());
}
}
return upperCamelBuilder.toString();
}
public static boolean updateProperties(Map<String, String> properties, InformationResponseMessage message) {