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

[dwdunwetter] Removed dependency on org.apache.commons (#9138) 

* Removed dependency on org.apache.commons
* Incorporated comments from review

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp 2020-11-28 01:11:06 +01:00 committed by GitHub
parent 219d370439
commit a3835ebdc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/config/DwdUnwetterConfiguration.java
View File

@ -12,7 +12,6 @@
*/
package org.openhab.binding.dwdunwetter.internal.config;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jdt.annotation.NonNullByDefault;
/**
@ -24,5 +23,5 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
public class DwdUnwetterConfiguration {
public int refresh;
public int warningCount;
public String cellId = StringUtils.EMPTY;
public String cellId = "";
}

6
bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/data/DwdWarningData.java
View File

@ -15,8 +15,6 @@ package org.openhab.binding.dwdunwetter.internal.data;
import java.math.BigDecimal;
import java.time.Instant;
import org.apache.commons.lang.StringUtils;
/**
* Data for one warning.
*
@ -93,7 +91,7 @@ public class DwdWarningData {
}
public boolean isTest() {
return StringUtils.equalsIgnoreCase(status, "Test");
return "Test".equalsIgnoreCase(status);
}
public void setMsgType(String msgType) {
@ -101,7 +99,7 @@ public class DwdWarningData {
}
public boolean isCancel() {
return StringUtils.equalsIgnoreCase(msgType, "Cancel");
return "Cancel".equalsIgnoreCase(msgType);
}
public void setHeadline(String headline) {

12
bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/data/DwdWarningDataAccess.java
View File

@ -16,7 +16,6 @@ import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import org.apache.commons.lang.StringUtils;
import org.openhab.core.io.net.http.HttpUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -35,23 +34,22 @@ public class DwdWarningDataAccess {
/**
* Returns the raw Data from the Endpoint.
* In case of errors or empty cellId value, returns an {@link StringUtils#EMPTY Empty String}.
* In case of errors or empty cellId value, returns an empty String.
*
* @param cellId The warnCell-Id for which the warnings should be returned
* @return The raw data received or an empty string.
*/
public String getDataFromEndpoint(String cellId) {
try {
if (StringUtils.isBlank(cellId)) {
if (cellId == null || cellId.isBlank()) {
logger.warn("No cellId provided");
return StringUtils.EMPTY;
return "";
}
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(DWD_URL);
stringBuilder.append("&CQL_FILTER=");
stringBuilder
.append(URLEncoder.encode("WARNCELLID LIKE '" + cellId + "'", StandardCharsets.UTF_8.toString()));
stringBuilder.append(URLEncoder.encode("WARNCELLID LIKE '" + cellId + "'", StandardCharsets.UTF_8));
logger.debug("Refreshing Data for cell {}", cellId);
String rawData = HttpUtil.executeUrl("GET", stringBuilder.toString(), 5000);
logger.trace("Raw request: {}", stringBuilder);
@ -63,6 +61,6 @@ public class DwdWarningDataAccess {
logger.debug("Communication error trace", e);
}
return StringUtils.EMPTY;
return "";
}
}

4
bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/data/DwdXmlTag.java
View File

@ -14,8 +14,6 @@ package org.openhab.binding.dwdunwetter.internal.data;
import java.util.Arrays;
import org.apache.commons.lang.StringUtils;
/**
* The XML Tags to extract the relevant parts from the API response.
* The names map directly to the XML Tags of the API Response.
@ -52,7 +50,7 @@ public enum DwdXmlTag {
}
public static DwdXmlTag getDwdXmlTag(String tag) {
return Arrays.asList(DwdXmlTag.values()).stream().filter(t -> StringUtils.equals(t.getTag(), tag)).findFirst()
return Arrays.asList(DwdXmlTag.values()).stream().filter(t -> tag.equals(t.getTag())).findFirst()
.orElse(UNKNOWN);
}
}

6
bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/data/Severity.java
View File

@ -14,8 +14,6 @@ package org.openhab.binding.dwdunwetter.internal.data;
import java.util.Arrays;
import org.apache.commons.lang.StringUtils;
/**
* Severity enum to make the severity comparable
*
@ -46,7 +44,7 @@ public enum Severity {
}
public static Severity getSeverity(String input) {
return Arrays.asList(Severity.values()).stream()
.filter(sev -> StringUtils.equalsIgnoreCase(input, sev.getText())).findAny().orElse(UNKNOWN);
return Arrays.asList(Severity.values()).stream().filter(sev -> input.equalsIgnoreCase(sev.getText())).findAny()
.orElse(UNKNOWN);
}
}

11
bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/data/SeverityComparator.java
View File

@ -14,8 +14,6 @@ package org.openhab.binding.dwdunwetter.internal.data;
import java.util.Comparator;
import org.apache.commons.lang.ObjectUtils;
/**
* Comperator to sort a Warning first by Severity, second by the onSet date.
*
@ -30,7 +28,14 @@ public class SeverityComparator implements Comparator<DwdWarningData> {
int result = Integer.compare(o1.getSeverity().getOrder(), o2.getSeverity().getOrder());
if (result == 0) {
result = ObjectUtils.compare(o1.getOnset(), o2.getOnset());
if (o1.getOnset() == o2.getOnset()) {
return 0;
} else if (o1.getOnset() == null) {
return -1;
} else if (o2.getOnset() == null) {
return 1;
}
return o1.getOnset().compareTo(o2.getOnset());
}
return result;
}

6
bundles/org.openhab.binding.dwdunwetter/src/main/java/org/openhab/binding/dwdunwetter/internal/data/Urgency.java
View File

@ -14,8 +14,6 @@ package org.openhab.binding.dwdunwetter.internal.data;
import java.util.Arrays;
import org.apache.commons.lang.StringUtils;
/**
* Enum for the urgency of the warning.
*
@ -38,7 +36,7 @@ public enum Urgency {
}
public static Urgency getUrgency(String input) {
return Arrays.asList(Urgency.values()).stream()
.filter(urg -> StringUtils.equalsIgnoreCase(input, urg.getText())).findAny().orElse(UNKNOWN);
return Arrays.asList(Urgency.values()).stream().filter(urg -> input.equalsIgnoreCase(urg.getText())).findAny()
.orElse(UNKNOWN);
}
}

4
bundles/org.openhab.binding.dwdunwetter/src/test/java/org/openhab/binding/dwdunwetter/DwdUnwetterHandlerTest.java
View File

@ -19,11 +19,11 @@ import static org.mockito.Mockito.*;
import java.io.InputStream;
import java.util.List;
import java.util.Objects;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.commons.lang.StringUtils;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -122,7 +122,7 @@ public class DwdUnwetterHandlerTest extends JavaTest {
if (nodeId == null) {
continue;
}
if (StringUtils.equals(nodeId.getTextContent(), uuid.getId())) {
if (Objects.equals(nodeId.getTextContent(), uuid.getId())) {
return getLabel(node.getChildNodes());
}
}