From 4dfb47e9b1b1e93836fba1d2eba43516e105f572 Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Thu, 27 Feb 2025 22:55:34 +0100 Subject: [PATCH] [knx] Upgrade Calimero to 2.6-rc2 (#18333) * [knx] Upgrade Calimero to 2.6-rc2 * Upgrade Calimero from 2.6-rc1 to 2.6-rc2, see changes https://github.com/calimero-project/calimero-core/compare/v2.6-rc1...v2.6-rc2 * Handle deprecations Signed-off-by: Holger Friedrich * * Minor Java 21 improvements Signed-off-by: Holger Friedrich --------- Signed-off-by: Holger Friedrich --- bundles/org.openhab.binding.knx/pom.xml | 4 ++-- .../org/openhab/binding/knx/internal/channel/KNXChannel.java | 2 +- .../binding/knx/internal/client/CustomKNXNetworkLinkIP.java | 4 ++-- .../org/openhab/binding/knx/internal/client/IPClient.java | 4 ++-- .../binding/knx/internal/handler/DeviceThingHandler.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bundles/org.openhab.binding.knx/pom.xml b/bundles/org.openhab.binding.knx/pom.xml index aac818dfaea10..cc9891f88993d 100644 --- a/bundles/org.openhab.binding.knx/pom.xml +++ b/bundles/org.openhab.binding.knx/pom.xml @@ -28,7 +28,7 @@ com.github.calimero calimero-core - 2.6-rc1 + 2.6-rc2 compile @@ -40,7 +40,7 @@ com.github.calimero calimero-device - 2.6-rc1 + 2.6-rc2 compile diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/KNXChannel.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/KNXChannel.java index 336f6dcdb2785..d954d81b7938b 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/KNXChannel.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/KNXChannel.java @@ -63,7 +63,7 @@ public abstract class KNXChannel { KNXChannel(List gaKeys, List> acceptedTypes, Channel channel) { this.gaKeys = gaKeys; - this.preferredType = acceptedTypes.get(0); + this.preferredType = acceptedTypes.getFirst(); // this is safe because we already checked the presence of the ChannelTypeUID before this.channelType = Objects.requireNonNull(channel.getChannelTypeUID()).getId(); diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomKNXNetworkLinkIP.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomKNXNetworkLinkIP.java index abc843ca025c0..29cd6dcba5c90 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomKNXNetworkLinkIP.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomKNXNetworkLinkIP.java @@ -29,8 +29,8 @@ @NonNullByDefault public class CustomKNXNetworkLinkIP extends KNXNetworkLinkIP { - public static final int TUNNELING = KNXNetworkLinkIP.TUNNELING; - public static final int TUNNELINGV2 = KNXNetworkLinkIP.TunnelingV2; + public static final int TunnelingV1 = KNXNetworkLinkIP.TunnelingV1; + public static final int TunnelingV2 = KNXNetworkLinkIP.TunnelingV2; public static final int ROUTING = KNXNetworkLinkIP.ROUTING; CustomKNXNetworkLinkIP(final int serviceMode, KNXnetIPConnection conn, KNXMediumSettings settings) diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/IPClient.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/IPClient.java index a6a5f6da1f96c..4cfe99cbd9712 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/IPClient.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/IPClient.java @@ -137,9 +137,9 @@ private KNXNetworkLinkIP createKNXNetworkLinkIP(IpConnectionType ipConnectionTyp // Calimero service mode, ROUTING for both classic and secure routing int serviceMode = CustomKNXNetworkLinkIP.ROUTING; if (ipConnectionType == IpConnectionType.TUNNEL) { - serviceMode = CustomKNXNetworkLinkIP.TUNNELING; + serviceMode = CustomKNXNetworkLinkIP.TunnelingV1; } else if (ipConnectionType == IpConnectionType.SECURE_TUNNEL) { - serviceMode = CustomKNXNetworkLinkIP.TUNNELINGV2; + serviceMode = CustomKNXNetworkLinkIP.TunnelingV2; } // creating the connection here as a workaround for diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/DeviceThingHandler.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/DeviceThingHandler.java index 3894ee353122a..97d5f74c51905 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/DeviceThingHandler.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/DeviceThingHandler.java @@ -131,7 +131,7 @@ public void initialize() { continue; } - String dpt = inboundSpecs.get(0).getDPT(); // there can be only one DPT on number channels + String dpt = inboundSpecs.getFirst().getDPT(); // there can be only one DPT on number channels Unit unit = UnitUtils.parseUnit(DPTUnits.getUnitForDpt(dpt)); String dimension = unit == null ? null : UnitUtils.getDimensionName(unit); String expectedItemType = dimension == null ? "Number" : "Number:" + dimension; // unknown dimension ->