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

2
bundles/org.openhab.binding.weathercompany/src/main/java/org/openhab/binding/weathercompany/internal/handler/WeatherCompanyBridgeHandler.java
View File

@@ -16,7 +16,7 @@ import java.io.IOException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jetty.client.HttpResponseException;

23
bundles/org.openhab.binding.weathercompany/src/main/java/org/openhab/binding/weathercompany/internal/handler/WeatherCompanyForecastHandler.java
View File

@@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit;
import javax.imageio.ImageIO;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jetty.client.HttpClient;
@@ -120,14 +119,15 @@ public class WeatherCompanyForecastHandler extends WeatherCompanyAbstractHandler
private boolean isValidLocation() {
boolean validLocation = false;
String locationType = getConfigAs(WeatherCompanyForecastConfig.class).locationType;
WeatherCompanyForecastConfig config = getConfigAs(WeatherCompanyForecastConfig.class);
String locationType = config.locationType;
if (locationType == null) {
return validLocation;
}
switch (locationType) {
case CONFIG_LOCATION_TYPE_POSTAL_CODE:
String postalCode = StringUtils.trimToNull(getConfigAs(WeatherCompanyForecastConfig.class).postalCode);
if (postalCode == null) {
String postalCode = config.postalCode;
if (postalCode == null || postalCode.isBlank()) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "Postal code is not set");
} else {
locationQueryString = "&postalKey=" + postalCode.replace(" ", "");
@@ -135,8 +135,8 @@ public class WeatherCompanyForecastHandler extends WeatherCompanyAbstractHandler
}
break;
case CONFIG_LOCATION_TYPE_GEOCODE:
String geocode = StringUtils.trimToNull(getConfigAs(WeatherCompanyForecastConfig.class).geocode);
if (geocode == null) {
String geocode = config.geocode;
if (geocode == null || geocode.isBlank()) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "Geocode is not set");
} else {
locationQueryString = "&geocode=" + geocode.replace(" ", "");
@@ -144,8 +144,8 @@ public class WeatherCompanyForecastHandler extends WeatherCompanyAbstractHandler
}
break;
case CONFIG_LOCATION_TYPE_IATA_CODE:
String iataCode = StringUtils.trimToNull(getConfigAs(WeatherCompanyForecastConfig.class).iataCode);
if (iataCode == null) {
String iataCode = config.iataCode;
if (iataCode == null || iataCode.isBlank()) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "IATA code is not set");
} else {
locationQueryString = "&iataCode=" + iataCode.replace(" ", "").toUpperCase();
@@ -160,15 +160,16 @@ public class WeatherCompanyForecastHandler extends WeatherCompanyAbstractHandler
}
private void setLanguage() {
String language = StringUtils.trimToNull(getConfigAs(WeatherCompanyForecastConfig.class).language);
if (language == null) {
WeatherCompanyForecastConfig config = getConfigAs(WeatherCompanyForecastConfig.class);
String language = config.language;
if (language == null || language.isBlank()) {
// Nothing in the thing config, so try to get a match from the openHAB locale
String derivedLanguage = WeatherCompanyAbstractHandler.lookupLanguage(localeProvider.getLocale());
languageQueryString = "&language=" + derivedLanguage;
logger.debug("Language not set in thing config, using {}", derivedLanguage);
} else {
// Use what is set in the thing config
languageQueryString = "&language=" + language;
languageQueryString = "&language=" + language.trim();
}
}

7
bundles/org.openhab.binding.weathercompany/src/main/java/org/openhab/binding/weathercompany/internal/handler/WeatherCompanyObservationsHandler.java
View File

@@ -18,7 +18,6 @@ import java.util.Objects;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jetty.client.HttpClient;
@@ -104,7 +103,9 @@ public class WeatherCompanyObservationsHandler extends WeatherCompanyAbstractHan
* Build the URL for requesting the PWS current observations
*/
private @Nullable String buildPwsUrl() {
if (StringUtils.isEmpty(getConfigAs(WeatherCompanyObservationsConfig.class).pwsStationId)) {
WeatherCompanyObservationsConfig config = getConfigAs(WeatherCompanyObservationsConfig.class);
String pwsStationId = config.pwsStationId;
if (pwsStationId == null || pwsStationId.isEmpty()) {
return null;
}
String apiKey = getApiKey();
@@ -116,7 +117,7 @@ public class WeatherCompanyObservationsHandler extends WeatherCompanyAbstractHan
// Set response type as JSON
sb.append("&format=json");
// Set PWS station Id from config
sb.append("&stationId=").append(getConfigAs(WeatherCompanyObservationsConfig.class).pwsStationId);
sb.append("&stationId=").append(pwsStationId);
// Set API key from config
sb.append("&apiKey=").append(apiKey);
String url = sb.toString();