From c2f620a4766c42156b4d851e3dcbd44598d712ef Mon Sep 17 00:00:00 2001
From: dw-8 <davy.wong.on+github@gmail.com>
Date: Sun, 25 Jul 2021 01:10:39 -0400
Subject: [PATCH] Revert "[nikobus] Standardize config URI (#11011)"

This reverts commit b9483a85e00966529a97e409ea9d737be4844c0e.
---
 .../src/main/resources/OH-INF/config/config.xml           | 8 ++++----
 .../src/main/resources/OH-INF/thing/dimmer-module.xml     | 2 +-
 .../src/main/resources/OH-INF/thing/push-button.xml       | 4 ++--
 .../main/resources/OH-INF/thing/rollershutter-module.xml  | 4 ++--
 .../src/main/resources/OH-INF/thing/switch-module.xml     | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/config/config.xml
index 682c8da868d45..fa1736504192d 100644
--- a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/config/config.xml
+++ b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/config/config.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="channel-type:nikobus:trigger-filter">
+	<config-description uri="push-button:trigger-filter:config">
 		<parameter name="command" type="text">
 			<label>Command</label>
 			<description>Command to send</description>
@@ -20,7 +20,7 @@
 		</parameter>
 	</config-description>
 
-	<config-description uri="channel-type:nikobus:trigger-button">
+	<config-description uri="push-button:trigger-button:config">
 		<parameter name="threshold" type="integer" min="0" unit="ms">
 			<label>Threshold</label>
 			<description>Long-press threshold in milliseconds</description>
@@ -28,14 +28,14 @@
 		</parameter>
 	</config-description>
 
-	<config-description uri="thing-type:nikobus:module">
+	<config-description uri="module:address:config">
 		<parameter name="address" type="text" required="true">
 			<label>Address</label>
 			<description>The Nikobus address of the module</description>
 		</parameter>
 	</config-description>
 
-	<config-description uri="channel-type:nikobus:rollershutter-output">
+	<config-description uri="rollershutter-module:rollershutter-output:config">
 		<parameter name="duration" type="integer" min="1" unit="s">
 			<label>Duration</label>
 			<description>Duration in seconds required for a rollershutter to get from open to closed</description>
diff --git a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/dimmer-module.xml b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/dimmer-module.xml
index 6cce9a56ff14d..86f7e00447a45 100644
--- a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/dimmer-module.xml
+++ b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/dimmer-module.xml
@@ -51,7 +51,7 @@
 			</channel>
 		</channels>
 
-		<config-description-ref uri="thing-type:nikobus:module"/>
+		<config-description-ref uri="module:address:config"/>
 	</thing-type>
 
 	<channel-type id="dimmer-output">
diff --git a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/push-button.xml b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/push-button.xml
index efd53ef7c5228..f272ea7fe0991 100644
--- a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/push-button.xml
+++ b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/push-button.xml
@@ -38,7 +38,7 @@
 		<kind>trigger</kind>
 		<label>Trigger Filter Channel</label>
 		<event/>
-		<config-description-ref uri="channel-type:nikobus:trigger-filter"/>
+		<config-description-ref uri="push-button:trigger-filter:config"/>
 	</channel-type>
 
 	<channel-type id="trigger-button">
@@ -50,7 +50,7 @@
 				<option value="LONG_PRESSED">long pressed</option>
 			</options>
 		</event>
-		<config-description-ref uri="channel-type:nikobus:trigger-button"/>
+		<config-description-ref uri="push-button:trigger-button:config"/>
 	</channel-type>
 
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/rollershutter-module.xml b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/rollershutter-module.xml
index 10b311a737879..ee6ec5b65253a 100644
--- a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/rollershutter-module.xml
+++ b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/rollershutter-module.xml
@@ -33,14 +33,14 @@
 			</channel>
 		</channels>
 
-		<config-description-ref uri="thing-type:nikobus:module"/>
+		<config-description-ref uri="module:address:config"/>
 	</thing-type>
 
 	<channel-type id="rollershutter-output">
 		<item-type>Rollershutter</item-type>
 		<label>Output</label>
 		<description>Rollershutter Module's Output</description>
-		<config-description-ref uri="channel-type:nikobus:rollershutter-output"/>
+		<config-description-ref uri="rollershutter-module:rollershutter-output:config"/>
 	</channel-type>
 
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/switch-module.xml b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/switch-module.xml
index d38fcbca61ea9..419ce16b9c0a4 100644
--- a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/switch-module.xml
+++ b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/thing/switch-module.xml
@@ -51,7 +51,7 @@
 			</channel>
 		</channels>
 
-		<config-description-ref uri="thing-type:nikobus:module"/>
+		<config-description-ref uri="module:address:config"/>
 	</thing-type>
 
 	<channel-type id="switch-output">