From: lolodomo <lg.hc@free.fr>
Date: Sat, 20 Mar 2021 15:09:32 +0000 (+0100)
Subject: [onewire] Fix deprecated tag "required" (#10354)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=2c0015dda73c7de0cbed433637dc529b65099c62;p=openhab-addons.git

[onewire] Fix deprecated tag "required" (#10354)

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

diff --git a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/config/config.xml
index 994537637a..4b7b222725 100644
--- a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/config/config.xml
+++ b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/config/config.xml
@@ -4,33 +4,29 @@
 	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="thing-type:onewire:basethingconfig">
-		<parameter name="id" type="text">
+		<parameter name="id" type="text" required="true">
 			<label>Sensor ID</label>
 			<description>Sensor ID in format: xx.xxxxxxxxxxxx or a full path including hubs/branches</description>
-			<required>true</required>
 		</parameter>
-		<parameter name="refresh" type="integer" min="1">
+		<parameter name="refresh" type="integer" min="1" required="false">
 			<label>Refresh Time</label>
 			<description>Time in seconds after which the thing is refreshed</description>
 			<default>300</default>
 			<unitLabel>s</unitLabel>
-			<required>false</required>
 		</parameter>
 	</config-description>
 	<config-description uri="thing-type:onewire:mstxconfig">
-		<parameter name="id" type="text">
+		<parameter name="id" type="text" required="true">
 			<label>Sensor ID</label>
 			<description>Sensor ID in format: xx.xxxxxxxxxxxx or a full path including hubs/branches</description>
-			<required>true</required>
 		</parameter>
-		<parameter name="refresh" type="integer" min="1">
+		<parameter name="refresh" type="integer" min="1" required="false">
 			<label>Refresh Time</label>
 			<description>Time in seconds after which the thing is refreshed</description>
 			<default>300</default>
 			<unitLabel>s</unitLabel>
-			<required>false</required>
 		</parameter>
-		<parameter name="manualsensor" type="text">
+		<parameter name="manualsensor" type="text" required="false">
 			<label>Manual Sensor Type</label>
 			<description>Overrides detected sensor type</description>
 			<options>
@@ -41,7 +37,6 @@
 				<option value="MS_TC">MS-TC</option>
 			</options>
 			<limitToOptions>true</limitToOptions>
-			<required>false</required>
 			<advanced>true</advanced>
 		</parameter>
 	</config-description>
diff --git a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/bae09x.xml b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/bae09x.xml
index 38973babbb..79e2d72a2c 100644
--- a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/bae09x.xml
+++ b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/bae09x.xml
@@ -13,10 +13,9 @@
 			<property name="sensorCount">1</property>
 		</properties>
 		<config-description>
-			<parameter name="id" type="text">
+			<parameter name="id" type="text" required="true">
 				<label>Sensor ID</label>
 				<description>Sensor ID in format: xx.xxxxxxxxxxxx)</description>
-				<required>true</required>
 			</parameter>
 			<parameter name="refresh" type="integer" min="1">
 				<label>Refresh Time</label>
diff --git a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/bridge.xml
index 0c0f85075e..b0f5501b14 100644
--- a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/bridge.xml
@@ -7,17 +7,15 @@
 		<label>OW Server</label>
 		<description>An owserver instance</description>
 		<config-description>
-			<parameter name="network-address" type="text">
+			<parameter name="network-address" type="text" required="true">
 				<context>network_address</context>
 				<label>Network Address</label>
 				<description>Network address of the host running the owserver</description>
-				<required>true</required>
 			</parameter>
-			<parameter name="port" type="integer">
+			<parameter name="port" type="integer" required="false">
 				<label>Port</label>
 				<description>Listening port of the owserver</description>
 				<default>4304</default>
-				<required>false</required>
 			</parameter>
 		</config-description>
 	</bridge-type>
@@ -27,17 +25,15 @@
 		<description>Allows direct access to the OWFS</description>
 		<state readOnly="true"/>
 		<config-description>
-			<parameter name="path" type="text">
+			<parameter name="path" type="text" required="true">
 				<label>OWFS Path</label>
 				<description>full path to the OWFS-node (e.g. statistics/errors/CRC8_errors)</description>
-				<required>true</required>
 			</parameter>
-			<parameter name="refresh" type="integer" min="1">
+			<parameter name="refresh" type="integer" min="1" required="false">
 				<label>Refresh Time</label>
 				<description>Time in seconds after which the channel is refreshed</description>
 				<default>300</default>
 				<unitLabel>s</unitLabel>
-				<required>false</required>
 			</parameter>
 		</config-description>
 	</channel-type>
@@ -47,17 +43,15 @@
 		<description>Allows direct access to the OWFS</description>
 		<state readOnly="true"/>
 		<config-description>
-			<parameter name="path" type="text">
+			<parameter name="path" type="text" required="true">
 				<label>OWFS Path</label>
 				<description>full path to the OWFS-node (e.g. statistics/errors/CRC8_errors)</description>
-				<required>true</required>
 			</parameter>
-			<parameter name="refresh" type="integer" min="1">
+			<parameter name="refresh" type="integer" min="1" required="false">
 				<label>Refresh Time</label>
 				<description>Time in seconds after which the channel is refreshed</description>
 				<default>300</default>
 				<unitLabel>s</unitLabel>
-				<required>false</required>
 			</parameter>
 		</config-description>
 	</channel-type>
diff --git a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/common.xml b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/common.xml
index 482c37f3eb..762237d359 100644
--- a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/common.xml
+++ b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/common.xml
@@ -23,11 +23,10 @@
 		<description>temperature value of this sensor</description>
 		<state readOnly="true" pattern="%.1f %unit%"/>
 		<config-description>
-			<parameter name="ignorepor" type="boolean">
+			<parameter name="ignorepor" type="boolean" required="false">
 				<label>Ignore POR-value</label>
 				<description>filters all 85°C readings (POR-value), may suppress valid readings if enabled</description>
 				<default>false</default>
-				<required>false</required>
 			</parameter>
 		</config-description>
 	</channel-type>
@@ -37,13 +36,12 @@
 		<description>temperature value of this sensor</description>
 		<state readOnly="true" pattern="%.1f %unit%"/>
 		<config-description>
-			<parameter name="ignorepor" type="boolean">
+			<parameter name="ignorepor" type="boolean" required="false">
 				<label>Ignore POR-value</label>
 				<description>filters all 85°C readings (POR-value), may suppress valid readings if enabled</description>
 				<default>false</default>
-				<required>false</required>
 			</parameter>
-			<parameter name="resolution" type="text">
+			<parameter name="resolution" type="text" required="false">
 				<label>Sensor Resolution</label>
 				<options>
 					<option value="9">9 bit</option>
@@ -53,7 +51,6 @@
 				</options>
 				<default>10</default>
 				<limitToOptions>true</limitToOptions>
-				<required>false</required>
 			</parameter>
 		</config-description>
 	</channel-type>
@@ -77,7 +74,7 @@
 		<description>relative humidity (0-100%)</description>
 		<state readOnly="true" pattern="%d %%"/>
 		<config-description>
-			<parameter name="humiditytype" type="text">
+			<parameter name="humiditytype" type="text" required="false">
 				<label>Humidity Sensor-Type</label>
 				<limitToOptions>true</limitToOptions>
 				<options>
@@ -87,7 +84,6 @@
 					<option value="/DATANAB/humidity">Datanab</option>
 				</options>
 				<default>/humidity</default>
-				<required>false</required>
 			</parameter>
 		</config-description>
 	</channel-type>
diff --git a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/multisensor.xml b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/multisensor.xml
index 3af91defdc..7d65617e27 100644
--- a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/multisensor.xml
+++ b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/thing/multisensor.xml
@@ -18,19 +18,17 @@
 		<label>Multisensor BMS</label>
 		<description>1-wire multisensor (DS2438-based)</description>
 		<config-description>
-			<parameter name="id" type="text">
+			<parameter name="id" type="text" required="true">
 				<label>TH(S) Sensor ID</label>
 				<description>Sensor ID of the DS2438 sensor in format: xx.xxxxxxxxxxxx or a full path including hubs/branches</description>
-				<required>true</required>
 			</parameter>
-			<parameter name="refresh" type="integer" min="1">
+			<parameter name="refresh" type="integer" min="1" required="false">
 				<label>Refresh Time</label>
 				<description>Time in seconds after which the thing is refreshed</description>
 				<default>300</default>
 				<unitLabel>s</unitLabel>
-				<required>false</required>
 			</parameter>
-			<parameter name="temperaturesensor" type="text">
+			<parameter name="temperaturesensor" type="text" required="false">
 				<label>Temperature Sensor</label>
 				<options>
 					<option value="DS2438">internal (DS2438)</option>
@@ -38,7 +36,6 @@
 				</options>
 				<default>DS2438</default>
 				<limitToOptions>true</limitToOptions>
-				<required>false</required>
 			</parameter>
 		</config-description>
 	</thing-type>
@@ -49,26 +46,23 @@
 		<label>Multisensor AMS</label>
 		<description>1-wire multisensor (DS2438-based)</description>
 		<config-description>
-			<parameter name="id" type="text">
+			<parameter name="id" type="text" required="true">
 				<label>TH(S) Sensor ID</label>
 				<description>Sensor ID of the DS2438 sensor in format: xx.xxxxxxxxxxxx or a full path including hubs/branches</description>
-				<required>true</required>
 			</parameter>
-			<parameter name="refresh" type="integer" min="1">
+			<parameter name="refresh" type="integer" min="1" required="false">
 				<label>Refresh Time for Analog Channels</label>
 				<description>Time in seconds after which the thing is refreshed</description>
 				<default>300</default>
 				<unitLabel>s</unitLabel>
-				<required>false</required>
 			</parameter>
-			<parameter name="refreshdigital" type="integer" min="1">
+			<parameter name="refreshdigital" type="integer" min="1" required="false">
 				<label>Refresh Time for Digital Channels</label>
 				<description>Time in seconds after which the digital I/Os are refreshed</description>
 				<default>10</default>
 				<unitLabel>s</unitLabel>
-				<required>false</required>
 			</parameter>
-			<parameter name="temperaturesensor" type="text">
+			<parameter name="temperaturesensor" type="text" required="false">
 				<label>Temperature Sensor</label>
 				<options>
 					<option value="DS2438">internal (DS2438)</option>
@@ -76,7 +70,6 @@
 				</options>
 				<default>DS2438</default>
 				<limitToOptions>true</limitToOptions>
-				<required>false</required>
 			</parameter>
 		</config-description>
 	</thing-type>
@@ -90,17 +83,15 @@
 			<property name="sensorCount">1</property>
 		</properties>
 		<config-description>
-			<parameter name="id" type="text">
+			<parameter name="id" type="text" required="true">
 				<label>Sensor ID</label>
 				<description>Sensor ID in format: xx.xxxxxxxxxxxx)</description>
-				<required>true</required>
 			</parameter>
-			<parameter name="refresh" type="integer" min="1">
+			<parameter name="refresh" type="integer" min="1" required="false">
 				<label>Refresh Time</label>
 				<description>Time in seconds after which the thing is refreshed</description>
 				<default>300</default>
 				<unitLabel>s</unitLabel>
-				<required>false</required>
 			</parameter>
 		</config-description>
 	</thing-type>