From 40c7f41eb5466961659088cabec50ea9e713dc07 Mon Sep 17 00:00:00 2001
From: Matt <mmyers75@icloud.com>
Date: Sat, 12 Jun 2021 14:03:43 -0400
Subject: [PATCH] [haywardomnilogic] Update unit formating (#10781)

* Update unit formating

Signed-off-by: Matt Myers <mmyers75@icloud.com>

* Updates per last review

Signed-off-by: Matt Myers <mmyers75@icloud.com>

* Updated units to decimal

Signed-off-by: Matt Myers <mmyers75@icloud.com>
---
 .../internal/handler/HaywardBackyardHandler.java          | 2 +-
 .../internal/handler/HaywardBridgeHandler.java            | 4 ++--
 .../internal/handler/HaywardChlorinatorHandler.java       | 4 ++--
 .../internal/handler/HaywardColorLogicHandler.java        | 2 +-
 .../internal/handler/HaywardFilterHandler.java            | 2 +-
 .../internal/handler/HaywardRelayHandler.java             | 2 +-
 .../internal/handler/HaywardVirtualHeaterHandler.java     | 2 +-
 .../src/main/resources/OH-INF/thing/backyard.xml          | 2 +-
 .../src/main/resources/OH-INF/thing/bow.xml               | 2 +-
 .../src/main/resources/OH-INF/thing/chlorinator.xml       | 8 ++++----
 .../src/main/resources/OH-INF/thing/filter.xml            | 4 ++--
 .../src/main/resources/OH-INF/thing/pump.xml              | 2 +-
 .../src/main/resources/OH-INF/thing/virtualHeater.xml     | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBackyardHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBackyardHandler.java
index 0419770ea4..20d6c305ff 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBackyardHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBackyardHandler.java
@@ -101,7 +101,7 @@ public class HaywardBackyardHandler extends HaywardThingHandler {
                             .evaluateXPath("/Response/Parameters//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.trace("Hayward getAlarm XML response: {}", xmlResponse);
                         return false;
                     }
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBridgeHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBridgeHandler.java
index 8e3d1d9919..13792f3e98 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBridgeHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBridgeHandler.java
@@ -186,7 +186,7 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
 
         status = evaluateXPath("/Response/Parameters//Parameter[@name='Status']/text()", xmlResponse).get(0);
 
-        if (!(status.equals("0"))) {
+        if (!("0".equals(status))) {
             logger.debug("Hayward Connection thing: Login XML response: {}", xmlResponse);
             return false;
         }
@@ -234,7 +234,7 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
 
         status = evaluateXPath("/Response/Parameters//Parameter[@name='Status']/text()", xmlResponse).get(0);
 
-        if (!(status.equals("0"))) {
+        if (!("0".equals(status))) {
             logger.debug("Hayward Connection thing: getSiteList XML response: {}", xmlResponse);
             return false;
         }
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardChlorinatorHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardChlorinatorHandler.java
index 0d1e12f7aa..8743f10728 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardChlorinatorHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardChlorinatorHandler.java
@@ -128,7 +128,7 @@ public class HaywardChlorinatorHandler extends HaywardThingHandler {
                 try {
                     switch (channelUID.getId()) {
                         case HaywardBindingConstants.CHANNEL_CHLORINATOR_ENABLE:
-                            if (cmdString.equals("1")) {
+                            if ("1".equals(cmdString)) {
                                 chlorCfgState = "3";
                                 chlorTimedPercent = this.chlorTimedPercent;
                             } else {
@@ -168,7 +168,7 @@ public class HaywardChlorinatorHandler extends HaywardThingHandler {
                     String status = bridgehandler.evaluateXPath("//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.debug("haywardCommand XML response: {}", xmlResponse);
                         return;
                     }
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardColorLogicHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardColorLogicHandler.java
index bb42b06eb9..ed98a1be63 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardColorLogicHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardColorLogicHandler.java
@@ -135,7 +135,7 @@ public class HaywardColorLogicHandler extends HaywardThingHandler {
                     String status = bridgehandler.evaluateXPath("//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.debug("haywardCommand XML response: {}", xmlResponse);
                         return;
                     }
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardFilterHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardFilterHandler.java
index b39740cd8d..edf7a96d33 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardFilterHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardFilterHandler.java
@@ -140,7 +140,7 @@ public class HaywardFilterHandler extends HaywardThingHandler {
                     String status = bridgehandler.evaluateXPath("//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.debug("haywardCommand XML response: {}", xmlResponse);
                         return;
                     }
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardRelayHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardRelayHandler.java
index f890cd8e70..c002d5acc1 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardRelayHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardRelayHandler.java
@@ -104,7 +104,7 @@ public class HaywardRelayHandler extends HaywardThingHandler {
                     String status = bridgehandler.evaluateXPath("//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.debug("haywardCommand XML response: {}", xmlResponse);
                         return;
                     }
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardVirtualHeaterHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardVirtualHeaterHandler.java
index 6ee8246a85..b06a7e96b2 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardVirtualHeaterHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardVirtualHeaterHandler.java
@@ -131,7 +131,7 @@ public class HaywardVirtualHeaterHandler extends HaywardThingHandler {
                     String status = bridgehandler.evaluateXPath("//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.debug("haywardCommand XML response: {}", xmlResponse);
                         return;
                     }
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/backyard.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/backyard.xml
index c947bc3077..16983ad515 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/backyard.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/backyard.xml
@@ -33,7 +33,7 @@
 		<item-type>Number:Temperature</item-type>
 		<label>Air Temp</label>
 		<description>Air Temp</description>
-		<state pattern="%1f %unit%" readOnly="true"/>
+		<state pattern="%d %unit%" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="backyardstatus">
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/bow.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/bow.xml
index aa594741bb..ca07c5cf92 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/bow.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/bow.xml
@@ -34,7 +34,7 @@
 		<item-type>Number:Temperature</item-type>
 		<label>Water Temp</label>
 		<description>Water Temp</description>
-		<state pattern="%1f %unit%" readOnly="true"/>
+		<state pattern="%d %unit%" readOnly="true"/>
 	</channel-type>
 
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/chlorinator.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/chlorinator.xml
index 4b77e92ca2..a0e6bd8849 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/chlorinator.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/chlorinator.xml
@@ -47,7 +47,7 @@
 		<item-type>Number:Dimensionless</item-type>
 		<label>Salt Output (%)</label>
 		<description>Current salt output setting for the chlorinator (%).</description>
-		<state min="0" max="100" step="1.0" pattern="%1f %unit%" readOnly="false"/>
+		<state min="0" max="100" step="1.0" pattern="%d %unit%" readOnly="false"/>
 	</channel-type>
 
 	<channel-type id="scMode">
@@ -84,20 +84,20 @@
 		<item-type>Number:Dimensionless</item-type>
 		<label>Average Salt Level</label>
 		<description>Average Salt Level</description>
-		<state pattern="%1f %unit%" readOnly="true"/>
+		<state pattern="%d %unit%" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="instantSaltLevel">
 		<item-type>Number:Dimensionless</item-type>
 		<label>Instant Salt Level</label>
 		<description>Instant Salt Level</description>
-		<state pattern="%1f %unit%" readOnly="true"/>
+		<state pattern="%d %unit%" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="status">
 		<item-type>Number</item-type>
 		<label>Status</label>
 		<description>Status</description>
-		<state pattern="%1f" readOnly="true"/>
+		<state pattern="%d" readOnly="true"/>
 	</channel-type>
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/filter.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/filter.xml
index 00529184bb..886904432d 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/filter.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/filter.xml
@@ -48,7 +48,7 @@
 		<item-type>Number:Dimensionless</item-type>
 		<label>Filter Speed</label>
 		<description>Filter Speed in %</description>
-		<state min="0" max="100" step="1.0" pattern="%1f %unit%" readOnly="false"/>
+		<state min="0" max="100" step="1.0" pattern="%d %unit%" readOnly="false"/>
 	</channel-type>
 
 	<channel-type id="filterState">
@@ -77,7 +77,7 @@
 		<item-type>Number:Dimensionless</item-type>
 		<label>Last Speed</label>
 		<description>Last Speed</description>
-		<state pattern="%1f %unit%" readOnly="true"/>
+		<state pattern="%d %unit%" readOnly="true"/>
 	</channel-type>
 
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/pump.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/pump.xml
index 16f1a094b6..d9e43f45e4 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/pump.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/pump.xml
@@ -31,7 +31,7 @@
 		<item-type>Number:Dimensionless</item-type>
 		<label>Pump Speed in %</label>
 		<description>Pump Speed</description>
-		<state min="0" max="100" step="1.0" pattern="%1f %unit%" readOnly="false"/>
+		<state min="0" max="100" step="1.0" pattern="%d %unit%" readOnly="false"/>
 	</channel-type>
 
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/virtualHeater.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/virtualHeater.xml
index 89d7d410c1..65c502e39d 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/virtualHeater.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/virtualHeater.xml
@@ -28,7 +28,7 @@
 		<label>Current Setpoint</label>
 		<description>Current Setpoint</description>
 		<category>Temperature</category>
-		<state min="65" max="90" step="1.0" pattern="%1f %unit%" readOnly="false"/>
+		<state min="65" max="90" step="1.0" pattern="%d %unit%" readOnly="false"/>
 	</channel-type>
 
 </thing:thing-descriptions>
-- 
2.47.3