[freeathome] Rename binding from freeathomesystem (openhab#16718)

* Remove 'System' from the binding name Signed-off-by: Leo Siepel <leosiepel@gmail.com> Signed-off-by: Paul Smedley <paul@smedley.id.au>
psmedley · Jun 15, 2024 · 36e1a0c · 36e1a0c
1 parent 5bf224b
commit 36e1a0c
Show file tree

Hide file tree

Showing 38 changed files with 123 additions and 125 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -114,7 +114,7 @@
 /bundles/org.openhab.binding.folderwatcher/ @goopilot
 /bundles/org.openhab.binding.folding/ @fa2k
 /bundles/org.openhab.binding.foobot/ @airboxlab @Hilbrand
-/bundles/org.openhab.binding.freeathomesystem/ @andrasU
+/bundles/org.openhab.binding.freeathome/ @andrasU
 /bundles/org.openhab.binding.freebox/ @lolodomo
 /bundles/org.openhab.binding.freeboxos/ @clinique
 /bundles/org.openhab.binding.freecurrency/ @J-N-K

diff --git a/...g.openhab.binding.freeathomesystem/NOTICE → ...les/org.openhab.binding.freeathome/NOTICE b/...g.openhab.binding.freeathomesystem/NOTICE → ...les/org.openhab.binding.freeathome/NOTICE
diff --git a/...penhab.binding.freeathomesystem/README.md → .../org.openhab.binding.freeathome/README.md b/...penhab.binding.freeathomesystem/README.md → .../org.openhab.binding.freeathome/README.md
@@ -101,7 +101,7 @@ Things are all discovered automatically and visible on the openHAB UI after push
 In order to manually configure a Thing:
 
 ```java
-Bridge freeathomesystem:bridge:mysysap [ ipAddress="...", username="...", password="..." ]
+Bridge freeathome:bridge:mysysap [ ipAddress="...", username="...", password="..." ]
 {
     Thing device    ABB700000001
     Thing device    ABB700000012
@@ -116,20 +116,20 @@ The creation of the openHAB channels to operate the free@home device is happenin
 Sample for the free@home thermostat device
 
 ```java
-Switch Livingroom_Thermostat_Switch                       "Thermostat Siwtch"               <temperature>  (Livingroom)                              { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#controller-on-off-request" }
-Switch LivingRoom_Thermostat_EcoOnOff                     "Thermostat Eco Activation"       <switch>       (Livingroom)                              { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#eco-mode-on-off-request" }
-Number LivingRoom_Thermostat_MeasuredTemperature          "Measured Temperature"            <temperature>  (Livingroom)  ["Temperature"]             { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#measured-temperature" }
-Number LivingRoom_Thermostat_SetpointTemperature          "Setpoint Temperature"            <temperature>  (Livingroom)  ["Setpoint", "Temperature"] { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#absolute-setpoint-temperature" }
-Number LivingRoom_ThermostatHeatingActive                 "Thermostat Heating Active"       <temperature>  (Livingroom)  ["Status"]                  { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#heating-active" }
-Number LivingRoom_ThermostatHeatingDemand                 "Thermostat Heating Demand"       <temperature>  (Livingroom)  ["Status"]                  { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#status-indication" }
+Switch Livingroom_Thermostat_Switch                       "Thermostat Siwtch"               <temperature>  (Livingroom)                              { channel="freeathome:device:312095ad75:ABB700000001:ch0000#controller-on-off-request" }
+Switch LivingRoom_Thermostat_EcoOnOff                     "Thermostat Eco Activation"       <switch>       (Livingroom)                              { channel="freeathome:device:312095ad75:ABB700000001:ch0000#eco-mode-on-off-request" }
+Number LivingRoom_Thermostat_MeasuredTemperature          "Measured Temperature"            <temperature>  (Livingroom)  ["Temperature"]             { channel="freeathome:device:312095ad75:ABB700000001:ch0000#measured-temperature" }
+Number LivingRoom_Thermostat_SetpointTemperature          "Setpoint Temperature"            <temperature>  (Livingroom)  ["Setpoint", "Temperature"] { channel="freeathome:device:312095ad75:ABB700000001:ch0000#absolute-setpoint-temperature" }
+Number LivingRoom_ThermostatHeatingActive                 "Thermostat Heating Active"       <temperature>  (Livingroom)  ["Status"]                  { channel="freeathome:device:312095ad75:ABB700000001:ch0000#heating-active" }
+Number LivingRoom_ThermostatHeatingDemand                 "Thermostat Heating Demand"       <temperature>  (Livingroom)  ["Status"]                  { channel="freeathome:device:312095ad75:ABB700000001:ch0000#status-indication" }
 ```
 
 Sample for the free@home device for switch
 
 ```java
-Switch Livingroom_Switch                    "Livingroom Switch"       <switch>  (Livingroom)  ["Light"]   { channel="freeathomesystem:device:312095ad75:ABB700000012:ch0000#switch-on-off" }
-Switch Livingroom_Lamp                      "Livingroom Lamp"         <switch>  (Livingroom)  ["Light"]   { channel="freeathomesystem:device:312095ad75:ABB700000012:ch0006#switch-on-off" }
-Switch Livingroom_Aux                       "Livingroom Aux Switch"   <switch>  (Livingroom)  ["Light"]   { channel="freeathomesystem:device:312095ad75:ABB700000012:ch000b#switch-on-off" }
+Switch Livingroom_Switch                    "Livingroom Switch"       <switch>  (Livingroom)  ["Light"]   { channel="freeathome:device:312095ad75:ABB700000012:ch0000#switch-on-off" }
+Switch Livingroom_Lamp                      "Livingroom Lamp"         <switch>  (Livingroom)  ["Light"]   { channel="freeathome:device:312095ad75:ABB700000012:ch0006#switch-on-off" }
+Switch Livingroom_Aux                       "Livingroom Aux Switch"   <switch>  (Livingroom)  ["Light"]   { channel="freeathome:device:312095ad75:ABB700000012:ch000b#switch-on-off" }
 ```
 
 # Communities

diff --git a/....openhab.binding.freeathomesystem/pom.xml → ...es/org.openhab.binding.freeathome/pom.xml b/....openhab.binding.freeathomesystem/pom.xml → ...es/org.openhab.binding.freeathome/pom.xml
@@ -10,8 +10,8 @@
     <version>4.2.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.openhab.binding.freeathomesystem</artifactId>
+  <artifactId>org.openhab.binding.freeathome</artifactId>
 
-  <name>openHAB Add-ons :: Bundles :: FreeAtHomeSystem Binding</name>
+  <name>openHAB Add-ons :: Bundles :: FreeAtHome Binding</name>
 
 </project>
diff --git a/bundles/org.openhab.binding.freeathome/src/main/feature/feature.xml b/bundles/org.openhab.binding.freeathome/src/main/feature/feature.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="org.openhab.binding.freeathome-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
+
+	<feature name="openhab-binding-freeathome" description="FreeAtHome Binding" version="${project.version}">
+		<feature>openhab-runtime-base</feature>
+		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.freeathome/${project.version}</bundle>
+	</feature>
+</features>
diff --git a/...nal/FreeAtHomeSystemBindingConstants.java → .../internal/FreeAtHomeBindingConstants.java b/...nal/FreeAtHomeSystemBindingConstants.java → .../internal/FreeAtHomeBindingConstants.java
@@ -10,25 +10,25 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.freeathomesystem.internal;
+package org.openhab.binding.freeathome.internal;
 
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.thing.ThingTypeUID;
 
 /**
- * The {@link FreeAtHomeSystemBindingConstants} class defines common constants, which are
+ * The {@link FreeAtHomeBindingConstants} class defines common constants, which are
  * used across the whole binding.
  *
  * @author Andras Uhrin - Initial contribution
  */
 @NonNullByDefault
-public class FreeAtHomeSystemBindingConstants {
+public class FreeAtHomeBindingConstants {
 
     public static final String CONFIG_DESCRIPTION_URI_THING_PREFIX = "thing-type";
 
-    public static final String BINDING_ID = "freeathomesystem";
+    public static final String BINDING_ID = "freeathome";
 
     // List of all Thing Type UIDs
     public static final String BRIDGE_TYPE_ID = "gateway";

diff --git a/...nal/FreeAtHomeSystemDiscoveryService.java → .../internal/FreeAtHomeDiscoveryService.java b/...nal/FreeAtHomeSystemDiscoveryService.java → .../internal/FreeAtHomeDiscoveryService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.freeathomesystem.internal;
+package org.openhab.binding.freeathome.internal;
 
 import java.time.Instant;
 import java.util.HashMap;
@@ -22,9 +22,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.freeathomesystem.internal.datamodel.FreeAtHomeDeviceDescription;
-import org.openhab.binding.freeathomesystem.internal.handler.FreeAtHomeBridgeHandler;
-import org.openhab.binding.freeathomesystem.internal.util.FreeAtHomeHttpCommunicationException;
+import org.openhab.binding.freeathome.internal.datamodel.FreeAtHomeDeviceDescription;
+import org.openhab.binding.freeathome.internal.handler.FreeAtHomeBridgeHandler;
+import org.openhab.binding.freeathome.internal.util.FreeAtHomeHttpCommunicationException;
 import org.openhab.core.config.discovery.AbstractThingHandlerDiscoveryService;
 import org.openhab.core.config.discovery.DiscoveryResult;
 import org.openhab.core.config.discovery.DiscoveryResultBuilder;
@@ -34,14 +34,14 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link FreeAtHomeSystemDiscoveryService} is responsible for performing discovery of things
+ * The {@link FreeAtHomeDiscoveryService} is responsible for performing discovery of things
  *
  * @author Andras Uhrin - Initial contribution
  */
 @NonNullByDefault
-public class FreeAtHomeSystemDiscoveryService extends AbstractThingHandlerDiscoveryService<FreeAtHomeBridgeHandler> {
+public class FreeAtHomeDiscoveryService extends AbstractThingHandlerDiscoveryService<FreeAtHomeBridgeHandler> {
 
-    private final Logger logger = LoggerFactory.getLogger(FreeAtHomeSystemDiscoveryService.class);
+    private final Logger logger = LoggerFactory.getLogger(FreeAtHomeDiscoveryService.class);
     private @Nullable ScheduledFuture<?> backgroundDiscoveryJob = null;
 
     private static final long BACKGROUND_DISCOVERY_DELAY = 1L;
@@ -60,8 +60,7 @@ public void run() {
                 for (int i = 0; (i < deviceList.size()) && !isScanTerminated; i++) {
                     FreeAtHomeDeviceDescription device = thingHandler.getFreeatHomeDeviceDescription(deviceList.get(i));
 
-                    ThingUID uid = new ThingUID(FreeAtHomeSystemBindingConstants.DEVICE_TYPE_UID, bridgeUID,
-                            device.deviceId);
+                    ThingUID uid = new ThingUID(FreeAtHomeBindingConstants.DEVICE_TYPE_UID, bridgeUID, device.deviceId);
                     Map<String, Object> properties = new HashMap<>(1);
                     properties.put("deviceId", device.deviceId);
                     properties.put("interface", device.interfaceType);
@@ -88,18 +87,17 @@ public void run() {
         }
     };
 
-    public FreeAtHomeSystemDiscoveryService(int timeout) {
-        super(FreeAtHomeBridgeHandler.class, FreeAtHomeSystemBindingConstants.SUPPORTED_THING_TYPES_UIDS, timeout,
-                false);
+    public FreeAtHomeDiscoveryService(int timeout) {
+        super(FreeAtHomeBridgeHandler.class, FreeAtHomeBindingConstants.SUPPORTED_THING_TYPES_UIDS, timeout, false);
     }
 
-    public FreeAtHomeSystemDiscoveryService() {
+    public FreeAtHomeDiscoveryService() {
         this(90);
     }
 
     @Override
     public Set<ThingTypeUID> getSupportedThingTypes() {
-        return Set.of(FreeAtHomeSystemBindingConstants.BRIDGE_TYPE_UID);
+        return Set.of(FreeAtHomeBindingConstants.BRIDGE_TYPE_UID);
     }
 
     @Override

diff --git a/...ernal/FreeAtHomeSystemHandlerFactory.java → ...em/internal/FreeAtHomeHandlerFactory.java b/...ernal/FreeAtHomeSystemHandlerFactory.java → ...em/internal/FreeAtHomeHandlerFactory.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.freeathomesystem.internal;
+package org.openhab.binding.freeathome.internal;
 
-import static org.openhab.binding.freeathomesystem.internal.FreeAtHomeSystemBindingConstants.*;
+import static org.openhab.binding.freeathome.internal.FreeAtHomeBindingConstants.*;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jetty.client.HttpClient;
-import org.openhab.binding.freeathomesystem.internal.handler.FreeAtHomeBridgeHandler;
-import org.openhab.binding.freeathomesystem.internal.handler.FreeAtHomeDeviceHandler;
-import org.openhab.binding.freeathomesystem.internal.type.FreeAtHomeChannelTypeProvider;
-import org.openhab.binding.freeathomesystem.internal.type.FreeAtHomeThingTypeProvider;
+import org.openhab.binding.freeathome.internal.handler.FreeAtHomeBridgeHandler;
+import org.openhab.binding.freeathome.internal.handler.FreeAtHomeDeviceHandler;
+import org.openhab.binding.freeathome.internal.type.FreeAtHomeChannelTypeProvider;
+import org.openhab.binding.freeathome.internal.type.FreeAtHomeThingTypeProvider;
 import org.openhab.core.i18n.LocaleProvider;
 import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.io.net.http.HttpClientFactory;
@@ -39,24 +39,24 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link FreeAtHomeSystemHandlerFactory} is responsible for creating things and thing
+ * The {@link FreeAtHomeHandlerFactory} is responsible for creating things and thing
  * handlers.
  *
  * @author Andras Uhrin - Initial contribution
  */
 @NonNullByDefault
-@Component(configurationPid = "binding.freeathomesystem", service = ThingHandlerFactory.class)
-public class FreeAtHomeSystemHandlerFactory extends BaseThingHandlerFactory {
+@Component(configurationPid = "binding.freeathome", service = ThingHandlerFactory.class)
+public class FreeAtHomeHandlerFactory extends BaseThingHandlerFactory {
 
-    private final Logger logger = LoggerFactory.getLogger(FreeAtHomeSystemHandlerFactory.class);
+    private final Logger logger = LoggerFactory.getLogger(FreeAtHomeHandlerFactory.class);
 
     private final HttpClient httpClient;
     private final FreeAtHomeChannelTypeProvider channelTypeProvider;
     private final TranslationProvider i18nProvider;
     private final LocaleProvider localeProvider;
 
     @Activate
-    public FreeAtHomeSystemHandlerFactory(@Reference FreeAtHomeThingTypeProvider thingTypeProvider,
+    public FreeAtHomeHandlerFactory(@Reference FreeAtHomeThingTypeProvider thingTypeProvider,
             @Reference FreeAtHomeChannelTypeProvider channelTypeProvider, @Reference TranslationProvider i18nProvider,
             @Reference LocaleProvider localeProvider, @Reference HttpClientFactory httpClientFactory,
             ComponentContext componentContext) {
@@ -66,7 +66,7 @@ public FreeAtHomeSystemHandlerFactory(@Reference FreeAtHomeThingTypeProvider thi
         this.localeProvider = localeProvider;
 
         // create httpClient
-        httpClient = httpClientFactory.createHttpClient(FreeAtHomeSystemBindingConstants.BINDING_ID);
+        httpClient = httpClientFactory.createHttpClient(FreeAtHomeBindingConstants.BINDING_ID);
 
         // Configure client
         httpClient.setFollowRedirects(false);

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

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

diff --git a/...ternal/datamodel/FreeAtHomeDatapoint.java → ...ternal/datamodel/FreeAtHomeDatapoint.java b/...ternal/datamodel/FreeAtHomeDatapoint.java → ...ternal/datamodel/FreeAtHomeDatapoint.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.freeathomesystem.internal.datamodel;
+package org.openhab.binding.freeathome.internal.datamodel;
 
 import java.util.Iterator;
 import java.util.Set;

diff --git a/...l/datamodel/FreeAtHomeDatapointGroup.java → ...l/datamodel/FreeAtHomeDatapointGroup.java b/...l/datamodel/FreeAtHomeDatapointGroup.java → ...l/datamodel/FreeAtHomeDatapointGroup.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.freeathomesystem.internal.datamodel;
+package org.openhab.binding.freeathome.internal.datamodel;
 
-import static org.openhab.binding.freeathomesystem.internal.datamodel.FreeAtHomeDatapoint.*;
+import static org.openhab.binding.freeathome.internal.datamodel.FreeAtHomeDatapoint.*;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.freeathomesystem.internal.util.FreeAtHomeGeneralException;
-import org.openhab.binding.freeathomesystem.internal.util.PidTranslationUtils;
-import org.openhab.binding.freeathomesystem.internal.valuestateconverter.BooleanValueStateConverter;
-import org.openhab.binding.freeathomesystem.internal.valuestateconverter.DecimalValueStateConverter;
-import org.openhab.binding.freeathomesystem.internal.valuestateconverter.ShuttercontrolValueStateConverter;
-import org.openhab.binding.freeathomesystem.internal.valuestateconverter.ValueStateConverter;
+import org.openhab.binding.freeathome.internal.util.FreeAtHomeGeneralException;
+import org.openhab.binding.freeathome.internal.util.PidTranslationUtils;
+import org.openhab.binding.freeathome.internal.valuestateconverter.BooleanValueStateConverter;
+import org.openhab.binding.freeathome.internal.valuestateconverter.DecimalValueStateConverter;
+import org.openhab.binding.freeathome.internal.valuestateconverter.ShuttercontrolValueStateConverter;
+import org.openhab.binding.freeathome.internal.valuestateconverter.ValueStateConverter;
 import org.openhab.core.library.CoreItemFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...al/datamodel/FreeAtHomeDeviceChannel.java → ...al/datamodel/FreeAtHomeDeviceChannel.java b/...al/datamodel/FreeAtHomeDeviceChannel.java → ...al/datamodel/FreeAtHomeDeviceChannel.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.freeathomesystem.internal.datamodel;
+package org.openhab.binding.freeathome.internal.datamodel;
 
-import static org.openhab.binding.freeathomesystem.internal.datamodel.FreeAtHomeDatapoint.*;
-import static org.openhab.binding.freeathomesystem.internal.util.FidTranslationUtils.*;
+import static org.openhab.binding.freeathome.internal.datamodel.FreeAtHomeDatapoint.*;
+import static org.openhab.binding.freeathome.internal.util.FidTranslationUtils.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.binding.freeathomesystem.internal.util.FidTranslationUtils;
-import org.openhab.binding.freeathomesystem.internal.util.FreeAtHomeGeneralException;
+import org.openhab.binding.freeathome.internal.util.FidTranslationUtils;
+import org.openhab.binding.freeathome.internal.util.FreeAtHomeGeneralException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...atamodel/FreeAtHomeDeviceDescription.java → ...atamodel/FreeAtHomeDeviceDescription.java b/...atamodel/FreeAtHomeDeviceDescription.java → ...atamodel/FreeAtHomeDeviceDescription.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.freeathomesystem.internal.datamodel;
+package org.openhab.binding.freeathome.internal.datamodel;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...rnal/handler/FreeAtHomeBridgeHandler.java → ...rnal/handler/FreeAtHomeBridgeHandler.java b/...rnal/handler/FreeAtHomeBridgeHandler.java → ...rnal/handler/FreeAtHomeBridgeHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.freeathomesystem.internal.handler;
+package org.openhab.binding.freeathome.internal.handler;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -50,10 +50,10 @@
 import org.eclipse.jetty.websocket.api.WebSocketListener;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
-import org.openhab.binding.freeathomesystem.internal.FreeAtHomeSystemDiscoveryService;
-import org.openhab.binding.freeathomesystem.internal.configuration.FreeAtHomeBridgeHandlerConfiguration;
-import org.openhab.binding.freeathomesystem.internal.datamodel.FreeAtHomeDeviceDescription;
-import org.openhab.binding.freeathomesystem.internal.util.FreeAtHomeHttpCommunicationException;
+import org.openhab.binding.freeathome.internal.FreeAtHomeDiscoveryService;
+import org.openhab.binding.freeathome.internal.configuration.FreeAtHomeBridgeHandlerConfiguration;
+import org.openhab.binding.freeathome.internal.datamodel.FreeAtHomeDeviceDescription;
+import org.openhab.binding.freeathome.internal.util.FreeAtHomeHttpCommunicationException;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.ChannelUID;
 import org.openhab.core.thing.ThingStatus;
@@ -128,7 +128,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
 
     @Override
     public Collection<Class<? extends ThingHandlerService>> getServices() {
-        return List.of(FreeAtHomeSystemDiscoveryService.class);
+        return List.of(FreeAtHomeDiscoveryService.class);
     }
 
     /**