fix upgraded jna and spotless issues

Signed-off-by: Jan N. Klug <github@klug.nrw>
openhab · Dec 17, 2022 · 35f34b5 · 35f34b5
1 parent 183761a
commit 35f34b5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/...in/java/org/openhab/binding/enocean/internal/discovery/EnOceanDeviceDiscoveryService.java b/...in/java/org/openhab/binding/enocean/internal/discovery/EnOceanDeviceDiscoveryService.java
@@ -109,9 +109,9 @@ public void packetReceived(BasePacket packet) {
 
         String enoceanId = HexUtils.bytesToHex(eep.getSenderId());
 
-        bridgeHandler.getThing().getThings().stream()
-                .filter(t -> t.getConfiguration().getProperties().getOrDefault(PARAMETER_ENOCEANID, EMPTYENOCEANID)
-                        .toString().equals(enoceanId))
+        bridgeHandler
+                .getThing().getThings().stream().filter(t -> t.getConfiguration().getProperties()
+                        .getOrDefault(PARAMETER_ENOCEANID, EMPTYENOCEANID).toString().equals(enoceanId))
                 .findFirst().ifPresentOrElse(t -> {
                     // If repeated learn is not allowed => send teach out
                     // otherwise do nothing

diff --git a/...elux/src/main/java/org/openhab/binding/velux/internal/handler/ChannelSceneSilentmode.java b/...elux/src/main/java/org/openhab/binding/velux/internal/handler/ChannelSceneSilentmode.java
@@ -73,8 +73,8 @@ private ChannelSceneSilentmode() {
         LOGGER.debug("handleCommand({},{},{},{}) called.", channelUID, channelId, command, thisBridgeHandler);
         Command newValue = null;
         do { // just for common exit
-            assert thisBridgeHandler.bridgeParameters.scenes
-                    .getChannel().existingScenes != null : "VeluxBridgeHandler.existingScenes not initialized.";
+            assert thisBridgeHandler.bridgeParameters.scenes.getChannel().existingScenes != null
+                    : "VeluxBridgeHandler.existingScenes not initialized.";
             if (!ThingConfiguration.exists(thisBridgeHandler, channelUID, VeluxBindingProperties.PROPERTY_SCENE_NAME)) {
                 LOGGER.trace("handleCommand(): aborting processing as scene name is not set.");
                 break;

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -39,7 +39,6 @@ Import-Package: \
 	com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	com.google.dagger;version='[2.27.0,2.27.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	com.hivemq.client.mqtt;version='[1.2.2,1.2.3)',\
 	io.netty.buffer;version='[4.1.72,4.1.73)',\
 	io.netty.codec;version='[4.1.72,4.1.73)',\
@@ -112,4 +111,6 @@ Import-Package: \
 	org.openhab.core.transform;version='[3.4.0,3.4.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -39,7 +39,6 @@ Import-Package: \
 	com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	com.google.dagger;version='[2.27.0,2.27.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
 	com.hivemq.client.mqtt;version='[1.2.2,1.2.3)',\
 	io.netty.buffer;version='[4.1.72,4.1.73)',\
 	io.netty.codec;version='[4.1.72,4.1.73)',\
@@ -112,5 +111,7 @@ Import-Package: \
 	org.openhab.core.transform;version='[3.4.0,3.4.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)'
 
diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -69,8 +69,6 @@ Fragment-Host: org.openhab.binding.nest
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
 	org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
@@ -107,4 +105,7 @@ Fragment-Host: org.openhab.binding.nest
 	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	org.jsr-305;version='[3.0.2,3.0.3)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	com.google.gson;version='[2.9.1,2.9.2)',\
+	org.objectweb.asm;version='[9.4.0,9.4.1)'