[flicbutton] Fix SAT `@NonNull` findings (#12334)

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/discovery/FlicSimpleclientDiscoveryServiceImpl.java b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/discovery/FlicSimpleclientDiscoveryServiceImpl.java
index 3caa071093be2caf39d6cd7475619dfabad42f5a..d43918e326379980b6860719c110617bdbc02292 100644 (file)
--- a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/discovery/FlicSimpleclientDiscoveryServiceImpl.java
+++ b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/discovery/FlicSimpleclientDiscoveryServiceImpl.java
@@ -14,7 +14,6 @@ package org.openhab.binding.flicbutton.internal.discovery;
 
 import java.io.IOException;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.flicbutton.internal.FlicButtonBindingConstants;
@@ -94,7 +93,7 @@ public class FlicSimpleclientDiscoveryServiceImpl extends AbstractDiscoveryServi
                     boolean currentlyNoSpaceForNewConnection, Bdaddr @Nullable [] verifiedButtons) throws IOException {
                 for (final @Nullable Bdaddr bdaddr : verifiedButtons) {
                     if (bdaddr != null) {
-                        flicButtonDiscovered((@NonNull Bdaddr) bdaddr);
+                        flicButtonDiscovered(bdaddr);
                     }
                 }
             }
@@ -109,7 +108,7 @@ public class FlicSimpleclientDiscoveryServiceImpl extends AbstractDiscoveryServi
             public void onNewVerifiedButton(@Nullable Bdaddr bdaddr) throws IOException {
                 logger.debug("A new Flic button was added by an external flicd client: {}", bdaddr);
                 if (bdaddr != null) {
-                    flicButtonDiscovered((@NonNull Bdaddr) bdaddr);
+                    flicButtonDiscovered(bdaddr);
                 }
             }
         });

diff --git a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicButtonEventListener.java b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicButtonEventListener.java
index 77c2d0780ae532acb6fc0dbd96428564fb32a5e6..1c33e0896dafe3cd8ccf81373c8f7672f39b448a 100644 (file)
--- a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicButtonEventListener.java
+++ b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicButtonEventListener.java
@@ -15,7 +15,6 @@ package org.openhab.binding.flicbutton.internal.handler;
 import java.io.IOException;
 import java.util.concurrent.Semaphore;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.flicbutton.internal.FlicButtonBindingConstants;
@@ -58,7 +57,7 @@ public class FlicButtonEventListener extends ButtonConnectionChannel.Callbacks {
         logger.debug("Create response {}: {}, {}", channel.getBdaddr(), createConnectionChannelError, connectionStatus);
         // Handling does not differ from Status change, so redirect
         if (connectionStatus != null) {
-            thingHandler.initializeStatus((@NonNull ConnectionStatus) connectionStatus);
+            thingHandler.initializeStatus(connectionStatus);
             channelResponseSemaphore.release();
         }
     }
@@ -76,7 +75,7 @@ public class FlicButtonEventListener extends ButtonConnectionChannel.Callbacks {
         logger.trace("New status for {}: {}", channel.getBdaddr(),
                 connectionStatus + (connectionStatus == ConnectionStatus.Disconnected ? ", " + disconnectReason : ""));
         if (connectionStatus != null) {
-            thingHandler.connectionStatusChanged((@NonNull ConnectionStatus) connectionStatus, disconnectReason);
+            thingHandler.connectionStatusChanged(connectionStatus, disconnectReason);
         }
     }
 
@@ -97,8 +96,7 @@ public class FlicButtonEventListener extends ButtonConnectionChannel.Callbacks {
             @Nullable ClickType clickType, boolean wasQueued, int timeDiff) throws IOException {
         // Handling does not differ from up/down events, so redirect
         if (channel != null && clickType != null) {
-            onButtonUpOrDown((@NonNull ButtonConnectionChannel) channel, (@NonNull ClickType) clickType, wasQueued,
-                    timeDiff);
+            onButtonUpOrDown(channel, clickType, wasQueued, timeDiff);
         }
     }
 }

diff --git a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicDaemonBridgeHandler.java b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicDaemonBridgeHandler.java
index cba4319de0e454dd6c4430de35a2187790435efd..19e16114c3e00d2cbd4bde3d2a934bfcd5ecb101 100644 (file)
--- a/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicDaemonBridgeHandler.java
+++ b/bundles/org.openhab.binding.flicbutton/src/main/java/org/openhab/binding/flicbutton/internal/handler/FlicDaemonBridgeHandler.java
@@ -19,7 +19,6 @@ import java.util.Collection;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.flicbutton.internal.discovery.FlicButtonDiscoveryService;
@@ -87,8 +86,9 @@ public class FlicDaemonBridgeHandler extends BaseBridgeHandler {
     }
 
     private void activateButtonDiscoveryService() {
+        FlicClient flicClient = this.flicClient;
         if (flicClient != null) {
-            buttonDiscoveryService.activate((@NonNull FlicClient) flicClient);
+            buttonDiscoveryService.activate(flicClient);
         } else {
             throw new IllegalStateException("flicClient not properly initialized");
         }