Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[knx] Upgrade to Calimero 3.0 #18256

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[knx] Upgrade to Calimero 3.0 #18256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20ef084
[knx] Perpare for Calimero 3.0
holgerfriedrich Oct 11, 2024
1604192
Add sonatype repo for snapshot
holgerfriedrich Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions bundles/org.openhab.binding.knx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@
<properties>
<bnd.importpackage>javax.microedition.io.*;resolution:="optional",javax.usb.*;resolution:="optional",org.usb4java.*;resolution:="optional"</bnd.importpackage>
</properties>
<repositories>
<repository>
<id>sonatype.snapshots</id>
<name>https://s01.oss.sonatype.org/content/repositories/snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<dependencies>
<dependency>
Expand All @@ -26,9 +39,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.calimero</groupId>
<groupId>io.calimero</groupId>
<artifactId>calimero-core</artifactId>
<version>2.6-rc1</version>
<version>3.0-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand All @@ -38,9 +51,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.github.calimero</groupId>
<groupId>io.calimero</groupId>
<artifactId>calimero-device</artifactId>
<version>2.6-rc1</version>
<version>3.0-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -70,10 +83,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])
]]>
</bnd>
</configuration>
Expand All @@ -96,7 +109,6 @@ SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[tuwien.auto.calimero.
<version>0.8.12</version>
<configuration>
<excludes>
<exclude>tuwien/auto/calimero/**/*</exclude>
<exclude>io/calimero/**/*</exclude>
</excludes>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions ...knx/src/main/java/org/openhab/binding/knx/internal/channel/GroupAddressConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/KNXChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...ab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ListenSpecImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...nding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadRequestSpecImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...ding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadResponseSpecImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ...openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...enhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeContact.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...nhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDateTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDimmer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeRollershutter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeSwitch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...hab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/WriteSpecImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
56 changes: 28 additions & 28 deletions ....binding.knx/src/main/java/org/openhab/binding/knx/internal/client/AbstractKNXClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...binding.knx/src/main/java/org/openhab/binding/knx/internal/client/BusMessageListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions ...ing.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomKNXNetworkLinkIP.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions ...knx/src/main/java/org/openhab/binding/knx/internal/client/CustomManagementClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions ...src/main/java/org/openhab/binding/knx/internal/client/CustomManagementProceduresImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 6 additions & 6 deletions ...ing.knx/src/main/java/org/openhab/binding/knx/internal/client/CustomSecureManagement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...b.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions ...nding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
14 changes: 7 additions & 7 deletions ...ab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInspector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
Expand Down
Loading