From 327391d483f9372da16ef4670fd4bd599a7350a0 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Wed, 23 Feb 2022 16:53:27 +0100 Subject: [PATCH] [danfossairunit] Fix: Unsafe interpretation of method return type as '@NonNull' (#12303) Signed-off-by: Jacob Laursen --- .../discovery/DanfossAirUnitDiscoveryService.java | 2 ++ .../internal/DanfossAirUnitTest.java | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/discovery/DanfossAirUnitDiscoveryService.java b/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/discovery/DanfossAirUnitDiscoveryService.java index aa3384096..541696f62 100644 --- a/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/discovery/DanfossAirUnitDiscoveryService.java +++ b/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/discovery/DanfossAirUnitDiscoveryService.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; +import org.eclipse.jdt.annotation.Nullable; import org.openhab.core.config.discovery.AbstractDiscoveryService; import org.openhab.core.config.discovery.DiscoveryResult; import org.openhab.core.config.discovery.DiscoveryResultBuilder; @@ -82,6 +83,7 @@ public class DanfossAirUnitDiscoveryService extends AbstractDiscoveryService { try (DatagramSocket socket = new DatagramSocket()) { Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); while (interfaces.hasMoreElements()) { + @Nullable NetworkInterface networkInterface = interfaces.nextElement(); if (networkInterface.isLoopback() || !networkInterface.isUp()) { continue; diff --git a/bundles/org.openhab.binding.danfossairunit/src/test/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnitTest.java b/bundles/org.openhab.binding.danfossairunit/src/test/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnitTest.java index 16de2f199..1ed90c4cf 100644 --- a/bundles/org.openhab.binding.danfossairunit/src/test/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnitTest.java +++ b/bundles/org.openhab.binding.danfossairunit/src/test/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnitTest.java @@ -20,8 +20,11 @@ import java.io.IOException; import java.time.ZoneId; import java.time.ZonedDateTime; -import org.junit.jupiter.api.BeforeEach; +import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import org.openhab.core.library.types.DateTimeType; import org.openhab.core.library.types.DecimalType; import org.openhab.core.library.types.OnOffType; @@ -34,14 +37,11 @@ import org.openhab.core.test.java.JavaTest; * * @author Jacob Laursen - Initial contribution */ +@NonNullByDefault +@ExtendWith(MockitoExtension.class) public class DanfossAirUnitTest extends JavaTest { - private CommunicationController communicationController; - - @BeforeEach - private void setUp() { - this.communicationController = mock(CommunicationController.class); - } + private @NonNullByDefault({}) @Mock CommunicationController communicationController; @Test public void getUnitNameIsReturned() throws IOException {