[knx] Code cleanup (#14719)

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialTransportAdapter.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialTransportAdapter.java
index 125c2e2ea9f539e41bf1c7323e62d20d0c355aac..e20afc15fa0898f1c4c906767554bcd7d0026f30 100644 (file)
--- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialTransportAdapter.java
+++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialTransportAdapter.java
@@ -130,7 +130,7 @@ public class SerialTransportAdapter implements SerialCom {
             }
         }
         // should not throw, create a dummy return value
-        byte buf[] = {};
+        byte[] buf = {};
         return new ByteArrayInputStream(buf);
     }
 

diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/DPTUnits.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/DPTUnits.java
index d7a1be02d236bcb6b1d051afa6800fb1c30e4a3c..c6a06dda511f00742a613e410e36bdf965e7c3ed 100644 (file)
--- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/DPTUnits.java
+++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/DPTUnits.java
@@ -79,7 +79,7 @@ public class DPTUnits {
                 try {
                     Object o = field.get(null);
                     if (o instanceof DPT dpt) {
-                        String unit = dpt.getUnit().replaceAll(" ", "");
+                        String unit = dpt.getUnit().replace(" ", "");
                         // Calimero provides some units (like "ms⁻²") that can't be parsed by our library because of the
                         // negative exponent
                         // replace with /

diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/ValueEncoder.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/ValueEncoder.java
index 40af768bc4fd32da692cf428b2b7dbe24c6eea5e..48e1ede1d77a8ca665167cdf1a511f5e0f62214b 100644 (file)
--- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/ValueEncoder.java
+++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/ValueEncoder.java
@@ -90,17 +90,17 @@ public class ValueEncoder {
             if (value instanceof HSBType type) {
                 return handleHSBType(dptId, type);
             } else if (value instanceof OnOffType) {
-                return OnOffType.OFF.equals(value) ? dpt.getLowerValue() : dpt.getUpperValue();
+                return OnOffType.OFF == value ? dpt.getLowerValue() : dpt.getUpperValue();
             } else if (value instanceof UpDownType) {
-                return UpDownType.UP.equals(value) ? dpt.getLowerValue() : dpt.getUpperValue();
+                return UpDownType.UP == value ? dpt.getLowerValue() : dpt.getUpperValue();
             } else if (value instanceof IncreaseDecreaseType) {
                 DPT valueDPT = ((DPTXlator3BitControlled.DPT3BitControlled) dpt).getControlDPT();
-                return IncreaseDecreaseType.DECREASE.equals(value) ? valueDPT.getLowerValue() + " 5"
+                return IncreaseDecreaseType.DECREASE == value ? valueDPT.getLowerValue() + " 5"
                         : valueDPT.getUpperValue() + " 5";
             } else if (value instanceof OpenClosedType) {
-                return OpenClosedType.CLOSED.equals(value) ? dpt.getLowerValue() : dpt.getUpperValue();
+                return OpenClosedType.CLOSED == value ? dpt.getLowerValue() : dpt.getUpperValue();
             } else if (value instanceof StopMoveType) {
-                return StopMoveType.STOP.equals(value) ? dpt.getLowerValue() : dpt.getUpperValue();
+                return StopMoveType.STOP == value ? dpt.getLowerValue() : dpt.getUpperValue();
             } else if (value instanceof PercentType type) {
                 int intValue = type.intValue();
                 return "251.600".equals(dptId) ? String.format("- - - %d %%", intValue) : String.valueOf(intValue);

diff --git a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/i18n/MockedLocaleProvider.java b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/i18n/MockedLocaleProvider.java
index b3ca040a3b16750fe641d992eb1d469cd84b866f..ceca323bc45d1c2a5e60c1d1b697454576e3f171 100644 (file)
--- a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/i18n/MockedLocaleProvider.java
+++ b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/i18n/MockedLocaleProvider.java
@@ -24,6 +24,7 @@ import org.openhab.core.i18n.LocaleProvider;
  */
 @NonNullByDefault
 public class MockedLocaleProvider implements LocaleProvider {
+    @Override
     public Locale getLocale() {
         return Locale.ENGLISH;
     }