From f9d9dc2c8eba2ffa523fb10c20fc5320b572411a Mon Sep 17 00:00:00 2001 From: lsiepel Date: Sun, 5 May 2024 22:50:06 +0200 Subject: [PATCH] [freeathome] Rename binding from freeathomesystem (#16718) * Remove 'System' from the binding name Signed-off-by: Leo Siepel --- CODEOWNERS | 2 +- .../NOTICE | 0 .../README.md | 20 ++++++------ .../pom.xml | 4 +-- .../src/main/feature/feature.xml | 9 ++++++ .../internal/FreeAtHomeBindingConstants.java} | 8 ++--- .../internal/FreeAtHomeDiscoveryService.java} | 26 +++++++-------- .../internal/FreeAtHomeHandlerFactory.java} | 24 +++++++------- .../FreeAtHomeBridgeHandlerConfiguration.java | 2 +- .../FreeAtHomeDeviceHandlerConfiguration.java | 2 +- .../datamodel/FreeAtHomeDatapoint.java | 2 +- .../datamodel/FreeAtHomeDatapointGroup.java | 16 +++++----- .../datamodel/FreeAtHomeDeviceChannel.java | 10 +++--- .../FreeAtHomeDeviceDescription.java | 2 +- .../handler/FreeAtHomeBridgeHandler.java | 12 +++---- .../handler/FreeAtHomeDeviceHandler.java | 24 +++++++------- .../FreeAtHomeDeviceStateListener.java | 2 +- .../type/FreeAtHomeChannelTypeProvider.java | 2 +- .../FreeAtHomeChannelTypeProviderImpl.java | 2 +- .../type/FreeAtHomeThingTypeProvider.java | 2 +- .../type/FreeAtHomeThingTypeProviderImpl.java | 2 +- .../internal/util/FidTranslationUtils.java | 2 +- .../util/FreeAtHomeGeneralException.java | 2 +- .../FreeAtHomeHttpCommunicationException.java | 2 +- .../internal/util/PIdContainerClass.java | 2 +- .../internal/util/PidTranslationUtils.java | 2 +- .../internal/util/UidUtils.java | 4 +-- .../BinaryValueStateConverter.java | 2 +- .../BooleanValueStateConverter.java | 2 +- .../DecimalValueStateConverter.java | 2 +- .../ShuttercontrolValueStateConverter.java | 2 +- .../ValueStateConverter.java | 2 +- .../src/main/resources/OH-INF/addon/addon.xml | 4 +-- .../OH-INF/i18n/freeathomesystem.properties | 32 +++++++++---------- .../resources/OH-INF/thing/bridge-type.xml | 2 +- .../resources/OH-INF/thing/thing-type.xml | 2 +- .../src/main/feature/feature.xml | 9 ------ bundles/pom.xml | 2 +- 38 files changed, 123 insertions(+), 125 deletions(-) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/NOTICE (100%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/README.md (83%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/pom.xml (78%) create mode 100644 bundles/org.openhab.binding.freeathome/src/main/feature/feature.xml rename bundles/{org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemBindingConstants.java => org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeBindingConstants.java} (82%) rename bundles/{org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemDiscoveryService.java => org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeDiscoveryService.java} (78%) rename bundles/{org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemHandlerFactory.java => org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeHandlerFactory.java} (79%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeBridgeHandlerConfiguration.java (92%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeDeviceHandlerConfiguration.java (91%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapoint.java (98%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapointGroup.java (92%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceChannel.java (98%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceDescription.java (98%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeBridgeHandler.java (98%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceHandler.java (96%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceStateListener.java (92%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProvider.java (92%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProviderImpl.java (97%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProvider.java (93%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProviderImpl.java (96%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FidTranslationUtils.java (99%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeGeneralException.java (97%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeHttpCommunicationException.java (97%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PIdContainerClass.java (95%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PidTranslationUtils.java (99%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/util/UidUtils.java (87%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BinaryValueStateConverter.java (95%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BooleanValueStateConverter.java (93%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/DecimalValueStateConverter.java (92%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ShuttercontrolValueStateConverter.java (96%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ValueStateConverter.java (91%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/resources/OH-INF/addon/addon.xml (72%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/resources/OH-INF/i18n/freeathomesystem.properties (95%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/resources/OH-INF/thing/bridge-type.xml (96%) rename bundles/{org.openhab.binding.freeathomesystem => org.openhab.binding.freeathome}/src/main/resources/OH-INF/thing/thing-type.xml (95%) delete mode 100644 bundles/org.openhab.binding.freeathomesystem/src/main/feature/feature.xml diff --git a/CODEOWNERS b/CODEOWNERS index 837752664f455..274522c5055a4 100644 --- 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/bundles/org.openhab.binding.freeathomesystem/NOTICE b/bundles/org.openhab.binding.freeathome/NOTICE similarity index 100% rename from bundles/org.openhab.binding.freeathomesystem/NOTICE rename to bundles/org.openhab.binding.freeathome/NOTICE diff --git a/bundles/org.openhab.binding.freeathomesystem/README.md b/bundles/org.openhab.binding.freeathome/README.md similarity index 83% rename from bundles/org.openhab.binding.freeathomesystem/README.md rename to bundles/org.openhab.binding.freeathome/README.md index de9940c06d834..b2a309eeb5f67 100644 --- a/bundles/org.openhab.binding.freeathomesystem/README.md +++ b/bundles/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" (Livingroom) { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#controller-on-off-request" } -Switch LivingRoom_Thermostat_EcoOnOff "Thermostat Eco Activation" (Livingroom) { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#eco-mode-on-off-request" } -Number LivingRoom_Thermostat_MeasuredTemperature "Measured Temperature" (Livingroom) ["Temperature"] { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#measured-temperature" } -Number LivingRoom_Thermostat_SetpointTemperature "Setpoint Temperature" (Livingroom) ["Setpoint", "Temperature"] { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#absolute-setpoint-temperature" } -Number LivingRoom_ThermostatHeatingActive "Thermostat Heating Active" (Livingroom) ["Status"] { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#heating-active" } -Number LivingRoom_ThermostatHeatingDemand "Thermostat Heating Demand" (Livingroom) ["Status"] { channel="freeathomesystem:device:312095ad75:ABB700000001:ch0000#status-indication" } +Switch Livingroom_Thermostat_Switch "Thermostat Siwtch" (Livingroom) { channel="freeathome:device:312095ad75:ABB700000001:ch0000#controller-on-off-request" } +Switch LivingRoom_Thermostat_EcoOnOff "Thermostat Eco Activation" (Livingroom) { channel="freeathome:device:312095ad75:ABB700000001:ch0000#eco-mode-on-off-request" } +Number LivingRoom_Thermostat_MeasuredTemperature "Measured Temperature" (Livingroom) ["Temperature"] { channel="freeathome:device:312095ad75:ABB700000001:ch0000#measured-temperature" } +Number LivingRoom_Thermostat_SetpointTemperature "Setpoint Temperature" (Livingroom) ["Setpoint", "Temperature"] { channel="freeathome:device:312095ad75:ABB700000001:ch0000#absolute-setpoint-temperature" } +Number LivingRoom_ThermostatHeatingActive "Thermostat Heating Active" (Livingroom) ["Status"] { channel="freeathome:device:312095ad75:ABB700000001:ch0000#heating-active" } +Number LivingRoom_ThermostatHeatingDemand "Thermostat Heating Demand" (Livingroom) ["Status"] { channel="freeathome:device:312095ad75:ABB700000001:ch0000#status-indication" } ``` Sample for the free@home device for switch ```java -Switch Livingroom_Switch "Livingroom Switch" (Livingroom) ["Light"] { channel="freeathomesystem:device:312095ad75:ABB700000012:ch0000#switch-on-off" } -Switch Livingroom_Lamp "Livingroom Lamp" (Livingroom) ["Light"] { channel="freeathomesystem:device:312095ad75:ABB700000012:ch0006#switch-on-off" } -Switch Livingroom_Aux "Livingroom Aux Switch" (Livingroom) ["Light"] { channel="freeathomesystem:device:312095ad75:ABB700000012:ch000b#switch-on-off" } +Switch Livingroom_Switch "Livingroom Switch" (Livingroom) ["Light"] { channel="freeathome:device:312095ad75:ABB700000012:ch0000#switch-on-off" } +Switch Livingroom_Lamp "Livingroom Lamp" (Livingroom) ["Light"] { channel="freeathome:device:312095ad75:ABB700000012:ch0006#switch-on-off" } +Switch Livingroom_Aux "Livingroom Aux Switch" (Livingroom) ["Light"] { channel="freeathome:device:312095ad75:ABB700000012:ch000b#switch-on-off" } ``` # Communities diff --git a/bundles/org.openhab.binding.freeathomesystem/pom.xml b/bundles/org.openhab.binding.freeathome/pom.xml similarity index 78% rename from bundles/org.openhab.binding.freeathomesystem/pom.xml rename to bundles/org.openhab.binding.freeathome/pom.xml index dc49e47ee5846..8d473a5a660f5 100644 --- a/bundles/org.openhab.binding.freeathomesystem/pom.xml +++ b/bundles/org.openhab.binding.freeathome/pom.xml @@ -10,8 +10,8 @@ 4.2.0-SNAPSHOT - org.openhab.binding.freeathomesystem + org.openhab.binding.freeathome - openHAB Add-ons :: Bundles :: FreeAtHomeSystem Binding + openHAB Add-ons :: Bundles :: FreeAtHome Binding diff --git a/bundles/org.openhab.binding.freeathome/src/main/feature/feature.xml b/bundles/org.openhab.binding.freeathome/src/main/feature/feature.xml new file mode 100644 index 0000000000000..19446fcc3002d --- /dev/null +++ b/bundles/org.openhab.binding.freeathome/src/main/feature/feature.xml @@ -0,0 +1,9 @@ + + + mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features + + + openhab-runtime-base + mvn:org.openhab.addons.bundles/org.openhab.binding.freeathome/${project.version} + + diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemBindingConstants.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeBindingConstants.java similarity index 82% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemBindingConstants.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeBindingConstants.java index 359cc2c67a6cf..ea41635bae9cd 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemBindingConstants.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeBindingConstants.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.util.Set; @@ -18,17 +18,17 @@ 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/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemDiscoveryService.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeDiscoveryService.java similarity index 78% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemDiscoveryService.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeDiscoveryService.java index db1ff2c48405e..18988e24ac78b 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemDiscoveryService.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/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 { +public class FreeAtHomeDiscoveryService extends AbstractThingHandlerDiscoveryService { - 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 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 getSupportedThingTypes() { - return Set.of(FreeAtHomeSystemBindingConstants.BRIDGE_TYPE_UID); + return Set.of(FreeAtHomeBindingConstants.BRIDGE_TYPE_UID); } @Override diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemHandlerFactory.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeHandlerFactory.java similarity index 79% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemHandlerFactory.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeHandlerFactory.java index 10df82cec6a52..a12d96084b707 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/FreeAtHomeSystemHandlerFactory.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/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,16 +39,16 @@ 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; @@ -56,7 +56,7 @@ public class FreeAtHomeSystemHandlerFactory extends BaseThingHandlerFactory { 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/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeBridgeHandlerConfiguration.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeBridgeHandlerConfiguration.java similarity index 92% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeBridgeHandlerConfiguration.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeBridgeHandlerConfiguration.java index 0d44df4ec6c05..a0e586796ca92 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeBridgeHandlerConfiguration.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/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/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeDeviceHandlerConfiguration.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeDeviceHandlerConfiguration.java similarity index 91% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeDeviceHandlerConfiguration.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeDeviceHandlerConfiguration.java index 8a84a5c6307fe..4c3165987695c 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/FreeAtHomeDeviceHandlerConfiguration.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/configuration/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/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapoint.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapoint.java similarity index 98% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapoint.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapoint.java index e21f9dcdd7fab..ceb92a87a11fa 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapoint.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/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/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapointGroup.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapointGroup.java similarity index 92% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapointGroup.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapointGroup.java index efea0d69f77d5..e2642fb724d5f 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDatapointGroup.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/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/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceChannel.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceChannel.java similarity index 98% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceChannel.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceChannel.java index ef75942c224bf..b5ec5126720e5 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceChannel.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/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/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceDescription.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceDescription.java similarity index 98% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceDescription.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceDescription.java index 2b50a83127e66..d9a4dd7f927c6 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceDescription.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/datamodel/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/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeBridgeHandler.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeBridgeHandler.java similarity index 98% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeBridgeHandler.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeBridgeHandler.java index 73a7426fdcf55..cf719f0e71091 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeBridgeHandler.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/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> getServices() { - return List.of(FreeAtHomeSystemDiscoveryService.class); + return List.of(FreeAtHomeDiscoveryService.class); } /** diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceHandler.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceHandler.java similarity index 96% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceHandler.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceHandler.java index b5a6d64b502cd..2165ae3cb2dc2 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceHandler.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceHandler.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.math.BigDecimal; import java.net.URI; @@ -22,16 +22,16 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.binding.freeathomesystem.internal.configuration.FreeAtHomeDeviceHandlerConfiguration; -import org.openhab.binding.freeathomesystem.internal.datamodel.FreeAtHomeDatapoint; -import org.openhab.binding.freeathomesystem.internal.datamodel.FreeAtHomeDatapointGroup; -import org.openhab.binding.freeathomesystem.internal.datamodel.FreeAtHomeDeviceChannel; -import org.openhab.binding.freeathomesystem.internal.datamodel.FreeAtHomeDeviceDescription; -import org.openhab.binding.freeathomesystem.internal.type.FreeAtHomeChannelTypeProvider; -import org.openhab.binding.freeathomesystem.internal.util.FreeAtHomeGeneralException; -import org.openhab.binding.freeathomesystem.internal.util.FreeAtHomeHttpCommunicationException; -import org.openhab.binding.freeathomesystem.internal.util.UidUtils; -import org.openhab.binding.freeathomesystem.internal.valuestateconverter.ValueStateConverter; +import org.openhab.binding.freeathome.internal.configuration.FreeAtHomeDeviceHandlerConfiguration; +import org.openhab.binding.freeathome.internal.datamodel.FreeAtHomeDatapoint; +import org.openhab.binding.freeathome.internal.datamodel.FreeAtHomeDatapointGroup; +import org.openhab.binding.freeathome.internal.datamodel.FreeAtHomeDeviceChannel; +import org.openhab.binding.freeathome.internal.datamodel.FreeAtHomeDeviceDescription; +import org.openhab.binding.freeathome.internal.type.FreeAtHomeChannelTypeProvider; +import org.openhab.binding.freeathome.internal.util.FreeAtHomeGeneralException; +import org.openhab.binding.freeathome.internal.util.FreeAtHomeHttpCommunicationException; +import org.openhab.binding.freeathome.internal.util.UidUtils; +import org.openhab.binding.freeathome.internal.valuestateconverter.ValueStateConverter; import org.openhab.core.i18n.LocaleProvider; import org.openhab.core.i18n.TranslationProvider; import org.openhab.core.library.types.StopMoveType; @@ -71,7 +71,7 @@ @NonNullByDefault public class FreeAtHomeDeviceHandler extends BaseThingHandler implements FreeAtHomeDeviceStateListener { - private static final String CHANNEL_URI = "channel-type:freeathomesystem:config"; + private static final String CHANNEL_URI = "channel-type:freeathome:config"; private final Logger logger = LoggerFactory.getLogger(FreeAtHomeDeviceHandler.class); private FreeAtHomeDeviceDescription device = new FreeAtHomeDeviceDescription(); diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceStateListener.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceStateListener.java similarity index 92% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceStateListener.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceStateListener.java index 6a5d886c922e7..2f4b75868cf57 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceStateListener.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceStateListener.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 org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProvider.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProvider.java similarity index 92% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProvider.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProvider.java index b89e68d8a4114..29af32224ca07 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProvider.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.type; +package org.openhab.binding.freeathome.internal.type; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.thing.type.ChannelType; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProviderImpl.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProviderImpl.java similarity index 97% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProviderImpl.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProviderImpl.java index a9cdf31876d50..b7c173b7277f8 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProviderImpl.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeChannelTypeProviderImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.type; +package org.openhab.binding.freeathome.internal.type; import java.util.ArrayList; import java.util.Collection; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProvider.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProvider.java similarity index 93% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProvider.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProvider.java index c2c1193faf2cc..87e71c3e3f3d0 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProvider.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProvider.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.type; +package org.openhab.binding.freeathome.internal.type; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.thing.binding.ThingTypeProvider; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProviderImpl.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProviderImpl.java similarity index 96% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProviderImpl.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProviderImpl.java index 807933a5b6e28..bc037e95f00c3 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProviderImpl.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/type/FreeAtHomeThingTypeProviderImpl.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.type; +package org.openhab.binding.freeathome.internal.type; import java.util.Collection; import java.util.HashMap; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FidTranslationUtils.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FidTranslationUtils.java similarity index 99% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FidTranslationUtils.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FidTranslationUtils.java index 96ff6bcaa3b10..0788111c86562 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FidTranslationUtils.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FidTranslationUtils.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.util; +package org.openhab.binding.freeathome.internal.util; import java.util.Map; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeGeneralException.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeGeneralException.java similarity index 97% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeGeneralException.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeGeneralException.java index c490db2f69104..ca511123b21da 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeGeneralException.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeGeneralException.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.util; +package org.openhab.binding.freeathome.internal.util; import java.util.Objects; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeHttpCommunicationException.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeHttpCommunicationException.java similarity index 97% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeHttpCommunicationException.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeHttpCommunicationException.java index cfea1397f8999..44e377e410f20 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeHttpCommunicationException.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/FreeAtHomeHttpCommunicationException.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.util; +package org.openhab.binding.freeathome.internal.util; import java.util.Objects; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PIdContainerClass.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PIdContainerClass.java similarity index 95% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PIdContainerClass.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PIdContainerClass.java index e534a11dca3a5..c2b915042b86f 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PIdContainerClass.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PIdContainerClass.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.util; +package org.openhab.binding.freeathome.internal.util; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PidTranslationUtils.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PidTranslationUtils.java similarity index 99% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PidTranslationUtils.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PidTranslationUtils.java index 3e5b05fd9b0fe..54b9e7c169ef6 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PidTranslationUtils.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/PidTranslationUtils.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.util; +package org.openhab.binding.freeathome.internal.util; import java.util.Map; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/UidUtils.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/UidUtils.java similarity index 87% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/UidUtils.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/UidUtils.java index 9b7f4cec65859..06170544477cb 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/util/UidUtils.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/util/UidUtils.java @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.util; +package org.openhab.binding.freeathome.internal.util; -import static org.openhab.binding.freeathomesystem.internal.FreeAtHomeSystemBindingConstants.*; +import static org.openhab.binding.freeathome.internal.FreeAtHomeBindingConstants.*; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.thing.ThingTypeUID; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BinaryValueStateConverter.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BinaryValueStateConverter.java similarity index 95% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BinaryValueStateConverter.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BinaryValueStateConverter.java index 7fc2d6339ad51..5a686596081ea 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BinaryValueStateConverter.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BinaryValueStateConverter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.valuestateconverter; +package org.openhab.binding.freeathome.internal.valuestateconverter; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.library.types.OnOffType; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BooleanValueStateConverter.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BooleanValueStateConverter.java similarity index 93% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BooleanValueStateConverter.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BooleanValueStateConverter.java index e07a519ee6cea..0128412af1fcd 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BooleanValueStateConverter.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/BooleanValueStateConverter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.valuestateconverter; +package org.openhab.binding.freeathome.internal.valuestateconverter; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.library.types.OnOffType; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/DecimalValueStateConverter.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/DecimalValueStateConverter.java similarity index 92% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/DecimalValueStateConverter.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/DecimalValueStateConverter.java index 5945c1871e54e..fd24727c3e28e 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/DecimalValueStateConverter.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/DecimalValueStateConverter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.valuestateconverter; +package org.openhab.binding.freeathome.internal.valuestateconverter; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.library.types.DecimalType; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ShuttercontrolValueStateConverter.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ShuttercontrolValueStateConverter.java similarity index 96% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ShuttercontrolValueStateConverter.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ShuttercontrolValueStateConverter.java index 66996dc50e159..4b8ed03f151c1 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ShuttercontrolValueStateConverter.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ShuttercontrolValueStateConverter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.valuestateconverter; +package org.openhab.binding.freeathome.internal.valuestateconverter; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.library.types.StopMoveType; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ValueStateConverter.java b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ValueStateConverter.java similarity index 91% rename from bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ValueStateConverter.java rename to bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ValueStateConverter.java index 80187ff7b2f2e..3c25e9cd6a428 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ValueStateConverter.java +++ b/bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/valuestateconverter/ValueStateConverter.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.freeathomesystem.internal.valuestateconverter; +package org.openhab.binding.freeathome.internal.valuestateconverter; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.core.types.State; diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/addon/addon.xml similarity index 72% rename from bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/addon/addon.xml rename to bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/addon/addon.xml index ccfa0e3e1e045..3733278678abc 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/addon/addon.xml @@ -1,10 +1,10 @@ - binding - FreeAtHomeSystem Binding + FreeAtHome Binding This is the binding for free@home system. local diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/i18n/freeathomesystem.properties b/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/i18n/freeathomesystem.properties similarity index 95% rename from bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/i18n/freeathomesystem.properties rename to bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/i18n/freeathomesystem.properties index 9b021ffaf4635..fb2ae8d7bc722 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/i18n/freeathomesystem.properties +++ b/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/i18n/freeathomesystem.properties @@ -1,27 +1,27 @@ # add-on -addon.freeathomesystem.name = FreeAtHomeSystem Binding -addon.freeathomesystem.description = This is the binding for free@home system. +addon.freeathome.name = FreeAtHome Binding +addon.freeathome.description = This is the binding for free@home system. # thing types -thing-type.freeathomesystem.device.label = free@home Device -thing-type.freeathomesystem.device.description = This represents the generic free@home device -thing-type.freeathomesystem.gateway.label = free@home Gateway -thing-type.freeathomesystem.gateway.description = This gateway represents the free@home Gateway +thing-type.freeathome.device.label = free@home Device +thing-type.freeathome.device.description = This represents the generic free@home device +thing-type.freeathome.gateway.label = free@home Gateway +thing-type.freeathome.gateway.description = This gateway represents the free@home Gateway # thing types config -thing-type.config.freeathomesystem.device.deviceId.label = Device Id -thing-type.config.freeathomesystem.device.deviceId.description = This is the unique id of the free@home device (Please do not modify after the Thing is generated) -thing-type.config.freeathomesystem.gateway.group.identification.label = SysAP Setting -thing-type.config.freeathomesystem.gateway.group.identification.description = SysAP network address and user settings -thing-type.config.freeathomesystem.gateway.ipAddress.label = Sysap IP Address -thing-type.config.freeathomesystem.gateway.ipAddress.description = IP Address of the Busch-Jaeger Gateway -thing-type.config.freeathomesystem.gateway.password.label = Password -thing-type.config.freeathomesystem.gateway.password.description = Password for gateway -thing-type.config.freeathomesystem.gateway.username.label = User Name -thing-type.config.freeathomesystem.gateway.username.description = The login name +thing-type.config.freeathome.device.deviceId.label = Device Id +thing-type.config.freeathome.device.deviceId.description = This is the unique id of the free@home device (Please do not modify after the Thing is generated) +thing-type.config.freeathome.gateway.group.identification.label = SysAP Setting +thing-type.config.freeathome.gateway.group.identification.description = SysAP network address and user settings +thing-type.config.freeathome.gateway.ipAddress.label = Sysap IP Address +thing-type.config.freeathome.gateway.ipAddress.description = IP Address of the Busch-Jaeger Gateway +thing-type.config.freeathome.gateway.password.label = Password +thing-type.config.freeathome.gateway.password.description = Password for gateway +thing-type.config.freeathome.gateway.username.label = User Name +thing-type.config.freeathome.gateway.username.description = The login name # localized error text diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/thing/bridge-type.xml b/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/thing/bridge-type.xml similarity index 96% rename from bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/thing/bridge-type.xml rename to bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/thing/bridge-type.xml index 28b214efedb4e..243f4fdabb96d 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/thing/bridge-type.xml +++ b/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/thing/bridge-type.xml @@ -1,5 +1,5 @@ - diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/thing/thing-type.xml b/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/thing/thing-type.xml similarity index 95% rename from bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/thing/thing-type.xml rename to bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/thing/thing-type.xml index fe71521474fa8..be0fbe3aa1dd0 100644 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/resources/OH-INF/thing/thing-type.xml +++ b/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/thing/thing-type.xml @@ -1,5 +1,5 @@ - diff --git a/bundles/org.openhab.binding.freeathomesystem/src/main/feature/feature.xml b/bundles/org.openhab.binding.freeathomesystem/src/main/feature/feature.xml deleted file mode 100644 index 323d77d1a557d..0000000000000 --- a/bundles/org.openhab.binding.freeathomesystem/src/main/feature/feature.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features - - - openhab-runtime-base - mvn:org.openhab.addons.bundles/org.openhab.binding.freeathomesystem/${project.version} - - diff --git a/bundles/pom.xml b/bundles/pom.xml index 0db4af22a903a..ba250d14dab90 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -146,7 +146,7 @@ org.openhab.binding.folderwatcher org.openhab.binding.folding org.openhab.binding.foobot - org.openhab.binding.freeathomesystem + org.openhab.binding.freeathome org.openhab.binding.freebox org.openhab.binding.freeboxos org.openhab.binding.freecurrency