From 22dd4aecd8e756b56459d38aa904f8f387119787 Mon Sep 17 00:00:00 2001
From: Ethan Dye <mrtops03@gmail.com>
Date: Sun, 20 Jun 2021 12:26:55 -0600
Subject: [PATCH] [OmniLink] Simplify updating properties (#10889)

Signed-off-by: Ethan Dye <mrtops03@gmail.com>
---
 .../openhab/binding/omnilink/internal/TemperatureFormat.java | 2 +-
 .../omnilink/internal/handler/AudioSourceHandler.java        | 5 +----
 .../binding/omnilink/internal/handler/AudioZoneHandler.java  | 5 +----
 .../binding/omnilink/internal/handler/LockHandler.java       | 5 +----
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/TemperatureFormat.java b/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/TemperatureFormat.java
index 58f02afef..5f5abe697 100644
--- a/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/TemperatureFormat.java
+++ b/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/TemperatureFormat.java
@@ -72,7 +72,7 @@ public enum TemperatureFormat {
     public abstract int formatToOmni(float format);
 
     /**
-     * Get the number which identifies this format as defined by the omniprotocol.
+     * Get the number which identifies this format as defined by the OmniLink protocol.
      *
      * @return Number which identifies this temperature format.
      */
diff --git a/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/AudioSourceHandler.java b/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/AudioSourceHandler.java
index e5501cc60..b591bc685 100644
--- a/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/AudioSourceHandler.java
+++ b/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/AudioSourceHandler.java
@@ -14,7 +14,6 @@ package org.openhab.binding.omnilink.internal.handler;
 
 import static org.openhab.binding.omnilink.internal.OmnilinkBindingConstants.*;
 
-import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -84,9 +83,7 @@ public class AudioSourceHandler extends AbstractOmnilinkHandler {
                 .builder(bridgeHandler, ObjectPropertyRequests.AUDIO_SOURCE, thingID, 0).selectNamed().build();
 
         for (AudioSourceProperties audioSourceProperties : objectPropertyRequest) {
-            Map<String, String> properties = editProperties();
-            properties.put(THING_PROPERTIES_NAME, audioSourceProperties.getName());
-            updateProperties(properties);
+            updateProperty(THING_PROPERTIES_NAME, audioSourceProperties.getName());
         }
     }
 
diff --git a/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/AudioZoneHandler.java b/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/AudioZoneHandler.java
index 6a51b68f3..c141ebb33 100644
--- a/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/AudioZoneHandler.java
+++ b/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/AudioZoneHandler.java
@@ -14,7 +14,6 @@ package org.openhab.binding.omnilink.internal.handler;
 
 import static org.openhab.binding.omnilink.internal.OmnilinkBindingConstants.*;
 
-import java.util.Map;
 import java.util.Optional;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -80,9 +79,7 @@ public class AudioZoneHandler extends AbstractOmnilinkStatusHandler<ExtendedAudi
                 .builder(bridgeHandler, ObjectPropertyRequests.AUDIO_ZONE, thingID, 0).selectNamed().build();
 
         for (AudioZoneProperties audioZoneProperties : objectPropertyRequest) {
-            Map<String, String> properties = editProperties();
-            properties.put(THING_PROPERTIES_NAME, audioZoneProperties.getName());
-            updateProperties(properties);
+            updateProperty(THING_PROPERTIES_NAME, audioZoneProperties.getName());
         }
     }
 
diff --git a/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/LockHandler.java b/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/LockHandler.java
index 6c2bfa8f6..27b1a47ce 100644
--- a/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/LockHandler.java
+++ b/bundles/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/internal/handler/LockHandler.java
@@ -14,7 +14,6 @@ package org.openhab.binding.omnilink.internal.handler;
 
 import static org.openhab.binding.omnilink.internal.OmnilinkBindingConstants.*;
 
-import java.util.Map;
 import java.util.Optional;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -75,9 +74,7 @@ public class LockHandler extends AbstractOmnilinkStatusHandler<ExtendedAccessCon
                 .builder(bridgeHandler, ObjectPropertyRequests.LOCK, thingID, 0).selectNamed().build();
 
         for (AccessControlReaderProperties lockProperties : objectPropertyRequest) {
-            Map<String, String> properties = editProperties();
-            properties.put(THING_PROPERTIES_NAME, lockProperties.getName());
-            updateProperties(properties);
+            updateProperty(THING_PROPERTIES_NAME, lockProperties.getName());
         }
     }