From 16fcd5d7292fb65e15c269c0ebd3b784d80cb1c2 Mon Sep 17 00:00:00 2001 From: lsiepel Date: Thu, 22 Dec 2022 09:04:50 +0100 Subject: [PATCH] nul;l annotations and codestyle (#13980) Signed-off-by: lsiepel --- .../bluez/internal/BlueZBluetoothDevice.java | 22 +++++++++---------- .../bluez/internal/DeviceManagerWrapper.java | 1 + .../internal/events/ServiceDataEvent.java | 2 +- .../bluez/internal/BlueZEventTest.java | 5 +++-- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/BlueZBluetoothDevice.java b/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/BlueZBluetoothDevice.java index 575dda68148d7..da85610b7cf6d 100644 --- a/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/BlueZBluetoothDevice.java +++ b/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/BlueZBluetoothDevice.java @@ -131,14 +131,14 @@ public void dispose() { try { dev.getAdapter().removeDevice(dev.getRawDevice()); } catch (DBusException ex) { - if (ex.getMessage().contains("Does Not Exist")) { - // this happens when the underlying device has already been removed - // but we don't have a way to check if that is the case beforehand so - // we will just eat the error here. - } else { + String exceptionMessage = ex.getMessage(); + if (exceptionMessage == null || exceptionMessage.contains("Does Not Exist")) { logger.debug("Exception occurred when trying to remove inactive device '{}': {}", address, ex.getMessage()); } + // this codeblock will only be hit when the underlying device has already + // been removed but we don't have a way to check if that is the case beforehand + // so we will just eat the error here. } catch (RuntimeException ex) { // try to catch any other exceptions logger.debug("Exception occurred when trying to remove inactive device '{}': {}", address, @@ -169,7 +169,6 @@ public boolean connect() { // Have to double check because sometimes, exception but still worked logger.debug("Got a timeout - but sometimes happen. Is Connected ? {}", dev.isConnected()); if (Boolean.FALSE.equals(dev.isConnected())) { - notifyListeners(BluetoothEventType.CONNECTION_STATE, new BluetoothConnectionStatusNotification(ConnectionState.DISCONNECTED)); return false; @@ -182,7 +181,6 @@ public boolean connect() { } catch (Exception e) { logger.warn("error occured while trying to connect", e); } - } else { logger.debug("Device was already connected"); // we might be stuck in another state atm so we need to trigger a connected in this case @@ -278,9 +276,10 @@ private void ensureConnected() { try { c.startNotify(); } catch (DBusException e) { - if (e.getMessage().contains("Already notifying")) { + String exceptionMessage = e.getMessage(); + if (exceptionMessage != null && exceptionMessage.contains("Already notifying")) { return null; - } else if (e.getMessage().contains("In Progress")) { + } else if (exceptionMessage != null && exceptionMessage.contains("In Progress")) { // let's retry in half a second throw new RetryException(500, TimeUnit.MILLISECONDS); } else { @@ -524,9 +523,10 @@ public boolean isNotifying(BluetoothCharacteristic characteristic) { try { c.stopNotify(); } catch (DBusException e) { - if (e.getMessage().contains("Already notifying")) { + String exceptionMessage = e.getMessage(); + if (exceptionMessage != null && exceptionMessage.contains("Already notifying")) { return null; - } else if (e.getMessage().contains("In Progress")) { + } else if (exceptionMessage != null && exceptionMessage.contains("In Progress")) { // let's retry in half a second throw new RetryException(500, TimeUnit.MILLISECONDS); } else { diff --git a/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/DeviceManagerWrapper.java b/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/DeviceManagerWrapper.java index 494b0cf3be233..853c64ebb7646 100644 --- a/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/DeviceManagerWrapper.java +++ b/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/DeviceManagerWrapper.java @@ -39,6 +39,7 @@ public DeviceManagerWrapper(@Nullable DeviceManager deviceManager) { this.deviceManager = deviceManager; } + @SuppressWarnings("null") public synchronized Collection scanForBluetoothAdapters() { if (deviceManager != null) { return deviceManager.scanForBluetoothAdapters(); diff --git a/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/events/ServiceDataEvent.java b/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/events/ServiceDataEvent.java index 6ab5b5f37ea05..849e0defa515e 100644 --- a/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/events/ServiceDataEvent.java +++ b/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/events/ServiceDataEvent.java @@ -25,7 +25,7 @@ @NonNullByDefault public class ServiceDataEvent extends BlueZEvent { - final private Map data; + private final Map data; public ServiceDataEvent(String dbusPath, Map data) { super(dbusPath); diff --git a/bundles/org.openhab.binding.bluetooth.bluez/src/test/java/org/openhab/binding/bluetooth/bluez/internal/BlueZEventTest.java b/bundles/org.openhab.binding.bluetooth.bluez/src/test/java/org/openhab/binding/bluetooth/bluez/internal/BlueZEventTest.java index 6413ecd368413..88d269755f114 100644 --- a/bundles/org.openhab.binding.bluetooth.bluez/src/test/java/org/openhab/binding/bluetooth/bluez/internal/BlueZEventTest.java +++ b/bundles/org.openhab.binding.bluetooth.bluez/src/test/java/org/openhab/binding/bluetooth/bluez/internal/BlueZEventTest.java @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.*; -import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.jupiter.api.Test; import org.openhab.binding.bluetooth.BluetoothAddress; import org.openhab.binding.bluetooth.bluez.internal.events.BlueZEvent; @@ -25,6 +25,7 @@ * @author Benjamin Lafois - Initial Contribution * @author Connor Petty - Added additional test cases */ +@NonNullByDefault public class BlueZEventTest { @Test @@ -83,7 +84,7 @@ public DummyBlueZEvent(String dbusPath) { } @Override - public void dispatch(@NonNull BlueZEventListener listener) { + public void dispatch(BlueZEventListener listener) { listener.onDBusBlueZEvent(this); } }