From: J-N-K Date: Tue, 8 Feb 2022 17:35:16 +0000 (+0100) Subject: Adjustments after changing null-annotations for updating properties (#12221) X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=60f9f60fafed612ee5526183bcaa5a4e2322baba;p=openhab-addons.git Adjustments after changing null-annotations for updating properties (#12221) Signed-off-by: Jan N. Klug --- 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 a7dcdf5eb6..3be6d245e3 100644 --- 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 84b3acb5b3..af0ee0c06c 100644 --- 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 properties) { + protected void updateProperties(final @Nullable Map 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 111d525214..47d47787ed 100644 --- 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 properties) { + protected void updateProperties(@Nullable Map 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 a4b82e54ba..375eb0cf1f 100644 --- 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 c8591d7e0a..efdc45f3be 100644 --- 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 31a324906d..1c3b0b04df 100644 --- 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 properties) { + public void updateProperties(@Nullable Map 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 ed498d0bf4..bf1e2a8eb7 100644 --- 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 properties) { + public void updateProperties(@Nullable Map 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 8ae7bdaef8..e56d11cc54 100644 --- 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 properties) { + public void updateProperties(@Nullable Map 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 e93e71d484..a935e34d03 100644 --- 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 35cfcea124..6fd660c6a8 100644 --- 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