[knx] Made constants and handler packages internal (openhab#4048)

* [knx] Made constants and handler packages internal Also-by: Wouter Born <[email protected]> Signed-off-by: VelinYordanov <[email protected]> Signed-off-by: Maximilian Hess <[email protected]>
ne0h · Sep 15, 2019 · 1b3d25b · 1b3d25b
1 parent e35847f
commit 1b3d25b
Show file tree

Hide file tree

Showing 39 changed files with 46 additions and 69 deletions.
diff --git a/addons/binding/org.openhab.binding.knx.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.knx.test/META-INF/MANIFEST.MF
@@ -6,12 +6,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.binding.knx.test;singleton:=true
 Bundle-Vendor: openHAB
 Bundle-Version: 2.5.0.qualifier
-Export-Package: 
- org.openhab.binding.knx;uses:="org.eclipse.smarthome.test"
 Fragment-Host: org.openhab.binding.knx
 Import-Package: 
- org.openhab.binding.knx,
- org.openhab.binding.knx.handler,
  org.eclipse.jdt.annotation;resolution:=optional,
  org.eclipse.smarthome.core.common.registry,
  org.eclipse.smarthome.core.events,

diff --git a/addons/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.knx/META-INF/MANIFEST.MF
@@ -23,16 +23,11 @@ Import-Package: gnu.io;resolution:=optional,
  org.eclipse.smarthome.core.thing.type,
  org.eclipse.smarthome.core.thing.util,
  org.eclipse.smarthome.core.types,
- org.openhab.binding.knx,
- org.openhab.binding.knx.handler,
  org.osgi.framework,
  org.osgi.framework.wiring,
  org.osgi.service.cm,
  org.slf4j
 Service-Component: OSGI-INF/*.xml
-Export-Package: org.openhab.binding.knx,
- org.openhab.binding.knx.client,
- org.openhab.binding.knx.handler
 Bundle-ClassPath: lib/calimero-core-2.4-e9975c01.jar,
  lib/calimero-device-2.4-a03cd243.jar,
  lib/calimero-rxtx-2.4-883497d1.jar,

diff --git a/...nhab/binding/knx/KNXBindingConstants.java → ...ing/knx/internal/KNXBindingConstants.java b/...nhab/binding/knx/KNXBindingConstants.java → ...ing/knx/internal/KNXBindingConstants.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.knx;
+package org.openhab.binding.knx.internal;
 
 import static java.util.stream.Collectors.toSet;
 

diff --git a/...rg/openhab/binding/knx/KNXTypeMapper.java → ...b/binding/knx/internal/KNXTypeMapper.java b/...rg/openhab/binding/knx/KNXTypeMapper.java → ...b/binding/knx/internal/KNXTypeMapper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.knx;
+package org.openhab.binding.knx.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/...nhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/AbstractSpec.java b/...nhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/AbstractSpec.java
@@ -14,8 +14,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.knx.client.InboundSpec;
-import org.openhab.binding.knx.client.OutboundSpec;
+import org.openhab.binding.knx.internal.client.InboundSpec;
+import org.openhab.binding.knx.internal.client.OutboundSpec;
 
 import tuwien.auto.calimero.GroupAddress;
 import tuwien.auto.calimero.KNXFormatException;

diff --git a/...ab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/KNXChannelType.java b/...ab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/KNXChannelType.java
@@ -28,9 +28,9 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.smarthome.config.core.Configuration;
 import org.eclipse.smarthome.core.types.Type;
-import org.openhab.binding.knx.KNXTypeMapper;
-import org.openhab.binding.knx.client.InboundSpec;
-import org.openhab.binding.knx.client.OutboundSpec;
+import org.openhab.binding.knx.internal.KNXTypeMapper;
+import org.openhab.binding.knx.internal.client.InboundSpec;
+import org.openhab.binding.knx.internal.client.OutboundSpec;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...ab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ListenSpecImpl.java b/...ab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ListenSpecImpl.java
@@ -18,7 +18,7 @@
 import java.util.List;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.knx.client.InboundSpec;
+import org.openhab.binding.knx.internal.client.InboundSpec;
 
 import tuwien.auto.calimero.GroupAddress;
 

diff --git a/...nding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadRequestSpecImpl.java b/...nding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadRequestSpecImpl.java
@@ -19,7 +19,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.knx.client.InboundSpec;
+import org.openhab.binding.knx.internal.client.InboundSpec;
 
 import tuwien.auto.calimero.GroupAddress;
 

diff --git a/...ding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadResponseSpecImpl.java b/...ding.knx/src/main/java/org/openhab/binding/knx/internal/channel/ReadResponseSpecImpl.java
@@ -15,7 +15,7 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.smarthome.core.types.Type;
-import org.openhab.binding.knx.client.OutboundSpec;
+import org.openhab.binding.knx.internal.client.OutboundSpec;
 
 import tuwien.auto.calimero.GroupAddress;
 

diff --git a/...openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeColor.java b/...openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeColor.java
@@ -13,7 +13,7 @@
 package org.openhab.binding.knx.internal.channel;
 
 import static java.util.stream.Collectors.toSet;
-import static org.openhab.binding.knx.KNXBindingConstants.*;
+import static org.openhab.binding.knx.internal.KNXBindingConstants.*;
 
 import java.util.Set;
 import java.util.stream.Stream;

diff --git a/...enhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeContact.java b/...enhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeContact.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.knx.internal.channel;
 
-import static org.openhab.binding.knx.KNXBindingConstants.*;
+import static org.openhab.binding.knx.internal.KNXBindingConstants.*;
 
 import java.util.Collections;
 import java.util.Set;

diff --git a/...nhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDateTime.java b/...nhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDateTime.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.knx.internal.channel;
 
-import static org.openhab.binding.knx.KNXBindingConstants.*;
+import static org.openhab.binding.knx.internal.KNXBindingConstants.*;
 
 import java.util.Collections;
 import java.util.Set;

diff --git a/...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDimmer.java b/...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeDimmer.java
@@ -13,7 +13,7 @@
 package org.openhab.binding.knx.internal.channel;
 
 import static java.util.stream.Collectors.toSet;
-import static org.openhab.binding.knx.KNXBindingConstants.*;
+import static org.openhab.binding.knx.internal.KNXBindingConstants.*;
 
 import java.util.Objects;
 import java.util.Set;

diff --git a/...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeNumber.java b/...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeNumber.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.knx.internal.channel;
 
-import static org.openhab.binding.knx.KNXBindingConstants.*;
+import static org.openhab.binding.knx.internal.KNXBindingConstants.*;
 
 import java.util.Collections;
 import java.util.Set;

diff --git a/...binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeRollershutter.java b/...binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeRollershutter.java
@@ -13,7 +13,7 @@
 package org.openhab.binding.knx.internal.channel;
 
 import static java.util.stream.Collectors.toSet;
-import static org.openhab.binding.knx.KNXBindingConstants.*;
+import static org.openhab.binding.knx.internal.KNXBindingConstants.*;
 
 import java.util.Objects;
 import java.util.Set;

diff --git a/...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeString.java b/...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeString.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.knx.internal.channel;
 
-import static org.openhab.binding.knx.KNXBindingConstants.*;
+import static org.openhab.binding.knx.internal.KNXBindingConstants.*;
 
 import java.util.Collections;
 import java.util.Set;

diff --git a/...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeSwitch.java b/...penhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/TypeSwitch.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.knx.internal.channel;
 
-import static org.openhab.binding.knx.KNXBindingConstants.*;
+import static org.openhab.binding.knx.internal.KNXBindingConstants.*;
 
 import java.util.Collections;
 import java.util.Set;

diff --git a/...hab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/WriteSpecImpl.java b/...hab.binding.knx/src/main/java/org/openhab/binding/knx/internal/channel/WriteSpecImpl.java
@@ -14,7 +14,7 @@
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.smarthome.core.types.Type;
-import org.openhab.binding.knx.client.OutboundSpec;
+import org.openhab.binding.knx.internal.client.OutboundSpec;
 
 import tuwien.auto.calimero.GroupAddress;
 import tuwien.auto.calimero.KNXFormatException;

diff --git a/....binding.knx/src/main/java/org/openhab/binding/knx/internal/client/AbstractKNXClient.java b/....binding.knx/src/main/java/org/openhab/binding/knx/internal/client/AbstractKNXClient.java
@@ -26,13 +26,9 @@
 import org.eclipse.smarthome.core.thing.ThingStatusDetail;
 import org.eclipse.smarthome.core.thing.ThingUID;
 import org.eclipse.smarthome.core.types.Type;
-import org.openhab.binding.knx.KNXTypeMapper;
-import org.openhab.binding.knx.client.DeviceInfoClient;
-import org.openhab.binding.knx.client.KNXClient;
-import org.openhab.binding.knx.client.OutboundSpec;
-import org.openhab.binding.knx.client.StatusUpdateCallback;
-import org.openhab.binding.knx.handler.GroupAddressListener;
+import org.openhab.binding.knx.internal.KNXTypeMapper;
 import org.openhab.binding.knx.internal.dpt.KNXCoreTypeMapper;
+import org.openhab.binding.knx.internal.handler.GroupAddressListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/.../binding/knx/client/DeviceInfoClient.java → ...knx/internal/client/DeviceInfoClient.java b/.../binding/knx/client/DeviceInfoClient.java → ...knx/internal/client/DeviceInfoClient.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.knx.client;
+package org.openhab.binding.knx.internal.client;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/...nding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClientImpl.java b/...nding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInfoClientImpl.java
@@ -18,7 +18,6 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.knx.client.DeviceInfoClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...ab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInspector.java b/...ab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/DeviceInspector.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.knx.internal.client;
 
-import static org.openhab.binding.knx.KNXBindingConstants.*;
+import static org.openhab.binding.knx.internal.KNXBindingConstants.*;
 import static org.openhab.binding.knx.internal.handler.DeviceConstants.*;
 
 import java.util.Collections;
@@ -22,7 +22,6 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.knx.client.DeviceInfoClient;
 import org.openhab.binding.knx.internal.handler.Firmware;
 import org.openhab.binding.knx.internal.handler.Manufacturer;
 import org.slf4j.Logger;

diff --git a/...g.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/IPClient.java b/...g.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/IPClient.java
@@ -22,7 +22,6 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.smarthome.core.thing.ThingUID;
-import org.openhab.binding.knx.client.StatusUpdateCallback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...enhab/binding/knx/client/InboundSpec.java → ...ding/knx/internal/client/InboundSpec.java b/...enhab/binding/knx/client/InboundSpec.java → ...ding/knx/internal/client/InboundSpec.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.knx.client;
+package org.openhab.binding.knx.internal.client;
 
 import java.util.List;
 

diff --git a/...openhab/binding/knx/client/KNXClient.java → ...inding/knx/internal/client/KNXClient.java b/...openhab/binding/knx/client/KNXClient.java → ...inding/knx/internal/client/KNXClient.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.knx.client;
+package org.openhab.binding.knx.internal.client;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.knx.handler.GroupAddressListener;
+import org.openhab.binding.knx.internal.handler.GroupAddressListener;
 
 import tuwien.auto.calimero.IndividualAddress;
 import tuwien.auto.calimero.KNXException;

diff --git a/...openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/NoOpClient.java b/...openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/NoOpClient.java
@@ -14,10 +14,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.knx.client.DeviceInfoClient;
-import org.openhab.binding.knx.client.KNXClient;
-import org.openhab.binding.knx.client.OutboundSpec;
-import org.openhab.binding.knx.handler.GroupAddressListener;
+import org.openhab.binding.knx.internal.handler.GroupAddressListener;
 
 import tuwien.auto.calimero.IndividualAddress;
 import tuwien.auto.calimero.KNXException;

diff --git a/...nhab/binding/knx/client/OutboundSpec.java → ...ing/knx/internal/client/OutboundSpec.java b/...nhab/binding/knx/client/OutboundSpec.java → ...ing/knx/internal/client/OutboundSpec.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.knx.client;
+package org.openhab.binding.knx.internal.client;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/...enhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialClient.java b/...enhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/client/SerialClient.java
@@ -17,7 +17,6 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.smarthome.core.thing.ThingUID;
-import org.openhab.binding.knx.client.StatusUpdateCallback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...ding/knx/client/StatusUpdateCallback.java → ...internal/client/StatusUpdateCallback.java b/...ding/knx/client/StatusUpdateCallback.java → ...internal/client/StatusUpdateCallback.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.knx.client;
+package org.openhab.binding.knx.internal.client;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.smarthome.core.thing.ThingStatus;

diff --git a/...inding.knx/src/main/java/org/openhab/binding/knx/internal/config/BridgeConfiguration.java b/...inding.knx/src/main/java/org/openhab/binding/knx/internal/config/BridgeConfiguration.java
@@ -14,7 +14,7 @@
 
 import java.math.BigDecimal;
 
-import org.openhab.binding.knx.handler.KNXBridgeBaseThingHandler;
+import org.openhab.binding.knx.internal.handler.KNXBridgeBaseThingHandler;
 
 /**
  * {@link KNXBridgeBaseThingHandler} configuration

diff --git a/...hab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/KNXCoreTypeMapper.java b/...hab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/KNXCoreTypeMapper.java
@@ -37,7 +37,7 @@
 import org.eclipse.smarthome.core.library.types.UpDownType;
 import org.eclipse.smarthome.core.types.Type;
 import org.eclipse.smarthome.core.types.UnDefType;
-import org.openhab.binding.knx.KNXTypeMapper;
+import org.openhab.binding.knx.internal.KNXTypeMapper;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...binding.knx/src/main/java/org/openhab/binding/knx/internal/factory/KNXHandlerFactory.java b/...binding.knx/src/main/java/org/openhab/binding/knx/internal/factory/KNXHandlerFactory.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.knx.internal.factory;
 
-import static org.openhab.binding.knx.KNXBindingConstants.*;
+import static org.openhab.binding.knx.internal.KNXBindingConstants.*;
 
 import java.util.Arrays;
 import java.util.Collection;

diff --git a/.../knx/handler/AbstractKNXThingHandler.java → ...rnal/handler/AbstractKNXThingHandler.java b/.../knx/handler/AbstractKNXThingHandler.java → ...rnal/handler/AbstractKNXThingHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.knx.handler;
+package org.openhab.binding.knx.internal.handler;
 
 import java.util.Map;
 import java.util.Random;
@@ -28,8 +28,8 @@
 import org.eclipse.smarthome.core.thing.ThingStatusDetail;
 import org.eclipse.smarthome.core.thing.ThingStatusInfo;
 import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.openhab.binding.knx.client.KNXClient;
 import org.openhab.binding.knx.internal.client.DeviceInspector;
+import org.openhab.binding.knx.internal.client.KNXClient;
 import org.openhab.binding.knx.internal.client.DeviceInspector.Result;
 import org.openhab.binding.knx.internal.config.DeviceConfig;
 import org.slf4j.Logger;

diff --git a/...inding.knx/src/main/java/org/openhab/binding/knx/internal/handler/DeviceThingHandler.java b/...inding.knx/src/main/java/org/openhab/binding/knx/internal/handler/DeviceThingHandler.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.knx.internal.handler;
 
-import static org.openhab.binding.knx.KNXBindingConstants.*;
+import static org.openhab.binding.knx.internal.KNXBindingConstants.*;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -38,14 +38,13 @@
 import org.eclipse.smarthome.core.types.State;
 import org.eclipse.smarthome.core.types.Type;
 import org.eclipse.smarthome.core.types.UnDefType;
-import org.openhab.binding.knx.KNXBindingConstants;
-import org.openhab.binding.knx.KNXTypeMapper;
-import org.openhab.binding.knx.client.InboundSpec;
-import org.openhab.binding.knx.client.OutboundSpec;
-import org.openhab.binding.knx.handler.AbstractKNXThingHandler;
+import org.openhab.binding.knx.internal.KNXBindingConstants;
+import org.openhab.binding.knx.internal.KNXTypeMapper;
 import org.openhab.binding.knx.internal.channel.KNXChannelType;
 import org.openhab.binding.knx.internal.channel.KNXChannelTypes;
 import org.openhab.binding.knx.internal.client.AbstractKNXClient;
+import org.openhab.binding.knx.internal.client.InboundSpec;
+import org.openhab.binding.knx.internal.client.OutboundSpec;
 import org.openhab.binding.knx.internal.config.DeviceConfig;
 import org.openhab.binding.knx.internal.dpt.KNXCoreTypeMapper;
 import org.slf4j.Logger;

diff --git a/...ing/knx/handler/GroupAddressListener.java → ...nternal/handler/GroupAddressListener.java b/...ing/knx/handler/GroupAddressListener.java → ...nternal/handler/GroupAddressListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.knx.handler;
+package org.openhab.binding.knx.internal.handler;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.knx.internal.client.BusMessageListener;

diff --git a/...ding.knx/src/main/java/org/openhab/binding/knx/internal/handler/IPBridgeThingHandler.java b/...ding.knx/src/main/java/org/openhab/binding/knx/internal/handler/IPBridgeThingHandler.java
@@ -21,11 +21,10 @@
 import org.eclipse.smarthome.core.thing.Bridge;
 import org.eclipse.smarthome.core.thing.ThingStatus;
 import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.openhab.binding.knx.KNXBindingConstants;
-import org.openhab.binding.knx.client.KNXClient;
-import org.openhab.binding.knx.handler.KNXBridgeBaseThingHandler;
+import org.openhab.binding.knx.internal.KNXBindingConstants;
 import org.openhab.binding.knx.internal.client.CustomKNXNetworkLinkIP;
 import org.openhab.binding.knx.internal.client.IPClient;
+import org.openhab.binding.knx.internal.client.KNXClient;
 import org.openhab.binding.knx.internal.client.NoOpClient;
 import org.openhab.binding.knx.internal.config.IPBridgeConfiguration;