[digitalstrom] Fix deprecated tag "required" (#10364)

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

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 8d6101b0512036e266baa74ace1ccbfd4c726b2a..2523b325a329fda4bdd44f55bcb3a1806fc1cf32 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
@@ -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 da12533fbfeaa095ed762ca8b6c2b4d03179f698..77194eabc16b7003c9f40c5493d83f6bbaeb9bf2 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
@@ -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 9712bf3b550508b33b3220178de7b6ad0ca023b6..dad19d4731ab28b0e3cbb72a6d697ba1002c169e 100644 (file)
--- 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 b597c640089689554daf65fd3d7f14cb046d353f..4ef0adf92157c81c2d427f251ad69d4d543923d7 100644 (file)
--- 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 8edcfeac410962273e68c65cf5f44cde6cf0348d..521b57cdbb39e2c6ecf96d53561229a2d37d1c8d 100644 (file)
--- 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 e2dc0471bdc8aea5d355fa206f67abdcf31a2ee8..7dc9ff80577fa04e1d22e627ececbd0d8ec4ec82 100644 (file)
--- 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 32346f11ece824532fc2c502ea1f88e8b12e691b..3b053d010993d48741d8f838e0bb26875073c524 100644 (file)
--- 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>