Address review comments from @holgerfriedrich to remove SAT warnings

Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
openhab · Apr 1, 2024 · 254346e · 254346e
1 parent 2b18fb2
commit 254346e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/...g/openhab/binding/airgradient/internal/discovery/AirGradientMDNSDiscoveryParticipant.java b/...g/openhab/binding/airgradient/internal/discovery/AirGradientMDNSDiscoveryParticipant.java
@@ -18,13 +18,9 @@
 import static org.openhab.binding.airgradient.internal.AirGradientBindingConstants.DEFAULT_POLL_INTERVAL_LOCAL;
 import static org.openhab.binding.airgradient.internal.AirGradientBindingConstants.THING_TYPE_API;
 
-import java.net.InetAddress;
-import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Stream;
 
 import javax.jmdns.ServiceInfo;
 
@@ -103,22 +99,6 @@ public String getServiceType() {
         return discoveryResult;
     }
 
-    private static <T> Iterable<T> getIterableFromIterator(Iterator<T> iterator) {
-        return () -> iterator;
-    }
-
-    private String toString(Enumeration<String> strs) {
-        return String.join(", ", getIterableFromIterator(strs.asIterator()));
-    }
-
-    private String toString(String strs[]) {
-        return String.join(", ", strs);
-    }
-
-    private String toString(InetAddress strs[]) {
-        return String.join(", ", Stream.of(strs).map((a) -> a.toString()).toList());
-    }
-
     @Override
     public @Nullable ThingUID getThingUID(ServiceInfo si) {
         logger.debug("Getting thing ID for: App: {} Host: {} Name: {} Port: {} Serial: {}", si.getApplication(),

diff --git a/...src/main/java/org/openhab/binding/airgradient/internal/handler/AirGradientAPIHandler.java b/...src/main/java/org/openhab/binding/airgradient/internal/handler/AirGradientAPIHandler.java
@@ -189,7 +189,6 @@ public List<Measure> getMeasures() {
                 } else if (CONTENTTYPE_OPENMETRICS.equals(contentType)) {
                     return parsePrometheus(stringResponse);
                 }
-
             } else {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, response.getContentAsString());
             }

diff --git a/...test/java/org/openhab/binding/airgradient/internal/handler/AirGradientAPIHandlerTest.java b/...test/java/org/openhab/binding/airgradient/internal/handler/AirGradientAPIHandlerTest.java
@@ -43,7 +43,7 @@
 @NonNullByDefault
 public class AirGradientAPIHandlerTest {
 
-    private static final AirGradientAPIConfiguration config = new AirGradientAPIConfiguration() {
+    private static final AirGradientAPIConfiguration TEST_CONFIG = new AirGradientAPIConfiguration() {
         {
             hostname = "abc123";
             token = "def456";
@@ -154,7 +154,7 @@ public void setUp() {
         Configuration configuration = Mockito.mock(Configuration.class);
 
         Mockito.when(bridge.getConfiguration()).thenReturn(requireNonNull(configuration));
-        Mockito.when(configuration.as(AirGradientAPIConfiguration.class)).thenReturn(config);
+        Mockito.when(configuration.as(AirGradientAPIConfiguration.class)).thenReturn(TEST_CONFIG);
 
         sut = new AirGradientAPIHandler(requireNonNull(bridge), requireNonNull(httpClientMock));
     }

diff --git a/...java/org/openhab/binding/airgradient/internal/handler/AirGradientLocationHandlerTest.java b/...java/org/openhab/binding/airgradient/internal/handler/AirGradientLocationHandlerTest.java
@@ -37,7 +37,7 @@
 @NonNullByDefault
 public class AirGradientLocationHandlerTest {
 
-    private static final Measure measure = new Measure() {
+    private static final Measure TEST_MEASURE = new Measure() {
         {
             locationId = "12345";
             locationName = "Location name";
@@ -82,7 +82,7 @@ public void setUp() {
     @Test
     public void testSetMeasure() {
         sut.setCallback(callbackMock);
-        sut.setMeasurment("test123", measure);
+        sut.setMeasurment("test123", TEST_MEASURE);
 
         verify(callbackMock).stateUpdated(new ChannelUID(sut.getThing().getUID(), CHANNEL_WIFI),
                 new QuantityType<>("-59 dBm"));