Revert "[digitalstrom] Standardize config URI (openhab#11017)"

This reverts commit 7c007d6. Signed-off-by: dw-8 <[email protected]>
dw-8 · Jul 25, 2021 · 626f29d · 626f29d
1 parent d4e8854
commit 626f29d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/...src/main/java/org/openhab/binding/digitalstrom/internal/DigitalSTROMBindingConstants.java b/...src/main/java/org/openhab/binding/digitalstrom/internal/DigitalSTROMBindingConstants.java
@@ -53,6 +53,11 @@ 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/...n/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java b/...n/java/org/openhab/binding/digitalstrom/internal/providers/DsDeviceThingTypeProvider.java
@@ -82,8 +82,8 @@ private SupportedThingTypes(String handler, boolean havePowerSensors) {
 
     private final Logger logger = LoggerFactory.getLogger(DsDeviceThingTypeProvider.class);
 
-    private final String DEVICE_WITH_POWER_SENSORS = "thing-type:digitalstrom:deviceWithPowerSensors";
-    private final String DEVICE_WITHOUT_POWER_SENSORS = "thing-type:digitalstrom:deviceWithoutPowerSensors";
+    private final String DEVICE_WITH_POWER_SENSORS = "binding:digitalstrom:deviceWithPowerSensors";
+    private final String DEVICE_WITHOUT_POWER_SENSORS = "binding: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
@@ -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="bridge-type:digitalstrom:dssBridge">
+	<config-description uri="binding: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
@@ -6,7 +6,7 @@
 		https://openhab.org/schemas/config-description-1.0.0.xsd">
 
 	<!-- yellow/black Device -->
-	<config-description uri="thing-type:digitalstrom:deviceWithPowerSensors">
+	<config-description uri="binding: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="thing-type:digitalstrom:deviceWithoutPowerSensors">
+	<config-description uri="binding: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
@@ -16,7 +16,7 @@
 		<properties>
 			<property name="serverCert"></property>
 		</properties>
-		<config-description-ref uri="bridge-type:digitalstrom:dssBridge"/>
+		<config-description-ref uri="binding:digitalstrom:dssBridge"/>
 	</bridge-type>
 
 </thing:thing-descriptions>