Adjustments after changing null-annotations for updating properties (#12221)

Signed-off-by: Jan N. Klug <github@klug.nrw>

diff --git a/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java b/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java
index a7dcdf5eb64e81133bee1bd80fb32dd4695dd395..3be6d245e34c74c237363bdefe3a8b073076f94d 100644 (file)
--- a/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java
+++ b/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java
@@ -59,7 +59,7 @@ public class ExecWhitelistWatchService extends AbstractWatchService {
     }
 
     @Override
-    protected Kind<?>[] getWatchEventKinds(@Nullable Path directory) {
+    protected Kind<?> @Nullable [] getWatchEventKinds(@Nullable Path directory) {
         return new Kind<?>[] { ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY };
     }
 

diff --git a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterHandler.java b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterHandler.java
index 84b3acb5b3a36d62064ba4a9ca4dbc7dea338920..af0ee0c06c9846892ae4cfaddf53bdf9f4bee3f4 100644 (file)
--- a/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterHandler.java
+++ b/bundles/org.openhab.binding.hpprinter/src/main/java/org/openhab/binding/hpprinter/internal/HPPrinterHandler.java
@@ -155,7 +155,7 @@ public class HPPrinterHandler extends BaseThingHandler {
     }
 
     @Override
-    protected void updateProperties(final Map<String, String> properties) {
+    protected void updateProperties(final @Nullable Map<String, String> properties) {
         super.updateProperties(properties);
     }
 

diff --git a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/handler/LifxLightHandler.java b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/handler/LifxLightHandler.java
index 111d52521432d8b6e6a680ac93b07c4957643c78..47d47787ed54f26c2aee1c78104e6d170cd22cc0 100644 (file)
--- a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/handler/LifxLightHandler.java
+++ b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/handler/LifxLightHandler.java
@@ -777,7 +777,7 @@ public class LifxLightHandler extends BaseThingHandler {
     }
 
     @Override
-    protected void updateProperties(Map<String, String> properties) {
+    protected void updateProperties(@Nullable Map<String, String> properties) {
         String oldHostVersion = getThing().getProperties().get(LifxBindingConstants.PROPERTY_HOST_VERSION);
         super.updateProperties(properties);
         String newHostVersion = getThing().getProperties().get(LifxBindingConstants.PROPERTY_HOST_VERSION);

diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/LuxtronikHeatpumpHandler.java b/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/LuxtronikHeatpumpHandler.java
index a4b82e54baea53de45420ea21f3c3eb0ac5149db..375eb0cf1f517ad1ff8eef6d26c0d6f74eb5743d 100644 (file)
--- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/LuxtronikHeatpumpHandler.java
+++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/LuxtronikHeatpumpHandler.java
@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
 import javax.measure.Unit;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.luxtronikheatpump.internal.enums.HeatpumpChannel;
 import org.openhab.binding.luxtronikheatpump.internal.enums.HeatpumpCoolingOperationMode;
 import org.openhab.binding.luxtronikheatpump.internal.enums.HeatpumpOperationMode;
@@ -75,7 +76,7 @@ public class LuxtronikHeatpumpHandler extends BaseThingHandler {
     }
 
     @Override
-    public void updateProperty(String name, String value) {
+    public void updateProperty(String name, @Nullable String value) {
         super.updateProperty(name, value);
     }
 

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoDatabaseWatchService.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoDatabaseWatchService.java
index c8591d7e0a10d01d4be8dc7e9dfa4660daa0a255..efdc45f3be195838e2e081a129300678b5c8fcf5 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoDatabaseWatchService.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoDatabaseWatchService.java
@@ -81,7 +81,7 @@ public class MiIoDatabaseWatchService extends AbstractWatchService {
     }
 
     @Override
-    protected Kind<?>[] getWatchEventKinds(@Nullable Path directory) {
+    protected Kind<?> @Nullable [] getWatchEventKinds(@Nullable Path directory) {
         return new Kind<?>[] { ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY };
     }
 

diff --git a/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcareBaseObjectHandler.java b/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcareBaseObjectHandler.java
index 31a324906d4b9f61e657f396ae789e70486873c5..1c3b0b04df1d938e842d4ca9ac4d5a62c3321901 100644 (file)
--- a/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcareBaseObjectHandler.java
+++ b/bundles/org.openhab.binding.surepetcare/src/main/java/org/openhab/binding/surepetcare/internal/handler/SurePetcareBaseObjectHandler.java
@@ -65,7 +65,7 @@ public abstract class SurePetcareBaseObjectHandler extends BaseThingHandler {
     }
 
     @Override
-    public void updateProperties(Map<String, String> properties) {
+    public void updateProperties(@Nullable Map<String, String> properties) {
         super.updateProperties(properties);
     }
 

diff --git a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/handler/utils/ExtendedBaseBridgeHandler.java b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/handler/utils/ExtendedBaseBridgeHandler.java
index ed498d0bf435849377ea21a4b63cd69d2ff56cbd..bf1e2a8eb7a60634f522b29084d6508303b4e1da 100644 (file)
--- a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/handler/utils/ExtendedBaseBridgeHandler.java
+++ b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/handler/utils/ExtendedBaseBridgeHandler.java
@@ -15,6 +15,7 @@ package org.openhab.binding.velux.internal.handler.utils;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.ChannelUID;
 import org.openhab.core.thing.binding.BaseBridgeHandler;
@@ -59,7 +60,7 @@ public abstract class ExtendedBaseBridgeHandler extends BaseBridgeHandler {
      * @param properties properties map, that was updated and should be persisted
      */
     @Override
-    public void updateProperties(Map<String, String> properties) {
+    public void updateProperties(@Nullable Map<String, String> properties) {
         super.updateProperties(properties);
     }
 

diff --git a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/handler/utils/ExtendedBaseThingHandler.java b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/handler/utils/ExtendedBaseThingHandler.java
index 8ae7bdaef8f11f1e74028712d307064d80980546..e56d11cc545742b82271264d0008c63d95d5497c 100644 (file)
--- a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/handler/utils/ExtendedBaseThingHandler.java
+++ b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/handler/utils/ExtendedBaseThingHandler.java
@@ -15,6 +15,7 @@ package org.openhab.binding.velux.internal.handler.utils;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.core.thing.Thing;
 import org.openhab.core.thing.binding.BaseThingHandler;
 
@@ -61,7 +62,7 @@ public abstract class ExtendedBaseThingHandler extends BaseThingHandler {
      * @param properties properties map, that was updated and should be persisted
      */
     @Override
-    public void updateProperties(Map<String, String> properties) {
+    public void updateProperties(@Nullable Map<String, String> properties) {
         super.updateProperties(properties);
     }
 }

diff --git a/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationWhitelistWatchService.java b/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationWhitelistWatchService.java
index e93e71d48472548f2fb0a1f08259496cb95b1af6..a935e34d03ef92eea8b8d825fc5bf334c6de3c5d 100644 (file)
--- a/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationWhitelistWatchService.java
+++ b/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationWhitelistWatchService.java
@@ -59,7 +59,7 @@ public class ExecTransformationWhitelistWatchService extends AbstractWatchServic
     }
 
     @Override
-    protected Kind<?>[] getWatchEventKinds(@Nullable Path directory) {
+    protected Kind<?> @Nullable [] getWatchEventKinds(@Nullable Path directory) {
         return new Kind<?>[] { ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY };
     }
 

diff --git a/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/TransformationScriptWatcher.java b/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/TransformationScriptWatcher.java
index 35cfcea12457abfb016aca2440703f4c3441f01e..6fd660c6a8f142cee8f5a0333cf1ab918ba99411 100644 (file)
--- a/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/TransformationScriptWatcher.java
+++ b/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/TransformationScriptWatcher.java
@@ -25,6 +25,8 @@ import org.openhab.core.transform.TransformationService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The {@link TransformationScriptWatcher} watches the transformation directory for files. If a deleted/modified file is
@@ -35,10 +37,11 @@ import org.osgi.service.component.annotations.Reference;
  */
 @Component
 public class TransformationScriptWatcher extends AbstractWatchService {
-
     public static final String TRANSFORM_FOLDER = OpenHAB.getConfigFolder() + File.separator
             + TransformationService.TRANSFORM_FOLDER_NAME;
 
+    private final Logger logger = LoggerFactory.getLogger(TransformationScriptWatcher.class);
+
     private final JavaScriptEngineManager manager;
 
     @Activate