From 17091e7141d308aaffea0f702602466ac24b8bfb Mon Sep 17 00:00:00 2001
From: lolodomo <lg.hc@free.fr>
Date: Sun, 21 Mar 2021 16:41:35 +0100
Subject: [PATCH] [digitalstrom] Fix deprecated tag "required" (#10364)

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---
 .../resources/OH-INF/config/bridgeConfig.xml  | 24 +++++++------------
 .../resources/OH-INF/config/deviceConfig.xml  | 15 ++++--------
 .../OH-INF/thing/AppartmentScene.xml          |  3 +--
 .../resources/OH-INF/thing/GroupScene.xml     |  9 +++----
 .../resources/OH-INF/thing/NamedScene.xml     |  9 +++----
 .../main/resources/OH-INF/thing/ZoneScene.xml |  6 ++---
 .../OH-INF/thing/ZoneTemperatureControl.xml   |  3 +--
 7 files changed, 23 insertions(+), 46 deletions(-)

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 8d6101b051..2523b325a3 100644
--- 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
@@ -14,54 +14,46 @@
 			<description>@text/dss_param_group_general_desc</description>
 		</parameter-group>
 		<!--Application token -->
-		<parameter name="applicationToken" type="text" groupName="connection">
+		<parameter name="applicationToken" type="text" groupName="connection" required="false">
 			<label>@text/dss_param_app_token_label</label>
 			<description>@text/dss_param_app_token_desc</description>
-			<required>false</required>
 		</parameter><!--ipAddress -->
-		<parameter name="dSSAddress" type="text" groupName="connection">
+		<parameter name="dSSAddress" type="text" groupName="connection" required="true">
 			<context>network-address</context>
 			<label>@text/dss_param_ip_address_label</label>
 			<description>@text/dss_param_ip_address_desc</description>
-			<required>true</required>
 		</parameter><!--userName -->
-		<parameter name="userName" type="text" groupName="connection">
+		<parameter name="userName" type="text" groupName="connection" required="false">
 			<label>@text/dss_param_username_label</label>
 			<description>@text/dss_param_username_desc</description>
-			<required>false</required>
 		</parameter><!--password -->
-		<parameter name="password" type="text" groupName="connection">
+		<parameter name="password" type="text" groupName="connection" required="false">
 			<label>@text/dss_param_password_label</label>
 			<description>@text/dss_param_password_desc</description>
-			<required>false</required>
 			<context>password</context>
 		</parameter>
 		<!--sensorDataUpdateInterval -->
-		<parameter name="sensorDataUpdateInterval" type="integer" groupName="general" min="60">
+		<parameter name="sensorDataUpdateInterval" type="integer" groupName="general" min="60" required="false">
 			<default>120</default>
 			<label>@text/dss_param_sensor_inter_label</label>
 			<description>@text/dss_param_sensor_inter_desc</description>
-			<required>false</required>
 		</parameter><!--totalPowerUpdateInterval -->
-		<parameter name="totalPowerUpdateInterval" type="integer" groupName="general" min="1">
+		<parameter name="totalPowerUpdateInterval" type="integer" groupName="general" min="1" required="false">
 			<default>30</default>
 			<label>@text/dss_param_total_power_inter_label</label>
 			<description>@text/dss_param_total_power_inter_desc</description>
-			<required>false</required>
 		</parameter><!--TrashBinDeleteTime -->
-		<parameter name="defaultTrashBinDeleteTime" type="integer" groupName="general" min="1">
+		<parameter name="defaultTrashBinDeleteTime" type="integer" groupName="general" min="1" required="false">
 			<default>7</default>
 			<label>@text/dss_param_trash_delete_label</label>
 			<description>@text/dss_param_trash_delete_desc</description>
-			<required>false</required>
 		</parameter>
 		<!--sensorWaitTime -->
-		<parameter name="sensorWaitTime" type="integer" groupName="general" min="1">
+		<parameter name="sensorWaitTime" type="integer" groupName="general" min="1" required="false">
 			<advanced>true</advanced>
 			<description>@text/dss_param_sensor_wait_label</description>
 			<default>60</default>
 			<label>@text/dss_param_sensor_wait_desc</label>
-			<required>false</required>
 		</parameter>
 	</config-description>
 </config-description:config-descriptions>
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 da12533fbf..77194eabc1 100644
--- 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
@@ -15,7 +15,7 @@
 			<label>@text/device_param_group_sensor_label</label>
 			<description>@text/device_param_group_sensor_desc</description>
 		</parameter-group>
-		<parameter name="activePowerRefreshPriority" type="text" groupName='sensorSetup'>
+		<parameter name="activePowerRefreshPriority" type="text" groupName='sensorSetup' required="false">
 			<label>@text/device_param_active_power_label</label>
 			<description>@text/device_param_active_power_desc</description>
 			<options>
@@ -25,9 +25,8 @@
 				<option value="low">@text/DS_SENSOR_OPTION2</option>
 			</options>
 			<default>never</default>
-			<required>false</required>
 		</parameter>
-		<parameter name="electricMeterRefreshPriority" type="text" groupName='sensorSetup'>
+		<parameter name="electricMeterRefreshPriority" type="text" groupName='sensorSetup' required="false">
 			<label>@text/device_param_electric_meter_label</label>
 			<description>@text/device_param_electric_meter_desc</description>
 			<options>
@@ -37,9 +36,8 @@
 				<option value="low">@text/DS_SENSOR_OPTION2</option>
 			</options>
 			<default>never</default>
-			<required>false</required>
 		</parameter>
-		<parameter name="outputCurrentRefreshPriority" type="text" groupName='sensorSetup'>
+		<parameter name="outputCurrentRefreshPriority" type="text" groupName='sensorSetup' required="false">
 			<label>@text/device_param_output_current_label</label>
 			<description>@text/device_param_output_current_desc</description>
 			<options>
@@ -49,21 +47,18 @@
 				<option value="low">@text/DS_SENSOR_OPTION2</option>
 			</options>
 			<default>never</default>
-			<required>false</required>
 		</parameter>
 		<!--deviceID -->
-		<parameter name="dSID" type="text" readOnly="true" groupName="devInfo">
+		<parameter name="dSID" type="text" readOnly="true" groupName="devInfo" required="true">
 			<label>@text/device_param_dsid_label</label>
 			<description>@text/device_param_dsid_desc</description>
-			<required>true</required>
 		</parameter>
 	</config-description>
 	<!-- gray Device -->
 	<config-description uri="binding:digitalstrom:deviceWithoutPowerSensors">
-		<parameter name="dSID" type="text" readOnly="true">
+		<parameter name="dSID" type="text" readOnly="true" required="true">
 			<label>@text/device_param_dsid_label</label>
 			<description>@text/device_param_dsid_desc</description>
-			<required>true</required>
 		</parameter>
 	</config-description>
 </config-description:config-descriptions>
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/AppartmentScene.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/AppartmentScene.xml
index 9712bf3b55..dad19d4731 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/AppartmentScene.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/AppartmentScene.xml
@@ -16,10 +16,9 @@
 
 		<config-description>
 			<!--scene id -->
-			<parameter name="sceneID" type="text" readOnly="true">
+			<parameter name="sceneID" type="text" readOnly="true" required="true">
 				<label>@text/param_scene_id_label</label>
 				<description>@text/param_scene_id_desc</description>
-				<required>true</required>
 				<options>
 					<option value="ABSENT">@text/absent</option>
 					<option value="PRESENT">@text/present</option>
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/GroupScene.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/GroupScene.xml
index b597c64008..4ef0adf921 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/GroupScene.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/GroupScene.xml
@@ -17,22 +17,19 @@
 
 		<config-description>
 			<!--zone id -->
-			<parameter name="zoneID" type="text">
+			<parameter name="zoneID" type="text" required="false">
 				<label>@text/param_scene_zone_id_label</label>
 				<description>@text/param_scene_zone_id_desc</description>
-				<required>false</required>
 			</parameter>
 			<!--groups id -->
-			<parameter name="groupID" type="text">
+			<parameter name="groupID" type="text" required="false">
 				<label>@text/param_scene_group_id_label</label>
 				<description>@text/param_scene_group_id_desc</description>
-				<required>false</required>
 			</parameter>
 			<!--scene id -->
-			<parameter name="sceneID" type="text">
+			<parameter name="sceneID" type="text" required="false">
 				<label>@text/param_scene_id_label</label>
 				<description>@text/param_scene_id_desc</description>
-				<required>false</required>
 				<options>
 					<option value="AREA_1_OFF">@text/AREA_1_OFF</option>
 					<option value="AREA_1_ON">@text/AREA_1_ON</option>
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/NamedScene.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/NamedScene.xml
index 8edcfeac41..521b57cdbb 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/NamedScene.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/NamedScene.xml
@@ -17,22 +17,19 @@
 
 		<config-description>
 			<!--zone id -->
-			<parameter name="zoneID" type="text">
+			<parameter name="zoneID" type="text" required="false">
 				<label>@text/param_scene_zone_id_label</label>
 				<description>@text/param_scene_zone_id_desc</description>
-				<required>false</required>
 			</parameter>
 			<!--groups id -->
-			<parameter name="groupID" type="text">
+			<parameter name="groupID" type="text" required="false">
 				<label>@text/param_scene_group_id_label</label>
 				<description>@text/param_scene_group_id_desc</description>
-				<required>false</required>
 			</parameter>
 			<!--scene id -->
-			<parameter name="sceneID" type="text">
+			<parameter name="sceneID" type="text" required="false">
 				<label>@text/param_scene_id_label</label>
 				<description>@text/param_scene_id_desc</description>
-				<required>false</required>
 				<options>
 					<option value="AREA_1_OFF">@text/AREA_1_OFF</option>
 					<option value="AREA_1_ON">@text/AREA_1_ON</option>
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneScene.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneScene.xml
index e2dc0471bd..7dc9ff8057 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneScene.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneScene.xml
@@ -17,16 +17,14 @@
 
 		<config-description>
 			<!--zone id -->
-			<parameter name="zoneID" type="text">
+			<parameter name="zoneID" type="text" required="false">
 				<label>@text/param_scene_zone_id_label</label>
 				<description>@text/param_scene_zone_id_desc</description>
-				<required>false</required>
 			</parameter>
 			<!--scene id -->
-			<parameter name="sceneID" type="text">
+			<parameter name="sceneID" type="text" required="false">
 				<label>@text/param_scene_id_label</label>
 				<description>@text/param_scene_id_desc</description>
-				<required>false</required>
 				<options>
 					<option value="DEEP_OFF">@text/deep_off</option>
 					<option value="STANDBY">@text/standby</option>
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneTemperatureControl.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneTemperatureControl.xml
index 32346f11ec..3b053d0109 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneTemperatureControl.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneTemperatureControl.xml
@@ -13,10 +13,9 @@
 
 		<config-description>
 			<!--zone id -->
-			<parameter name="zoneID" type="text">
+			<parameter name="zoneID" type="text" required="true">
 				<label>@text/zoneTemperatureControl_parm_zoneID_label</label>
 				<description>@text/zoneTemperatureControl_parm_zoneID_desc</description>
-				<required>true</required>
 			</parameter>
 		</config-description>
 	</thing-type>
-- 
2.47.3