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

13
bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/handler/ZWayBridgeHandler.java
View File

@@ -18,7 +18,6 @@ import java.util.Map;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.StringUtils;
import org.openhab.binding.zway.internal.config.ZWayBridgeConfiguration;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.thing.Bridge;
@@ -387,7 +386,8 @@ public class ZWayBridgeHandler extends BaseBridgeHandler implements IZWayApiCall
****************************************/
// Z-Way IP address
if (StringUtils.trimToNull(config.getZWayIpAddress()) == null) {
String zWayIpAddress = config.getZWayIpAddress();
if (zWayIpAddress == null || zWayIpAddress.isBlank()) {
config.setZWayIpAddress("localhost"); // default value
}
@@ -397,19 +397,22 @@ public class ZWayBridgeHandler extends BaseBridgeHandler implements IZWayApiCall
}
// Z-Way Protocol
if (StringUtils.trimToNull(config.getZWayProtocol()) == null) {
String zWayProtocol = config.getZWayProtocol();
if (zWayProtocol == null || zWayProtocol.isBlank()) {
config.setZWayProtocol("http");
}
// Z-Way Password
if (StringUtils.trimToNull(config.getZWayPassword()) == null) {
String zWayPassword = config.getZWayPassword();
if (zWayPassword == null || zWayPassword.isBlank()) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
"The connection to the Z-Way Server can't established, because the Z-Way password is missing. Please set a Z-Way password.");
return null;
}
// Z-Way Username
if (StringUtils.trimToNull(config.getZWayUsername()) == null) {
String zWayUsername = config.getZWayUsername();
if (zWayUsername == null || zWayUsername.isBlank()) {
config.setZWayUsername("admin"); // default value
}

4
bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/handler/ZWayZAutomationDeviceHandler.java
View File

@@ -19,7 +19,6 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.StringUtils;
import org.openhab.binding.zway.internal.config.ZWayZAutomationDeviceConfiguration;
import org.openhab.core.thing.Thing;
import org.openhab.core.thing.ThingStatus;
@@ -140,7 +139,8 @@ public class ZWayZAutomationDeviceHandler extends ZWayDeviceHandler {
private ZWayZAutomationDeviceConfiguration loadAndCheckConfiguration() {
ZWayZAutomationDeviceConfiguration config = getConfigAs(ZWayZAutomationDeviceConfiguration.class);
if (StringUtils.trimToNull(config.getDeviceId()) == null) {
String deviceId = config.getDeviceId();
if (deviceId == null || deviceId.isBlank()) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
"Z-Wave device couldn't create, because the device id is missing.");
return null;