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 125c2e2ea..e20afc15f 100644 --- 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 d7a1be02d..c6a06dda5 100644 --- 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 40af768bc..48e1ede1d 100644 --- 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 b3ca040a3..ceca323bc 100644 --- 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; }