[digitalstrom] Standardize config URI (#11017)

Signed-off-by: Laurent Garnier <lg.hc@free.fr>

diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/DigitalSTROMBindingConstants.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/DigitalSTROMBindingConstants.java
index 87b86e0d81650bdf5b3c1c556257f9a0c3fa9d32..c8a1d189068f4a57530e304be40614dc728be01e 100644 (file)
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/DigitalSTROMBindingConstants.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/DigitalSTROMBindingConstants.java
@@ -53,11 +53,6 @@ public class DigitalSTROMBindingConstants {
     public static final String OPTION_COMBINED_FIRST_ON = "90";
     public static final String OPTION_COMBINED_SECOND_ON = "130";
 
-    /* config URIs */
-    public static final String DEVICE_CONFIG = "binding:digitalstrom:device";
-    public static final String GRAY_DEVICE_CONFIG = "binding:digitalstrom:grayDevice";
-    public static final String DSS_BRIDE_CONFIG = "binding:digitalstrom:dssBridge";
-
     /* Bridge config properties */
 
     public static final String HOST = "dSSAddress";

diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java
index 560cbd082fe6374e89e2d7056139860323e568ce..74633a2fd6c15ce8abe77b02a9b075c37c351cfa 100644 (file)
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java
@@ -82,8 +82,8 @@ public class DsDeviceThingTypeProvider extends BaseDsI18n implements ThingTypePr
 
     private final Logger logger = LoggerFactory.getLogger(DsDeviceThingTypeProvider.class);
 
-    private final String DEVICE_WITH_POWER_SENSORS = "binding:digitalstrom:deviceWithPowerSensors";
-    private final String DEVICE_WITHOUT_POWER_SENSORS = "binding:digitalstrom:deviceWithoutPowerSensors";
+    private final String DEVICE_WITH_POWER_SENSORS = "thing-type:digitalstrom:deviceWithPowerSensors";
+    private final String DEVICE_WITHOUT_POWER_SENSORS = "thing-type:digitalstrom:deviceWithoutPowerSensors";
 
     @Activate
     @Override

diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml
index 2523b325a329fda4bdd44f55bcb3a1806fc1cf32..ba0fef535e0c2c4c087cfdc9f9665270b25e8474 100644 (file)
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml
@@ -4,7 +4,7 @@
        xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0"
        xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0
                https://openhab.org/schemas/config-description-1.0.0.xsd">
-       <config-description uri="binding:digitalstrom:dssBridge">
+       <config-description uri="bridge-type:digitalstrom:dssBridge">
                <parameter-group name="connection">
                        <label>@text/dss_param_group_connection_label</label>
                        <description>@text/dss_param_group_connection_desc</description>

diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml
index 77194eabc16b7003c9f40c5493d83f6bbaeb9bf2..ecb137b1c0d47e984c16b754aceb11a0377a85d9 100644 (file)
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml
@@ -6,7 +6,7 @@
                https://openhab.org/schemas/config-description-1.0.0.xsd">
 
        <!-- yellow/black Device -->
-       <config-description uri="binding:digitalstrom:deviceWithPowerSensors">
+       <config-description uri="thing-type:digitalstrom:deviceWithPowerSensors">
                <parameter-group name="devInfo">
                        <label>@text/device_param_group_info_label</label>
                        <description>@text/device_param_group_info_desc</description>
@@ -55,7 +55,7 @@
                </parameter>
        </config-description>
        <!-- gray Device -->
-       <config-description uri="binding:digitalstrom:deviceWithoutPowerSensors">
+       <config-description uri="thing-type:digitalstrom:deviceWithoutPowerSensors">
                <parameter name="dSID" type="text" readOnly="true" required="true">
                        <label>@text/device_param_dsid_label</label>
                        <description>@text/device_param_dsid_desc</description>

diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml
index 9918f663a2ea1ed9365514b2a585b6acf4fd3715..bb27064dde6ae0d7dcf652e1fc0693e74d86386b 100644 (file)
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml
@@ -16,7 +16,7 @@
                <properties>
                        <property name="serverCert"></property>
                </properties>
-               <config-description-ref uri="binding:digitalstrom:dssBridge"/>
+               <config-description-ref uri="bridge-type:digitalstrom:dssBridge"/>
        </bridge-type>
 
 </thing:thing-descriptions>