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

4
itests/org.openhab.binding.astro.tests/itest.bndrun
View File

@@ -10,7 +10,6 @@ Fragment-Host: org.openhab.binding.astro
#
-runbundles: \
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
@@ -44,4 +43,5 @@ Fragment-Host: org.openhab.binding.astro
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
org.apache.commons.lang3;version='[3.9.0,3.9.1)'

4
itests/org.openhab.binding.max.tests/itest.bndrun
View File

@@ -20,7 +20,6 @@ Fragment-Host: org.openhab.binding.max
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
com.google.gson;version='[2.8.2,2.8.3)',\
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
@@ -58,4 +57,5 @@ Fragment-Host: org.openhab.binding.max
junit-platform-engine;version='[1.7.0,1.7.1)',\
junit-platform-launcher;version='[1.7.0,1.7.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
org.apache.commons.lang3;version='[3.9.0,3.9.1)'

1
itests/org.openhab.binding.ntp.tests/itest.bndrun
View File

@@ -20,7 +20,6 @@ Fragment-Host: org.openhab.binding.ntp
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
com.google.gson;version='[2.8.2,2.8.3)',\
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
org.apache.commons.commons-net;version='[3.7.2,3.7.3)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\

5
itests/org.openhab.binding.ntp.tests/src/main/java/org/openhab/binding/ntp/test/NtpOSGiTest.java
View File

@@ -26,7 +26,6 @@ import java.util.Collections;
import java.util.Locale;
import java.util.TimeZone;
import org.apache.commons.lang.StringUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@@ -450,9 +449,7 @@ public class NtpOSGiTest extends JavaOSGiTest {
}
private String getStringChannelTimeZoneFromItemRegistry() {
String itemState = getItemState(ACCEPTED_ITEM_TYPE_STRING).toString();
String timeZoneFromItemRegistry = StringUtils.substringAfterLast(itemState, " ");
return timeZoneFromItemRegistry;
return getItemState(ACCEPTED_ITEM_TYPE_STRING).toString().split(" ")[2];
}
private void assertFormat(String initialDate, String formatPattern) {

4
itests/org.openhab.binding.systeminfo.tests/itest.bndrun
View File

@@ -20,7 +20,6 @@ Fragment-Host: org.openhab.binding.systeminfo
-runbundles: \
com.google.gson;version='[2.8.2,2.8.3)',\
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
@@ -66,4 +65,5 @@ Fragment-Host: org.openhab.binding.systeminfo
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
org.apache.commons.lang3;version='[3.9.0,3.9.1)'

4
itests/org.openhab.binding.wemo.tests/itest.bndrun
View File

@@ -19,7 +19,6 @@ Fragment-Host: org.openhab.binding.wemo
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
com.google.gson;version='[2.8.2,2.8.3)',\
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
@@ -77,4 +76,5 @@ Fragment-Host: org.openhab.binding.wemo
org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
org.objenesis;version='[3.1.0,3.1.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)'
biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
org.apache.commons.lang3;version='[3.9.0,3.9.1)'