Consolidate properties for compliance. (#11992)

Fixes #11991

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>

diff --git a/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnitBindingConstants.java b/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnitBindingConstants.java
index 7abfe5a706234e96decdccde4565a631fe93207a..87cd0bf75ac782dcbb7f5c6ce1c93b3a80bbe16a 100644 (file)
--- a/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnitBindingConstants.java
+++ b/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/DanfossAirUnitBindingConstants.java
@@ -35,8 +35,4 @@ public class DanfossAirUnitBindingConstants {
 
     // The thing type as a set
     public static Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Collections.singleton(THING_TYPE_AIRUNIT);
-
-    // Properties
-    public static String PROPERTY_UNIT_NAME = "Unit Name";
-    public static String PROPERTY_SERIAL = "Serial Number";
 }

diff --git a/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/handler/DanfossAirUnitHandler.java b/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/handler/DanfossAirUnitHandler.java
index 4a6af1245258445903eef2a029d7b63cbb7fec97..f815e3c84253a498dd1c49f5e015c23d842d2949 100644 (file)
--- a/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/handler/DanfossAirUnitHandler.java
+++ b/bundles/org.openhab.binding.danfossairunit/src/main/java/org/openhab/binding/danfossairunit/internal/handler/DanfossAirUnitHandler.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.binding.danfossairunit.internal.handler;
 
-import static org.openhab.binding.danfossairunit.internal.DanfossAirUnitBindingConstants.*;
-
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -184,8 +182,8 @@ public class DanfossAirUnitHandler extends BaseThingHandler {
 
         try {
             Map<String, String> properties = new HashMap<>(2);
-            properties.put(PROPERTY_UNIT_NAME, localAirUnit.getUnitName());
-            properties.put(PROPERTY_SERIAL, localAirUnit.getUnitSerialNumber());
+            properties.put(Thing.PROPERTY_MODEL_ID, localAirUnit.getUnitName());
+            properties.put(Thing.PROPERTY_SERIAL_NUMBER, localAirUnit.getUnitSerialNumber());
             updateProperties(properties);
             propertiesInitializedSuccessfully = true;
             updateStatus(ThingStatus.ONLINE);

diff --git a/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml
index 3873c72cd89fcd82dbe8b4a221a27eada758b80d..70831185a2c16335508ad2bed935e20b451c57c6 100644 (file)
--- a/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml
@@ -17,8 +17,7 @@
                        <channel-group id="service" typeId="service"/>
                </channel-groups>
                <properties>
-                       <property name="Unit Name">unknown</property>
-                       <property name="Serial Number">unknown</property>
+                       <property name="vendor">Danfoss</property>
                </properties>
                <config-description>
                        <parameter name="host" type="text" required="true">