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

Rework more commons-lang usages (#10314)

Browse Source 
* Reworks many commons-lang usages to use standard Java
* Updates all remaining commons.lang imports to commons.lang3

Related to openhab/openhab-addons#7722

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2021-03-16 12:38:16 +01:00
committed by GitHub
parent 16fba31556
commit f3503430b4
257 changed files with 906 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/config/IPBridgeConfig.java
View File

@@ -12,7 +12,7 @@
*/
package org.openhab.binding.lutron.internal.config;
import org.openhab.binding.lutron.internal.StringUtils;
import java.util.Objects;
/**
* Configuration settings for an {@link org.openhab.binding.lutron.internal.handler.IPBridgeHandler}.
@@ -30,8 +30,8 @@ public class IPBridgeConfig {
public int delay = 0;
public boolean sameConnectionParameters(IPBridgeConfig config) {
return StringUtils.equals(ipAddress, config.ipAddress) && StringUtils.equals(user, config.user)
&& StringUtils.equals(password, config.password) && (reconnect == config.reconnect)
return Objects.equals(ipAddress, config.ipAddress) && Objects.equals(user, config.user)
&& Objects.equals(password, config.password) && (reconnect == config.reconnect)
&& (heartbeat == config.heartbeat) && (delay == config.delay);
}
}

4
bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/handler/IPBridgeHandler.java
View File

@@ -25,7 +25,6 @@ import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.openhab.binding.lutron.internal.StringUtils;
import org.openhab.binding.lutron.internal.config.IPBridgeConfig;
import org.openhab.binding.lutron.internal.discovery.LutronDeviceDiscoveryService;
import org.openhab.binding.lutron.internal.net.TelnetSession;
@@ -156,7 +155,8 @@ public class IPBridgeHandler extends LutronBridgeHandler {
return false;
}
if (StringUtils.isEmpty(config.ipAddress)) {
String ipAddress = config.ipAddress;
if (ipAddress == null || ipAddress.isEmpty()) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "bridge address not specified");
return false;