From 183fb0e390be446fe5b9ac8999b94cd34bd3f8d5 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Wed, 12 May 2021 13:15:24 +0200 Subject: [PATCH] [modbus] Cleanup workaround leftovers and fix a few SAT findings (#10670) - Cleanup workaround leftovers and fix a few SAT findings Signed-off-by: Wouter Born --- .../handler/ModbusPollerThingHandler.java | 2 +- .../internal/AtomicStampedKeyValueTest.java | 2 ++ .../CascadedValueTransformationImplTest.java | 2 ++ .../internal/SingleValueTransformationTest.java | 2 ++ .../profiles/ModbusGainOffsetProfileTest.java | 17 +++++------------ 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/handler/ModbusPollerThingHandler.java b/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/handler/ModbusPollerThingHandler.java index c265946385fc..452b3715793d 100644 --- a/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/handler/ModbusPollerThingHandler.java +++ b/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/handler/ModbusPollerThingHandler.java @@ -183,7 +183,7 @@ public String toString() { private final Logger logger = LoggerFactory.getLogger(ModbusPollerThingHandler.class); - private final static List SORTED_READ_FUNCTION_CODES = ModbusBindingConstantsInternal.READ_FUNCTION_CODES + private static final List SORTED_READ_FUNCTION_CODES = ModbusBindingConstantsInternal.READ_FUNCTION_CODES .keySet().stream().sorted().collect(Collectors.toUnmodifiableList()); private @NonNullByDefault({}) ModbusPollerConfiguration config; diff --git a/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/AtomicStampedKeyValueTest.java b/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/AtomicStampedKeyValueTest.java index fd7658a05a00..2e949f670203 100644 --- a/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/AtomicStampedKeyValueTest.java +++ b/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/AtomicStampedKeyValueTest.java @@ -16,11 +16,13 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.jupiter.api.Test; /** * @author Sami Salonen - Initial contribution */ +@NonNullByDefault public class AtomicStampedKeyValueTest { @Test diff --git a/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/CascadedValueTransformationImplTest.java b/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/CascadedValueTransformationImplTest.java index 303c62b2df07..54ef3026ebae 100644 --- a/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/CascadedValueTransformationImplTest.java +++ b/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/CascadedValueTransformationImplTest.java @@ -14,6 +14,7 @@ import static org.junit.jupiter.api.Assertions.*; +import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.osgi.framework.BundleContext; @@ -21,6 +22,7 @@ /** * @author Sami Salonen - Initial contribution */ +@NonNullByDefault public class CascadedValueTransformationImplTest { @Test diff --git a/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/SingleValueTransformationTest.java b/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/SingleValueTransformationTest.java index 504f7dd10042..13cf63032d57 100644 --- a/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/SingleValueTransformationTest.java +++ b/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/SingleValueTransformationTest.java @@ -14,6 +14,7 @@ import static org.junit.jupiter.api.Assertions.*; +import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.osgi.framework.BundleContext; @@ -21,6 +22,7 @@ /** * @author Sami Salonen - Initial contribution */ +@NonNullByDefault public class SingleValueTransformationTest { @Test diff --git a/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/profiles/ModbusGainOffsetProfileTest.java b/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/profiles/ModbusGainOffsetProfileTest.java index 5506dbb867da..1ad2be1b9653 100644 --- a/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/profiles/ModbusGainOffsetProfileTest.java +++ b/bundles/org.openhab.binding.modbus/src/test/java/org/openhab/binding/modbus/internal/profiles/ModbusGainOffsetProfileTest.java @@ -46,7 +46,7 @@ @NonNullByDefault public class ModbusGainOffsetProfileTest { - private static Stream provideArgsForBoth() { + static Stream provideArgsForBoth() { return Stream.of( // dimensionless Arguments.of("100", "0.5", "250", "175.0"), Arguments.of("0", "1 %", "250", "250 %"), @@ -81,9 +81,8 @@ private static Stream provideArgsForBoth() { ); } - private static Stream provideAdditionalArgsForStateUpdateFromHandler() { + static Stream provideAdditionalArgsForStateUpdateFromHandler() { return Stream.of( - // Dimensionless conversion 2.5/1% = 250%/1% = 250 Arguments.of("0", "1 %", "250", "250 %"), Arguments.of("2 %", "1 %", "249.9800", "250.0000 %"), Arguments.of("50", "2 m/s", new DecimalType("3"), "106 m/s"), @@ -169,17 +168,11 @@ private void testOnUpdateFromHandlerGeneric(String preGainOffset, String gain, O Type expectedStateUpdateTowardsItem = (expectedUpdateTowardsItemObj instanceof String) ? new QuantityType((String) expectedUpdateTowardsItemObj) : (Type) expectedUpdateTowardsItemObj; - // Workaround for errors like "java.lang.UnsupportedOperationException: °C is non-linear, cannot convert" - if (expectedStateUpdateTowardsItem instanceof QuantityType) { - assertTrue(actualStateUpdateTowardsItem instanceof QuantityType); - assertEquals(expectedStateUpdateTowardsItem, actualStateUpdateTowardsItem); - } else { - assertEquals(expectedStateUpdateTowardsItem, actualStateUpdateTowardsItem); - } + assertEquals(expectedStateUpdateTowardsItem, actualStateUpdateTowardsItem); verifyNoMoreInteractions(callback); } - private static Stream provideAdditionalArgsForCommandFromItem() { + static Stream provideAdditionalArgsForCommandFromItem() { return Stream.of( // Dimensionless conversion 2.5/1% = 250%/1% = 250 // gain in %, command as bare ratio and the other way around @@ -208,7 +201,7 @@ private static Stream provideAdditionalArgsForCommandFromItem() { /** * - * Test profile behaviour when item receives command + * Test profile behavior when item receives command * * @param preGainOffset profile pre-gain-offset * @param gain profile gain