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

7
bundles/org.openhab.binding.sleepiq/src/main/java/org/openhab/binding/sleepiq/internal/config/SleepIQCloudConfiguration.java
View File

@@ -12,17 +12,20 @@
*/
package org.openhab.binding.sleepiq.internal.config;
import org.eclipse.jdt.annotation.NonNullByDefault;
/**
* Configuration class for the SleepIQ cloud.
*
* @author Gregory Moyer - Initial contribution
*/
@NonNullByDefault
public class SleepIQCloudConfiguration {
public static final String USERNAME = "username";
public static final String PASSWORD = "password";
public static final String POLLING_INTERVAL = "pollingInterval";
public String username;
public String password;
public String username = "";
public String password = "";
public int pollingInterval;
}

5
bundles/org.openhab.binding.sleepiq/src/main/java/org/openhab/binding/sleepiq/internal/handler/SleepIQCloudHandler.java
View File

@@ -25,7 +25,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang.StringUtils;
import org.openhab.binding.sleepiq.api.Configuration;
import org.openhab.binding.sleepiq.api.LoginException;
import org.openhab.binding.sleepiq.api.SleepIQ;
@@ -214,12 +213,12 @@ public class SleepIQCloudHandler extends ConfigStatusBridgeHandler {
String username = config.username;
String password = config.password;
if (StringUtils.isEmpty(username)) {
if (username.isEmpty()) {
configStatusMessages.add(ConfigStatusMessage.Builder.error(USERNAME)
.withMessageKeySuffix(SleepIQConfigStatusMessage.USERNAME_MISSING).withArguments(USERNAME).build());
}
if (StringUtils.isEmpty(password)) {
if (password.isEmpty()) {
configStatusMessages.add(ConfigStatusMessage.Builder.error(PASSWORD)
.withMessageKeySuffix(SleepIQConfigStatusMessage.PASSWORD_MISSING).withArguments(PASSWORD).build());
}