fix property and capability handling

Signed-off-by: Bernd Weymann <bernd.weymann@gmail.com>

Author: weymann

bundles/org.openhab.binding.dirigera/pom.xml

@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 

bundles/org.openhab.binding.dirigera/src/main/java/org/openhab/binding/dirigera/internal/handler/BaseHandler.java

@@ -218,6 +218,16 @@ public void bridgeStatusChanged(ThingStatusInfo bridgeStatusInfo) {
     protected void updateProperties() {
         // fill canSend and canReceive capabilities
         Map<String, Object> modelProperties = gateway().model().getPropertiesFor(config.id);
+        addCapabilities(config.id);
+        TreeMap<String, String> handlerProperties = new TreeMap<>(editProperties());
+        modelProperties.forEach((key, value) -> {
+            handlerProperties.put(key, value.toString());
+        });
+        updateProperties(handlerProperties);
+    }
+
+    protected void addCapabilities(String id) {
+        Map<String, Object> modelProperties = gateway().model().getPropertiesFor(id);
         Object canReceiveCapabilities = modelProperties.get(CAPABILITIES_KEY_CAN_RECEIVE);
         if (canReceiveCapabilities instanceof JSONArray jsonArray) {
             jsonArray.forEach(capability -> {
@@ -234,12 +244,6 @@ protected void updateProperties() {
                 }
             });
         }
-
-        TreeMap<String, String> handlerProperties = new TreeMap<>(editProperties());
-        modelProperties.forEach((key, value) -> {
-            handlerProperties.put(key, value.toString());
-        });
-        updateProperties(handlerProperties);
     }
 
     /**

bundles/org.openhab.binding.dirigera/src/main/java/org/openhab/binding/dirigera/internal/handler/light/LightSetHandler.java

@@ -18,6 +18,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -81,7 +82,26 @@ public void initializeDevice() {
         memberReachability.clear();
         memberDeviceIds.forEach(id -> memberReachability.put(id, false));
 
-        updateProperties();
+        // special handling for device set properties - add for each device in set their individual canReceive and
+        // canSend properties
+        receiveCapabilities.clear();
+        sendCapabilities.clear();
+        memberDeviceIds.forEach(id -> {
+            Map<String, Object> modelProperties = gateway().model().getPropertiesFor(id);
+            Object customName = gateway().model().getCustonNameFor(id);
+
+            TreeMap<String, String> handlerProperties = new TreeMap<>(editProperties());
+            Object receiveCapabilities = modelProperties.get(CAPABILITIES_KEY_CAN_RECEIVE);
+            handlerProperties.put(customName + " " + CAPABILITIES_KEY_CAN_RECEIVE,
+                    receiveCapabilities != null ? receiveCapabilities.toString() : "[]");
+            Object sendCapabilities = modelProperties.get(CAPABILITIES_KEY_CAN_SEND);
+            handlerProperties.put(customName + " " + CAPABILITIES_KEY_CAN_SEND,
+                    sendCapabilities != null ? sendCapabilities.toString() : "[]");
+            updateProperties(handlerProperties);
+            // properties updated and user is able to check all devices in the set and their capabilities, now add the
+            // capabilities to the set itself
+            addCapabilities(id);
+        });
 
         // 2) Initialize the set's own customName from the model so that subsequent member
         // updates (which carry the member's own customName) cannot overwrite it.