diff --git a/bundles/org.openhab.binding.airgradient/src/main/java/org/openhab/binding/airgradient/internal/communication/JsonParserHelper.java b/bundles/org.openhab.binding.airgradient/src/main/java/org/openhab/binding/airgradient/internal/communication/JsonParserHelper.java index b15c8807baf..a4e7b9b9bdf 100644 --- a/bundles/org.openhab.binding.airgradient/src/main/java/org/openhab/binding/airgradient/internal/communication/JsonParserHelper.java +++ b/bundles/org.openhab.binding.airgradient/src/main/java/org/openhab/binding/airgradient/internal/communication/JsonParserHelper.java @@ -50,16 +50,7 @@ public class JsonParserHelper { } if (measures != null) { - List<@Nullable Measure> nullableMeasuresWithoutNulls = measures.stream().filter(Objects::nonNull).toList(); - List measuresWithoutNulls = new ArrayList<>(nullableMeasuresWithoutNulls.size()); - for (@Nullable - Measure m : nullableMeasuresWithoutNulls) { - if (m != null) { - measuresWithoutNulls.add(m); - } - } - - return measuresWithoutNulls; + return measures.stream().filter(Objects::nonNull).toList(); } return Collections.emptyList(); diff --git a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschHttpClientTest.java b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschHttpClientTest.java index b32348ac33b..093e3f682c1 100644 --- a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschHttpClientTest.java +++ b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/bridge/BoschHttpClientTest.java @@ -278,7 +278,7 @@ class BoschHttpClientTest { ExecutionException e = assertThrows(ExecutionException.class, () -> httpClient.sendRequest(request, SubscribeResult.class, sr -> false, null)); assertEquals( - "Received invalid content in response, expected type org.openhab.binding.boschshc.internal.devices.bridge.dto.SubscribeResult: com.google.gson.stream.MalformedJsonException: Unterminated string at line 1 column 44 path $.@type", + "Received invalid content in response, expected type org.openhab.binding.boschshc.internal.devices.bridge.dto.SubscribeResult: com.google.gson.stream.MalformedJsonException: Unterminated string at line 1 column 44 path $.@type\nSee https://github.com/google/gson/blob/main/Troubleshooting.md#malformed-json", e.getMessage()); } } diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml index 7df98934067..357b8b71763 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml +++ b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml @@ -30,7 +30,7 @@ com.google.guava guava - 33.3.0-jre + 33.3.1-jre test diff --git a/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/protocol/nhc2/NikoHomeControlCommunication2.java b/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/protocol/nhc2/NikoHomeControlCommunication2.java index 862f08f925a..8c5a6a8252f 100644 --- a/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/protocol/nhc2/NikoHomeControlCommunication2.java +++ b/bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/protocol/nhc2/NikoHomeControlCommunication2.java @@ -716,9 +716,9 @@ public class NikoHomeControlCommunication2 extends NikoHomeControlCommunication Optional ambientTemperatureProperty = deviceProperties.stream().map(p -> p.ambientTemperature) .map(s -> (!((s == null) || s.isEmpty())) ? Math.round(Float.parseFloat(s) * 10) : null) .filter(Objects::nonNull).findFirst(); - Optional<@Nullable String> demandProperty = deviceProperties.stream().map(p -> p.demand) - .filter(Objects::nonNull).findFirst(); - Optional<@Nullable String> operationModeProperty = deviceProperties.stream().map(p -> p.operationMode) + Optional demandProperty = deviceProperties.stream().map(p -> p.demand).filter(Objects::nonNull) + .findFirst(); + Optional operationModeProperty = deviceProperties.stream().map(p -> p.operationMode) .filter(Objects::nonNull).findFirst(); String modeString = deviceProperties.stream().map(p -> p.program).filter(Objects::nonNull).findFirst() diff --git a/bundles/org.openhab.transform.jinja/pom.xml b/bundles/org.openhab.transform.jinja/pom.xml index 96dd559a613..39eb71d7453 100644 --- a/bundles/org.openhab.transform.jinja/pom.xml +++ b/bundles/org.openhab.transform.jinja/pom.xml @@ -30,7 +30,7 @@ com.google.guava guava - 33.3.0-jre + 33.3.1-jre test diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun index 170e5540fbd..6fa72a6df9a 100644 --- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun +++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun @@ -40,7 +40,7 @@ Fragment-Host: org.openhab.automation.groovyscripting org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun index 78cdcd89b87..74b828c3b01 100644 --- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun +++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun @@ -40,7 +40,7 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun index 20d23e8abce..00c054b2bac 100644 --- a/itests/org.openhab.binding.astro.tests/itest.bndrun +++ b/itests/org.openhab.binding.astro.tests/itest.bndrun @@ -35,7 +35,7 @@ Fragment-Host: org.openhab.binding.astro org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-jupiter-params;version='[5.10.0,5.10.1)',\ diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun index 0bf3dd4b709..1bfd3532155 100644 --- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun +++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun @@ -41,7 +41,7 @@ Fragment-Host: org.openhab.binding.avmfritz org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun index da5180c0c61..5785f78cd1c 100644 --- a/itests/org.openhab.binding.feed.tests/itest.bndrun +++ b/itests/org.openhab.binding.feed.tests/itest.bndrun @@ -40,7 +40,7 @@ Fragment-Host: org.openhab.binding.feed org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun index 1e30e6147dd..a7b52f62bf6 100644 --- a/itests/org.openhab.binding.hue.tests/itest.bndrun +++ b/itests/org.openhab.binding.hue.tests/itest.bndrun @@ -45,7 +45,7 @@ Fragment-Host: org.openhab.binding.hue org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun index 9df66f15e8f..829b8651c60 100644 --- a/itests/org.openhab.binding.max.tests/itest.bndrun +++ b/itests/org.openhab.binding.max.tests/itest.bndrun @@ -38,7 +38,7 @@ Fragment-Host: org.openhab.binding.max org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun index b48ae7f08c8..b267b64603f 100644 --- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun +++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun @@ -42,7 +42,7 @@ Fragment-Host: org.openhab.binding.mielecloud org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun index c3e9779648c..fa325e9c546 100644 --- a/itests/org.openhab.binding.modbus.tests/itest.bndrun +++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun @@ -45,7 +45,7 @@ Fragment-Host: org.openhab.binding.modbus org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-jupiter-params;version='[5.10.0,5.10.1)',\ diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun index 4692c12c307..28ff99b0fb6 100644 --- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun @@ -64,7 +64,7 @@ Import-Package: \ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ com.hivemq.client.mqtt;version='[1.3.3,1.3.4)',\ io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\ reactive-streams;version='[1.0.4,1.0.5)',\ diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun index 03926c8979b..180e950827c 100644 --- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun @@ -64,7 +64,7 @@ Import-Package: \ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ com.hivemq.client.mqtt;version='[1.3.3,1.3.4)',\ io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\ reactive-streams;version='[1.0.4,1.0.5)',\ diff --git a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun index c22ee5af8c8..4538ffc6cac 100644 --- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun @@ -64,7 +64,7 @@ Import-Package: \ org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ com.hivemq.client.mqtt;version='[1.3.3,1.3.4)',\ io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\ reactive-streams;version='[1.0.4,1.0.5)',\ diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun index 4d5d0b00389..2cf0f1008c7 100644 --- a/itests/org.openhab.binding.ntp.tests/itest.bndrun +++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun @@ -43,7 +43,7 @@ Fragment-Host: org.openhab.binding.ntp org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun index 72cf4195c73..282e6edc759 100644 --- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun +++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun @@ -45,7 +45,7 @@ Fragment-Host: org.openhab.binding.systeminfo org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun index c40d564d343..d6aaf84091a 100644 --- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun +++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun @@ -48,7 +48,7 @@ Fragment-Host: org.openhab.binding.tradfri org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun index f550c871bf0..4b9625fdde4 100644 --- a/itests/org.openhab.binding.wemo.tests/itest.bndrun +++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun @@ -45,7 +45,7 @@ Fragment-Host: org.openhab.binding.wemo org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun index 4f1c85c8175..5ddb158ba5f 100644 --- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun +++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun @@ -40,7 +40,7 @@ Fragment-Host: org.openhab.persistence.mapdb org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ org.osgi.service.event;version='[1.4.1,1.4.2)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ junit-jupiter-api;version='[5.10.0,5.10.1)',\ junit-jupiter-engine;version='[5.10.0,5.10.1)',\ junit-platform-commons;version='[1.10.0,1.10.1)',\ diff --git a/pom.xml b/pom.xml index 322defce14b..00ffea3a1bb 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 4.1.104.Final 4.12.0 3.9.0 - 2.9.1 + 2.11.0 1.9.23 0.17.0 2.0.12 @@ -325,7 +325,7 @@ Import-Package: \\ org.eclipse.jdt ecj - 3.36.0 + 3.39.0