From 20ef084eb0eaa65d8175b206a45ba2bfcceda6ab Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Fri, 11 Oct 2024 23:45:38 +0200 Subject: [PATCH 1/2] [knx] Perpare for Calimero 3.0 Signed-off-by: Holger Friedrich --- bundles/org.openhab.binding.knx/pom.xml | 15 +++-- .../channel/GroupAddressConfiguration.java | 4 +- .../knx/internal/channel/KNXChannel.java | 2 +- .../knx/internal/channel/ListenSpecImpl.java | 2 +- .../internal/channel/ReadRequestSpecImpl.java | 2 +- .../channel/ReadResponseSpecImpl.java | 2 +- .../knx/internal/channel/TypeColor.java | 8 +-- .../knx/internal/channel/TypeContact.java | 2 +- .../knx/internal/channel/TypeDateTime.java | 2 +- .../knx/internal/channel/TypeDimmer.java | 6 +- .../internal/channel/TypeRollershutter.java | 4 +- .../knx/internal/channel/TypeString.java | 2 +- .../knx/internal/channel/TypeSwitch.java | 2 +- .../knx/internal/channel/WriteSpecImpl.java | 2 +- .../internal/client/AbstractKNXClient.java | 56 +++++++++---------- .../internal/client/BusMessageListener.java | 4 +- .../client/CustomKNXNetworkLinkIP.java | 12 ++-- .../client/CustomManagementClientImpl.java | 8 +-- .../CustomManagementProceduresImpl.java | 8 +-- .../client/CustomSecureManagement.java | 12 ++-- .../knx/internal/client/DeviceInfoClient.java | 2 +- .../internal/client/DeviceInfoClientImpl.java | 8 +-- .../knx/internal/client/DeviceInspector.java | 14 ++--- .../binding/knx/internal/client/IPClient.java | 34 +++++------ .../knx/internal/client/InboundSpec.java | 2 +- .../knx/internal/client/KNXClient.java | 6 +- .../knx/internal/client/NoOpClient.java | 6 +- .../knx/internal/client/OutboundSpec.java | 2 +- .../knx/internal/client/ReadDatapoint.java | 2 +- .../knx/internal/client/SerialClient.java | 14 ++--- .../client/SerialTransportAdapter.java | 10 +--- .../discovery/KNXnetDiscoveryService.java | 10 ++-- .../binding/knx/internal/dpt/DPTUnits.java | 22 ++++---- .../binding/knx/internal/dpt/DPTUtil.java | 10 ++-- .../knx/internal/dpt/ValueDecoder.java | 26 ++++----- .../knx/internal/dpt/ValueEncoder.java | 24 ++++---- .../internal/handler/DeviceThingHandler.java | 12 ++-- .../handler/GroupAddressListener.java | 2 +- .../handler/IPBridgeThingHandler.java | 2 +- .../handler/KNXBridgeBaseThingHandler.java | 20 +++---- .../handler/SerialBridgeThingHandler.java | 2 +- .../knx/internal/channel/KNXChannelTest.java | 4 +- .../internal/client/DummyKNXNetworkLink.java | 20 +++---- .../internal/client/DummyProcessListener.java | 6 +- .../binding/knx/internal/dpt/DPTTest.java | 14 ++--- .../KNXBridgeBaseThingHandlerTest.java | 2 +- .../i18n/KNXTranslationProviderTest.java | 4 +- .../knx/internal/itests/Back2BackTest.java | 16 +++--- .../internal/security/KNXSecurityTest.java | 12 ++-- 49 files changed, 229 insertions(+), 234 deletions(-) diff --git a/bundles/org.openhab.binding.knx/pom.xml b/bundles/org.openhab.binding.knx/pom.xml index fdf2beda18fa7..d7b7a0a18d918 100644 --- a/bundles/org.openhab.binding.knx/pom.xml +++ b/bundles/org.openhab.binding.knx/pom.xml @@ -26,9 +26,9 @@ provided - com.github.calimero + io.calimero calimero-core - 2.6-rc1 + 3.0-SNAPSHOT compile @@ -38,9 +38,9 @@ - com.github.calimero + io.calimero calimero-device - 2.6-rc1 + 3.0-SNAPSHOT compile @@ -70,10 +70,10 @@ Require-Capability: osgi.extender:= filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader:= - filter:="(osgi.serviceloader=tuwien.auto.calimero.serial.spi.SerialCom)"; + filter:="(osgi.serviceloader=io.calimero.serial.spi.SerialCom)"; cardinality:=multiple -SPI-Provider: tuwien.auto.calimero.serial.spi.SerialCom -SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[tuwien.auto.calimero.serial.spi.SerialCom]) +SPI-Provider: io.calimero.serial.spi.SerialCom +SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[io.calimero.serial.spi.SerialCom]) ]]> @@ -96,7 +96,6 @@ SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[tuwien.auto.calimero. 0.8.12 - tuwien/auto/calimero/**/* io/calimero/**/* diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/GroupAddressConfiguration.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/GroupAddressConfiguration.java index d1355b52bc088..629f6933ac018 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/GroupAddressConfiguration.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/GroupAddressConfiguration.java @@ -22,8 +22,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.GroupAddress; -import tuwien.auto.calimero.KNXFormatException; +import io.calimero.GroupAddress; +import io.calimero.KNXFormatException; /** * Data structure representing the content of a channel's group address configuration. 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..1c4b4f3a3e0df 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 @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.GroupAddress; +import io.calimero.GroupAddress; /** * Meta-data abstraction for the KNX channel configurations. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ListenSpecImpl.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ListenSpecImpl.java index 53fbb895bddc2..5b55b8f7da8a0 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ListenSpecImpl.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ListenSpecImpl.java @@ -18,7 +18,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.binding.knx.internal.client.InboundSpec; -import tuwien.auto.calimero.GroupAddress; +import io.calimero.GroupAddress; /** * Listen meta-data. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadRequestSpecImpl.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadRequestSpecImpl.java index a1c60d62bdaaa..fcd846c6da06f 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadRequestSpecImpl.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadRequestSpecImpl.java @@ -18,7 +18,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.binding.knx.internal.client.InboundSpec; -import tuwien.auto.calimero.GroupAddress; +import io.calimero.GroupAddress; /** * Read meta-data. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadResponseSpecImpl.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadResponseSpecImpl.java index 87b0a23ad7bd9..2929cf1d4f7b7 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadResponseSpecImpl.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadResponseSpecImpl.java @@ -18,7 +18,7 @@ import org.openhab.binding.knx.internal.client.OutboundSpec; import org.openhab.core.types.Type; -import tuwien.auto.calimero.GroupAddress; +import io.calimero.GroupAddress; /** * Response meta-data diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeColor.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeColor.java index 77a6e848e268d..b4b9bd1985662 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeColor.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeColor.java @@ -24,10 +24,10 @@ import org.openhab.core.library.types.PercentType; import org.openhab.core.thing.Channel; -import tuwien.auto.calimero.dptxlator.DPTXlator3BitControlled; -import tuwien.auto.calimero.dptxlator.DPTXlator8BitUnsigned; -import tuwien.auto.calimero.dptxlator.DPTXlatorBoolean; -import tuwien.auto.calimero.dptxlator.DPTXlatorRGB; +import io.calimero.dptxlator.DPTXlator3BitControlled; +import io.calimero.dptxlator.DPTXlator8BitUnsigned; +import io.calimero.dptxlator.DPTXlatorBoolean; +import io.calimero.dptxlator.DPTXlatorRGB; /** * color channel type description diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeContact.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeContact.java index 87039663eb265..04fa5f4da0ac9 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeContact.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeContact.java @@ -21,7 +21,7 @@ import org.openhab.core.library.types.OpenClosedType; import org.openhab.core.thing.Channel; -import tuwien.auto.calimero.dptxlator.DPTXlatorBoolean; +import io.calimero.dptxlator.DPTXlatorBoolean; /** * contact channel type description diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDateTime.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDateTime.java index 25f57ef0af391..0eee4392386ea 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDateTime.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDateTime.java @@ -21,7 +21,7 @@ import org.openhab.core.library.types.DateTimeType; import org.openhab.core.thing.Channel; -import tuwien.auto.calimero.dptxlator.DPTXlatorDateTime; +import io.calimero.dptxlator.DPTXlatorDateTime; /** * datetime channel type description diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDimmer.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDimmer.java index 8824e80f22a98..71b8650cd1c6f 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDimmer.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDimmer.java @@ -23,9 +23,9 @@ import org.openhab.core.library.types.PercentType; import org.openhab.core.thing.Channel; -import tuwien.auto.calimero.dptxlator.DPTXlator3BitControlled; -import tuwien.auto.calimero.dptxlator.DPTXlator8BitUnsigned; -import tuwien.auto.calimero.dptxlator.DPTXlatorBoolean; +import io.calimero.dptxlator.DPTXlator3BitControlled; +import io.calimero.dptxlator.DPTXlator8BitUnsigned; +import io.calimero.dptxlator.DPTXlatorBoolean; /** * dimmer channel type description diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeRollershutter.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeRollershutter.java index 27caec2c2215f..342019f412e96 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeRollershutter.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeRollershutter.java @@ -23,8 +23,8 @@ import org.openhab.core.library.types.UpDownType; import org.openhab.core.thing.Channel; -import tuwien.auto.calimero.dptxlator.DPTXlator8BitUnsigned; -import tuwien.auto.calimero.dptxlator.DPTXlatorBoolean; +import io.calimero.dptxlator.DPTXlator8BitUnsigned; +import io.calimero.dptxlator.DPTXlatorBoolean; /** * rollershutter channel type description diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeString.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeString.java index 043ecd611020c..535392d41b02a 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeString.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeString.java @@ -21,7 +21,7 @@ import org.openhab.core.library.types.StringType; import org.openhab.core.thing.Channel; -import tuwien.auto.calimero.dptxlator.DPTXlatorString; +import io.calimero.dptxlator.DPTXlatorString; /** * string channel type description diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeSwitch.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeSwitch.java index 13f2df0c0efba..0ad92f970ffe1 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeSwitch.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeSwitch.java @@ -21,7 +21,7 @@ import org.openhab.core.library.types.OnOffType; import org.openhab.core.thing.Channel; -import tuwien.auto.calimero.dptxlator.DPTXlatorBoolean; +import io.calimero.dptxlator.DPTXlatorBoolean; /** * switch channel type description diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/WriteSpecImpl.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/WriteSpecImpl.java index b665ffb8d2716..8145eb7659f87 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/WriteSpecImpl.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/WriteSpecImpl.java @@ -18,7 +18,7 @@ import org.openhab.binding.knx.internal.client.OutboundSpec; import org.openhab.core.types.Type; -import tuwien.auto.calimero.GroupAddress; +import io.calimero.GroupAddress; /** * Command meta-data diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/AbstractKNXClient.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/AbstractKNXClient.java index 9793f96689e15..08c4c521ecb69 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/AbstractKNXClient.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/AbstractKNXClient.java @@ -38,34 +38,34 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.CloseEvent; -import tuwien.auto.calimero.DataUnitBuilder; -import tuwien.auto.calimero.DetachEvent; -import tuwien.auto.calimero.FrameEvent; -import tuwien.auto.calimero.GroupAddress; -import tuwien.auto.calimero.IndividualAddress; -import tuwien.auto.calimero.KNXAddress; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.KNXIllegalArgumentException; -import tuwien.auto.calimero.cemi.CEMILData; -import tuwien.auto.calimero.cemi.CemiTData; -import tuwien.auto.calimero.datapoint.CommandDP; -import tuwien.auto.calimero.datapoint.Datapoint; -import tuwien.auto.calimero.device.ProcessCommunicationResponder; -import tuwien.auto.calimero.link.KNXNetworkLink; -import tuwien.auto.calimero.link.NetworkLinkListener; -import tuwien.auto.calimero.mgmt.Destination; -import tuwien.auto.calimero.mgmt.ManagementClient; -import tuwien.auto.calimero.mgmt.ManagementProcedures; -import tuwien.auto.calimero.mgmt.TransportLayerImpl; -import tuwien.auto.calimero.process.ProcessCommunication; -import tuwien.auto.calimero.process.ProcessCommunicator; -import tuwien.auto.calimero.process.ProcessCommunicatorImpl; -import tuwien.auto.calimero.process.ProcessEvent; -import tuwien.auto.calimero.process.ProcessListener; -import tuwien.auto.calimero.secure.KnxSecureException; -import tuwien.auto.calimero.secure.SecureApplicationLayer; -import tuwien.auto.calimero.secure.Security; +import io.calimero.CloseEvent; +import io.calimero.DataUnitBuilder; +import io.calimero.DetachEvent; +import io.calimero.FrameEvent; +import io.calimero.GroupAddress; +import io.calimero.IndividualAddress; +import io.calimero.KNXAddress; +import io.calimero.KNXException; +import io.calimero.KNXIllegalArgumentException; +import io.calimero.cemi.CEMILData; +import io.calimero.cemi.CemiTData; +import io.calimero.datapoint.CommandDP; +import io.calimero.datapoint.Datapoint; +import io.calimero.device.ProcessCommunicationResponder; +import io.calimero.link.KNXNetworkLink; +import io.calimero.link.NetworkLinkListener; +import io.calimero.mgmt.Destination; +import io.calimero.mgmt.ManagementClient; +import io.calimero.mgmt.ManagementProcedures; +import io.calimero.mgmt.TransportLayerImpl; +import io.calimero.process.ProcessCommunication; +import io.calimero.process.ProcessCommunicator; +import io.calimero.process.ProcessCommunicatorImpl; +import io.calimero.process.ProcessEvent; +import io.calimero.process.ProcessListener; +import io.calimero.secure.KnxSecureException; +import io.calimero.secure.SecureApplicationLayer; +import io.calimero.secure.Security; /** * KNX Client which encapsulates the communication with the KNX bus via the calimero library. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/BusMessageListener.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/BusMessageListener.java index 837ff2c9d3950..ab9b07f0449fc 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/BusMessageListener.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/BusMessageListener.java @@ -14,8 +14,8 @@ import org.eclipse.jdt.annotation.NonNullByDefault; -import tuwien.auto.calimero.GroupAddress; -import tuwien.auto.calimero.IndividualAddress; +import io.calimero.GroupAddress; +import io.calimero.IndividualAddress; /** * Callback interface for KNX bus messages 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..912e5375ae309 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 @@ -14,10 +14,10 @@ import org.eclipse.jdt.annotation.NonNullByDefault; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.knxnetip.KNXnetIPConnection; -import tuwien.auto.calimero.link.KNXNetworkLinkIP; -import tuwien.auto.calimero.link.medium.KNXMediumSettings; +import io.calimero.KNXException; +import io.calimero.knxnetip.KNXnetIPConnection; +import io.calimero.link.KNXNetworkLinkIP; +import io.calimero.link.medium.KNXMediumSettings; /** * Subclass of {@link KNXNetworkLinkIP} which exposes the protected constructor in order to work-around @@ -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/CustomManagementClientImpl.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomManagementClientImpl.java index e3f90faefecc5..d82769ad0c6c4 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomManagementClientImpl.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomManagementClientImpl.java @@ -14,10 +14,10 @@ import org.eclipse.jdt.annotation.NonNullByDefault; -import tuwien.auto.calimero.link.KNXLinkClosedException; -import tuwien.auto.calimero.link.KNXNetworkLink; -import tuwien.auto.calimero.mgmt.ManagementClientImpl; -import tuwien.auto.calimero.mgmt.SecureManagement; +import io.calimero.link.KNXLinkClosedException; +import io.calimero.link.KNXNetworkLink; +import io.calimero.mgmt.ManagementClientImpl; +import io.calimero.mgmt.SecureManagement; /** * This class is to provide access to protected constructors in the Calimero library. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomManagementProceduresImpl.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomManagementProceduresImpl.java index c7dc47d900076..4af1659cb03b3 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomManagementProceduresImpl.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomManagementProceduresImpl.java @@ -14,10 +14,10 @@ import org.eclipse.jdt.annotation.NonNullByDefault; -import tuwien.auto.calimero.link.KNXLinkClosedException; -import tuwien.auto.calimero.mgmt.ManagementClient; -import tuwien.auto.calimero.mgmt.ManagementProceduresImpl; -import tuwien.auto.calimero.mgmt.TransportLayer; +import io.calimero.link.KNXLinkClosedException; +import io.calimero.mgmt.ManagementClient; +import io.calimero.mgmt.ManagementProceduresImpl; +import io.calimero.mgmt.TransportLayer; /** * This class is to provide access to protected constructors in the Calimero library. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomSecureManagement.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomSecureManagement.java index 5b25a05332fd6..7083f1b490378 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomSecureManagement.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomSecureManagement.java @@ -14,12 +14,12 @@ import org.eclipse.jdt.annotation.NonNullByDefault; -import tuwien.auto.calimero.SerialNumber; -import tuwien.auto.calimero.link.KNXLinkClosedException; -import tuwien.auto.calimero.mgmt.SecureManagement; -import tuwien.auto.calimero.mgmt.TransportLayer; -import tuwien.auto.calimero.mgmt.TransportLayerImpl; -import tuwien.auto.calimero.secure.Security; +import io.calimero.SerialNumber; +import io.calimero.link.KNXLinkClosedException; +import io.calimero.mgmt.SecureManagement; +import io.calimero.mgmt.TransportLayer; +import io.calimero.mgmt.TransportLayerImpl; +import io.calimero.secure.Security; /** * This class is to provide access to protected constructors in the Calimero library. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClient.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClient.java index 2873532a13216..4739d284af625 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClient.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClient.java @@ -15,7 +15,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import tuwien.auto.calimero.IndividualAddress; +import io.calimero.IndividualAddress; /** * Client to retrieve further information about KNX devices. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClientImpl.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClientImpl.java index 3b57917004065..e352ee03c1fd9 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClientImpl.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClientImpl.java @@ -21,10 +21,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.IndividualAddress; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.mgmt.Destination; -import tuwien.auto.calimero.mgmt.ManagementClient; +import io.calimero.IndividualAddress; +import io.calimero.KNXException; +import io.calimero.mgmt.Destination; +import io.calimero.mgmt.ManagementClient; /** * Client for retrieving additional device descriptions. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInspector.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInspector.java index c9e873f6e5409..52051e12d329d 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInspector.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInspector.java @@ -26,13 +26,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.DeviceDescriptor; -import tuwien.auto.calimero.DeviceDescriptor.DD0; -import tuwien.auto.calimero.DeviceDescriptor.DD2; -import tuwien.auto.calimero.GroupAddress; -import tuwien.auto.calimero.IndividualAddress; -import tuwien.auto.calimero.KNXIllegalArgumentException; -import tuwien.auto.calimero.mgmt.PropertyAccess.PID; +import io.calimero.DeviceDescriptor; +import io.calimero.DeviceDescriptor.DD0; +import io.calimero.DeviceDescriptor.DD2; +import io.calimero.GroupAddress; +import io.calimero.IndividualAddress; +import io.calimero.KNXIllegalArgumentException; +import io.calimero.mgmt.PropertyAccess.PID; /** * Client dedicated to read device specific information using the {@link DeviceInfoClient}. 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..004ce9ea8158a 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 @@ -27,21 +27,21 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.IndividualAddress; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.KNXIllegalArgumentException; -import tuwien.auto.calimero.knxnetip.KNXnetIPConnection; -import tuwien.auto.calimero.knxnetip.KNXnetIPRouting; -import tuwien.auto.calimero.knxnetip.KNXnetIPTunnel; -import tuwien.auto.calimero.knxnetip.KNXnetIPTunnel.TunnelingLayer; -import tuwien.auto.calimero.knxnetip.SecureConnection; -import tuwien.auto.calimero.knxnetip.TcpConnection; -import tuwien.auto.calimero.knxnetip.TcpConnection.SecureSession; -import tuwien.auto.calimero.link.KNXNetworkLink; -import tuwien.auto.calimero.link.KNXNetworkLinkIP; -import tuwien.auto.calimero.link.medium.KNXMediumSettings; -import tuwien.auto.calimero.link.medium.TPSettings; -import tuwien.auto.calimero.secure.Security; +import io.calimero.IndividualAddress; +import io.calimero.KNXException; +import io.calimero.KNXIllegalArgumentException; +import io.calimero.knxnetip.KNXnetIPConnection; +import io.calimero.knxnetip.KNXnetIPRouting; +import io.calimero.knxnetip.KNXnetIPTunnel; +import io.calimero.knxnetip.KNXnetIPTunnel.TunnelingLayer; +import io.calimero.knxnetip.SecureConnection; +import io.calimero.knxnetip.StreamConnection.SecureSession; +import io.calimero.knxnetip.TcpConnection; +import io.calimero.link.KNXNetworkLink; +import io.calimero.link.KNXNetworkLinkIP; +import io.calimero.link.medium.KNXMediumSettings; +import io.calimero.link.medium.TPSettings; +import io.calimero.secure.Security; /** * IP specific {@link AbstractKNXClient} implementation. @@ -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/client/InboundSpec.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/InboundSpec.java index c81f48a0aba89..cc8027734a113 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/InboundSpec.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/InboundSpec.java @@ -16,7 +16,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; -import tuwien.auto.calimero.GroupAddress; +import io.calimero.GroupAddress; /** * Describes the relevant parameters for reading from/listening to the KNX bus. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/KNXClient.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/KNXClient.java index 5e63a6c6c678e..d33763355905f 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/KNXClient.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/KNXClient.java @@ -16,9 +16,9 @@ import org.eclipse.jdt.annotation.Nullable; import org.openhab.binding.knx.internal.handler.GroupAddressListener; -import tuwien.auto.calimero.IndividualAddress; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.datapoint.Datapoint; +import io.calimero.IndividualAddress; +import io.calimero.KNXException; +import io.calimero.datapoint.Datapoint; /** * Client for communicating with the KNX bus. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/NoOpClient.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/NoOpClient.java index 14884ae55bdb6..50ff224ba16a7 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/NoOpClient.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/NoOpClient.java @@ -16,9 +16,9 @@ import org.eclipse.jdt.annotation.Nullable; import org.openhab.binding.knx.internal.handler.GroupAddressListener; -import tuwien.auto.calimero.IndividualAddress; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.datapoint.Datapoint; +import io.calimero.IndividualAddress; +import io.calimero.KNXException; +import io.calimero.datapoint.Datapoint; /** * diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/OutboundSpec.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/OutboundSpec.java index 7c6fbd69423b9..e090f35b7b451 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/OutboundSpec.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/OutboundSpec.java @@ -15,7 +15,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.types.Type; -import tuwien.auto.calimero.GroupAddress; +import io.calimero.GroupAddress; /** * Describes the relevant parameters for writing to the KNX bus. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/ReadDatapoint.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/ReadDatapoint.java index 6050fc3f36440..5eccb1d0db6c5 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/ReadDatapoint.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/ReadDatapoint.java @@ -15,7 +15,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import tuwien.auto.calimero.datapoint.Datapoint; +import io.calimero.datapoint.Datapoint; /** * Information about a data point which is queued to be read from the KNX bus. diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialClient.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialClient.java index 6ce2e6c445dab..f139587347c93 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialClient.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialClient.java @@ -27,13 +27,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.Connection.BlockingMode; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.link.KNXNetworkLink; -import tuwien.auto.calimero.link.KNXNetworkLinkFT12; -import tuwien.auto.calimero.link.medium.TPSettings; -import tuwien.auto.calimero.secure.Security; -import tuwien.auto.calimero.serial.FT12Connection; +import io.calimero.Connection.BlockingMode; +import io.calimero.KNXException; +import io.calimero.link.KNXNetworkLink; +import io.calimero.link.KNXNetworkLinkFT12; +import io.calimero.link.medium.TPSettings; +import io.calimero.secure.Security; +import io.calimero.serial.FT12Connection; /** * Serial specific {@link AbstractKNXClient} implementation. 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 c1d6689dfa853..f25f11870cc0e 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 @@ -32,15 +32,15 @@ import org.slf4j.LoggerFactory; import aQute.bnd.annotation.spi.ServiceProvider; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.serial.spi.SerialCom; +import io.calimero.KNXException; +import io.calimero.serial.spi.SerialCom; /** * The {@link SerialTransportAdapter} provides org.openhab.core.io.transport.serial * services to the Calimero library. * * {@literal @}ServiceProvider annotation (biz.aQute.bnd.annotation) automatically creates the file - * /META-INF/services/tuwien.auto.calimero.serial.spi.SerialCom + * /META-INF/services/io.calimero.serial.spi.SerialCom * to register SerialTransportAdapter to the service loader. * Additional attributes for SerialTransportAdapter can be specified as well, e.g. * attribute = { "position=1" } @@ -69,7 +69,6 @@ public static void setSerialPortManager(SerialPortManager serialPortManager) { public SerialTransportAdapter() { } - @Override public void open(@Nullable String portId) throws IOException, KNXException { if (portId == null) { throw new IOException("Port not available"); @@ -154,7 +153,6 @@ public void close() { // disable NonNullByDefault for this function, legacy interface List @NonNullByDefault({}) - @Override public List portIdentifiers() { final @Nullable SerialPortManager tmpSerialPortManager = serialPortManager; if (tmpSerialPortManager == null) { @@ -174,7 +172,6 @@ public int baudRate() throws IOException { return tmpSerialPort.getBaudRate(); } - @Override public void setSerialPortParams(final int baudrate, final int databits, @Nullable StopBits stopbits, @Nullable Parity parity) throws IOException { final @Nullable SerialPort tmpSerialPort = serialPort; @@ -191,7 +188,6 @@ public void setSerialPortParams(final int baudrate, final int databits, @Nullabl } } - @Override public void setFlowControlMode(@Nullable FlowControl mode) throws IOException { final @Nullable SerialPort tmpSerialPort = serialPort; if (tmpSerialPort == null) { diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/discovery/KNXnetDiscoveryService.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/discovery/KNXnetDiscoveryService.java index 731dc49fedd82..ce54251caf2ed 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/discovery/KNXnetDiscoveryService.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/discovery/KNXnetDiscoveryService.java @@ -30,11 +30,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.knxnetip.Discoverer; -import tuwien.auto.calimero.knxnetip.Discoverer.Result; -import tuwien.auto.calimero.knxnetip.servicetype.SearchResponse; -import tuwien.auto.calimero.knxnetip.util.ServiceFamiliesDIB; -import tuwien.auto.calimero.knxnetip.util.ServiceFamiliesDIB.ServiceFamily; +import io.calimero.knxnetip.Discoverer; +import io.calimero.knxnetip.Discoverer.Result; +import io.calimero.knxnetip.servicetype.SearchResponse; +import io.calimero.knxnetip.util.ServiceFamiliesDIB; +import io.calimero.knxnetip.util.ServiceFamiliesDIB.ServiceFamily; /** * Discovers KNXnet/IP interfaces or routers and adds the results to the inbox. 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 5e97b686b7037..f720e2c2b484b 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 @@ -23,17 +23,17 @@ import org.openhab.core.library.unit.SIUnits; import org.openhab.core.library.unit.Units; -import tuwien.auto.calimero.dptxlator.DPT; -import tuwien.auto.calimero.dptxlator.DPTXlator; -import tuwien.auto.calimero.dptxlator.DPTXlator2ByteFloat; -import tuwien.auto.calimero.dptxlator.DPTXlator2ByteUnsigned; -import tuwien.auto.calimero.dptxlator.DPTXlator4ByteFloat; -import tuwien.auto.calimero.dptxlator.DPTXlator4ByteSigned; -import tuwien.auto.calimero.dptxlator.DPTXlator4ByteUnsigned; -import tuwien.auto.calimero.dptxlator.DPTXlator64BitSigned; -import tuwien.auto.calimero.dptxlator.DPTXlator8BitSigned; -import tuwien.auto.calimero.dptxlator.DPTXlator8BitUnsigned; -import tuwien.auto.calimero.dptxlator.DptXlator2ByteSigned; +import io.calimero.dptxlator.DPT; +import io.calimero.dptxlator.DPTXlator; +import io.calimero.dptxlator.DPTXlator2ByteFloat; +import io.calimero.dptxlator.DPTXlator2ByteUnsigned; +import io.calimero.dptxlator.DPTXlator4ByteFloat; +import io.calimero.dptxlator.DPTXlator4ByteSigned; +import io.calimero.dptxlator.DPTXlator4ByteUnsigned; +import io.calimero.dptxlator.DPTXlator64BitSigned; +import io.calimero.dptxlator.DPTXlator8BitSigned; +import io.calimero.dptxlator.DPTXlator8BitUnsigned; +import io.calimero.dptxlator.DptXlator2ByteSigned; /** * This class provides the units for values depending on the DPT (if available) diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/DPTUtil.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/DPTUtil.java index f3a51f9207966..5e2c0a4554f8c 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/DPTUtil.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/DPTUtil.java @@ -33,11 +33,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.dptxlator.DPTXlator3BitControlled; -import tuwien.auto.calimero.dptxlator.DPTXlator8BitSigned; -import tuwien.auto.calimero.dptxlator.DPTXlator8BitUnsigned; -import tuwien.auto.calimero.dptxlator.DPTXlatorBoolean; -import tuwien.auto.calimero.dptxlator.DPTXlatorString; +import io.calimero.dptxlator.DPTXlator3BitControlled; +import io.calimero.dptxlator.DPTXlator8BitSigned; +import io.calimero.dptxlator.DPTXlator8BitUnsigned; +import io.calimero.dptxlator.DPTXlatorBoolean; +import io.calimero.dptxlator.DPTXlatorString; /** * This class provides support to determine compatibility between KNX DPTs and openHAB data types diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/ValueDecoder.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/ValueDecoder.java index f0268b095b050..730768b217739 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/ValueDecoder.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/ValueDecoder.java @@ -43,19 +43,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.KNXFormatException; -import tuwien.auto.calimero.KNXIllegalArgumentException; -import tuwien.auto.calimero.dptxlator.DPTXlator; -import tuwien.auto.calimero.dptxlator.DPTXlator1BitControlled; -import tuwien.auto.calimero.dptxlator.DPTXlator2ByteUnsigned; -import tuwien.auto.calimero.dptxlator.DPTXlator3BitControlled; -import tuwien.auto.calimero.dptxlator.DPTXlator64BitSigned; -import tuwien.auto.calimero.dptxlator.DPTXlator8BitUnsigned; -import tuwien.auto.calimero.dptxlator.DPTXlatorBoolean; -import tuwien.auto.calimero.dptxlator.DPTXlatorDateTime; -import tuwien.auto.calimero.dptxlator.DPTXlatorSceneControl; -import tuwien.auto.calimero.dptxlator.TranslatorTypes; +import io.calimero.KNXException; +import io.calimero.KNXFormatException; +import io.calimero.KNXIllegalArgumentException; +import io.calimero.dptxlator.DPTXlator; +import io.calimero.dptxlator.DPTXlator1BitControlled; +import io.calimero.dptxlator.DPTXlator2ByteUnsigned; +import io.calimero.dptxlator.DPTXlator3BitControlled; +import io.calimero.dptxlator.DPTXlator64BitSigned; +import io.calimero.dptxlator.DPTXlator8BitUnsigned; +import io.calimero.dptxlator.DPTXlatorBoolean; +import io.calimero.dptxlator.DPTXlatorDateTime; +import io.calimero.dptxlator.DPTXlatorSceneControl; +import io.calimero.dptxlator.TranslatorTypes; /** * This class decodes raw data received from the KNX bus to an openHAB datatype 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 c0e84ee7ab030..ef8aa7aa7032d 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 @@ -40,18 +40,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.dptxlator.DPT; -import tuwien.auto.calimero.dptxlator.DPTXlator; -import tuwien.auto.calimero.dptxlator.DPTXlator1BitControlled; -import tuwien.auto.calimero.dptxlator.DPTXlator2ByteFloat; -import tuwien.auto.calimero.dptxlator.DPTXlator3BitControlled; -import tuwien.auto.calimero.dptxlator.DPTXlator4ByteFloat; -import tuwien.auto.calimero.dptxlator.DPTXlatorBoolean; -import tuwien.auto.calimero.dptxlator.DPTXlatorDate; -import tuwien.auto.calimero.dptxlator.DPTXlatorDateTime; -import tuwien.auto.calimero.dptxlator.DPTXlatorTime; -import tuwien.auto.calimero.dptxlator.TranslatorTypes; +import io.calimero.KNXException; +import io.calimero.dptxlator.DPT; +import io.calimero.dptxlator.DPTXlator; +import io.calimero.dptxlator.DPTXlator1BitControlled; +import io.calimero.dptxlator.DPTXlator2ByteFloat; +import io.calimero.dptxlator.DPTXlator3BitControlled; +import io.calimero.dptxlator.DPTXlator4ByteFloat; +import io.calimero.dptxlator.DPTXlatorBoolean; +import io.calimero.dptxlator.DPTXlatorDate; +import io.calimero.dptxlator.DPTXlatorDateTime; +import io.calimero.dptxlator.DPTXlatorTime; +import io.calimero.dptxlator.TranslatorTypes; /** * This class encodes openHAB data types to strings for sending via Calimero 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..96b569d3cda83 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 @@ -67,12 +67,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.GroupAddress; -import tuwien.auto.calimero.IndividualAddress; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.KNXFormatException; -import tuwien.auto.calimero.datapoint.CommandDP; -import tuwien.auto.calimero.datapoint.Datapoint; +import io.calimero.GroupAddress; +import io.calimero.IndividualAddress; +import io.calimero.KNXException; +import io.calimero.KNXFormatException; +import io.calimero.datapoint.CommandDP; +import io.calimero.datapoint.Datapoint; /** * The {@link DeviceThingHandler} is responsible for handling commands and state updates sent to and received from the diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/GroupAddressListener.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/GroupAddressListener.java index 86c7b0c2dedd2..9d8e2020a4523 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/GroupAddressListener.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/GroupAddressListener.java @@ -15,7 +15,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.binding.knx.internal.client.BusMessageListener; -import tuwien.auto.calimero.GroupAddress; +import io.calimero.GroupAddress; /** * The {@link GroupAddressListener} is an interface that needs to be diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/IPBridgeThingHandler.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/IPBridgeThingHandler.java index 064c3865c302f..2433616a0b5f8 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/IPBridgeThingHandler.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/IPBridgeThingHandler.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.secure.KnxSecureException; +import io.calimero.secure.KnxSecureException; /** * The {@link IPBridgeThingHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/KNXBridgeBaseThingHandler.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/KNXBridgeBaseThingHandler.java index e7aea29761635..e6b75f2ddf992 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/KNXBridgeBaseThingHandler.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/KNXBridgeBaseThingHandler.java @@ -39,16 +39,16 @@ import org.openhab.core.thing.binding.BaseBridgeHandler; import org.openhab.core.types.Command; -import tuwien.auto.calimero.GroupAddress; -import tuwien.auto.calimero.IndividualAddress; -import tuwien.auto.calimero.KNXFormatException; -import tuwien.auto.calimero.knxnetip.SecureConnection; -import tuwien.auto.calimero.secure.Keyring; -import tuwien.auto.calimero.secure.Keyring.Backbone; -import tuwien.auto.calimero.secure.Keyring.Interface; -import tuwien.auto.calimero.secure.KnxSecureException; -import tuwien.auto.calimero.secure.Security; -import tuwien.auto.calimero.xml.KNXMLException; +import io.calimero.GroupAddress; +import io.calimero.IndividualAddress; +import io.calimero.KNXFormatException; +import io.calimero.knxnetip.SecureConnection; +import io.calimero.secure.Keyring; +import io.calimero.secure.Keyring.Backbone; +import io.calimero.secure.Keyring.Interface; +import io.calimero.secure.KnxSecureException; +import io.calimero.secure.Security; +import io.calimero.xml.KNXMLException; /** * The {@link KNXBridgeBaseThingHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/SerialBridgeThingHandler.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/SerialBridgeThingHandler.java index 7971b12f88fc8..9f09a2e79d9ac 100644 --- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/SerialBridgeThingHandler.java +++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/SerialBridgeThingHandler.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.secure.KnxSecureException; +import io.calimero.secure.KnxSecureException; /** * The {@link IPBridgeThingHandler} is responsible for handling commands, which are diff --git a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/channel/KNXChannelTest.java b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/channel/KNXChannelTest.java index 00f91732331ae..f4a958e7cb977 100644 --- a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/channel/KNXChannelTest.java +++ b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/channel/KNXChannelTest.java @@ -38,8 +38,8 @@ import org.openhab.core.types.Command; import org.openhab.core.types.UnDefType; -import tuwien.auto.calimero.GroupAddress; -import tuwien.auto.calimero.KNXFormatException; +import io.calimero.GroupAddress; +import io.calimero.KNXFormatException; /** * diff --git a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/client/DummyKNXNetworkLink.java b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/client/DummyKNXNetworkLink.java index d75fc84ff11f5..d55a6e34a37dd 100644 --- a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/client/DummyKNXNetworkLink.java +++ b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/client/DummyKNXNetworkLink.java @@ -22,16 +22,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.FrameEvent; -import tuwien.auto.calimero.IndividualAddress; -import tuwien.auto.calimero.KNXAddress; -import tuwien.auto.calimero.KNXTimeoutException; -import tuwien.auto.calimero.Priority; -import tuwien.auto.calimero.cemi.CEMILData; -import tuwien.auto.calimero.link.KNXLinkClosedException; -import tuwien.auto.calimero.link.KNXNetworkLink; -import tuwien.auto.calimero.link.NetworkLinkListener; -import tuwien.auto.calimero.link.medium.KNXMediumSettings; +import io.calimero.FrameEvent; +import io.calimero.IndividualAddress; +import io.calimero.KNXAddress; +import io.calimero.KNXTimeoutException; +import io.calimero.Priority; +import io.calimero.cemi.CEMILData; +import io.calimero.link.KNXLinkClosedException; +import io.calimero.link.KNXNetworkLink; +import io.calimero.link.NetworkLinkListener; +import io.calimero.link.medium.KNXMediumSettings; /** * This class provides a simulated KNXNetworkLink with test stubs for integration tests. diff --git a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/client/DummyProcessListener.java b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/client/DummyProcessListener.java index 26d3296a99382..ff44991293385 100644 --- a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/client/DummyProcessListener.java +++ b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/client/DummyProcessListener.java @@ -17,9 +17,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.DetachEvent; -import tuwien.auto.calimero.process.ProcessEvent; -import tuwien.auto.calimero.process.ProcessListener; +import io.calimero.DetachEvent; +import io.calimero.process.ProcessEvent; +import io.calimero.process.ProcessListener; /** * This implementation of {@link ProcessListener} caches a received frames. diff --git a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/dpt/DPTTest.java b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/dpt/DPTTest.java index 8248bd17ed446..06414d20deb35 100644 --- a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/dpt/DPTTest.java +++ b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/dpt/DPTTest.java @@ -36,13 +36,13 @@ import org.openhab.core.library.unit.Units; import org.openhab.core.util.ColorUtil; -import tuwien.auto.calimero.dptxlator.DPTXlator2ByteUnsigned; -import tuwien.auto.calimero.dptxlator.DPTXlator4ByteFloat; -import tuwien.auto.calimero.dptxlator.DPTXlator4ByteSigned; -import tuwien.auto.calimero.dptxlator.DPTXlator4ByteUnsigned; -import tuwien.auto.calimero.dptxlator.DPTXlator64BitSigned; -import tuwien.auto.calimero.dptxlator.DPTXlator8BitSigned; -import tuwien.auto.calimero.dptxlator.DptXlator2ByteSigned; +import io.calimero.dptxlator.DPTXlator2ByteUnsigned; +import io.calimero.dptxlator.DPTXlator4ByteFloat; +import io.calimero.dptxlator.DPTXlator4ByteSigned; +import io.calimero.dptxlator.DPTXlator4ByteUnsigned; +import io.calimero.dptxlator.DPTXlator64BitSigned; +import io.calimero.dptxlator.DPTXlator8BitSigned; +import io.calimero.dptxlator.DptXlator2ByteSigned; /** * diff --git a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/handler/KNXBridgeBaseThingHandlerTest.java b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/handler/KNXBridgeBaseThingHandlerTest.java index 32417901835c9..eb491250487bf 100644 --- a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/handler/KNXBridgeBaseThingHandlerTest.java +++ b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/handler/KNXBridgeBaseThingHandlerTest.java @@ -25,7 +25,7 @@ import org.openhab.core.net.NetworkAddressService; import org.openhab.core.thing.Bridge; -import tuwien.auto.calimero.secure.KnxSecureException; +import io.calimero.secure.KnxSecureException; /** * diff --git a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/i18n/KNXTranslationProviderTest.java b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/i18n/KNXTranslationProviderTest.java index 5fe72447d5bb1..0543d6d920f52 100644 --- a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/i18n/KNXTranslationProviderTest.java +++ b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/i18n/KNXTranslationProviderTest.java @@ -17,8 +17,8 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.jupiter.api.Test; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.link.KNXLinkClosedException; +import io.calimero.KNXException; +import io.calimero.link.KNXLinkClosedException; /** * diff --git a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/itests/Back2BackTest.java b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/itests/Back2BackTest.java index 28c2e10350227..b0ca6ec30cd03 100644 --- a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/itests/Back2BackTest.java +++ b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/itests/Back2BackTest.java @@ -45,14 +45,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import tuwien.auto.calimero.DataUnitBuilder; -import tuwien.auto.calimero.GroupAddress; -import tuwien.auto.calimero.KNXException; -import tuwien.auto.calimero.datapoint.CommandDP; -import tuwien.auto.calimero.datapoint.Datapoint; -import tuwien.auto.calimero.dptxlator.TranslatorTypes; -import tuwien.auto.calimero.process.ProcessCommunicator; -import tuwien.auto.calimero.process.ProcessCommunicatorImpl; +import io.calimero.DataUnitBuilder; +import io.calimero.GroupAddress; +import io.calimero.KNXException; +import io.calimero.datapoint.CommandDP; +import io.calimero.datapoint.Datapoint; +import io.calimero.dptxlator.TranslatorTypes; +import io.calimero.process.ProcessCommunicator; +import io.calimero.process.ProcessCommunicatorImpl; /** * Integration test to check conversion from raw KNX frame data to OH data types and back. diff --git a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/security/KNXSecurityTest.java b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/security/KNXSecurityTest.java index 4059f468e80d1..b62f73b539d02 100644 --- a/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/security/KNXSecurityTest.java +++ b/bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/security/KNXSecurityTest.java @@ -22,12 +22,12 @@ import org.junit.jupiter.api.Test; import org.openhab.binding.knx.internal.handler.KNXBridgeBaseThingHandler; -import tuwien.auto.calimero.GroupAddress; -import tuwien.auto.calimero.IndividualAddress; -import tuwien.auto.calimero.knxnetip.SecureConnection; -import tuwien.auto.calimero.secure.Keyring; -import tuwien.auto.calimero.secure.KnxSecureException; -import tuwien.auto.calimero.secure.Security; +import io.calimero.GroupAddress; +import io.calimero.IndividualAddress; +import io.calimero.knxnetip.SecureConnection; +import io.calimero.secure.Keyring; +import io.calimero.secure.KnxSecureException; +import io.calimero.secure.Security; /** * From 1604192189f9cad4c332aadc6d9993b19edca3d7 Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Mon, 2 Dec 2024 17:18:44 +0100 Subject: [PATCH 2/2] Add sonatype repo for snapshot Signed-off-by: Holger Friedrich --- bundles/org.openhab.binding.knx/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bundles/org.openhab.binding.knx/pom.xml b/bundles/org.openhab.binding.knx/pom.xml index d7b7a0a18d918..cc0c881bb4875 100644 --- a/bundles/org.openhab.binding.knx/pom.xml +++ b/bundles/org.openhab.binding.knx/pom.xml @@ -17,6 +17,19 @@ javax.microedition.io.*;resolution:="optional",javax.usb.*;resolution:="optional",org.usb4java.*;resolution:="optional" + + + sonatype.snapshots + https://s01.oss.sonatype.org/content/repositories/snapshot + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + false + + + true + + +