From addb990a5b70cbde057100af9627b44ef91e7a47 Mon Sep 17 00:00:00 2001
From: Christoph Weitkamp <github@christophweitkamp.de>
Date: Fri, 26 Nov 2021 23:01:44 +0100
Subject: [PATCH] Added representation-property to thing type definitions
 (#11640)

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
---
 .../discovery/AVMFritzUpnpDiscoveryParticipant.java | 13 ++++---------
 .../main/resources/OH-INF/thing/bridge-types.xml    |  4 ++++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzUpnpDiscoveryParticipant.java b/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzUpnpDiscoveryParticipant.java
index b9c2e1406..fa42200ce 100644
--- a/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzUpnpDiscoveryParticipant.java
+++ b/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzUpnpDiscoveryParticipant.java
@@ -16,7 +16,6 @@ import static org.openhab.binding.avmfritz.internal.AVMFritzBindingConstants.*;
 import static org.openhab.core.thing.Thing.PROPERTY_VENDOR;
 
 import java.util.Dictionary;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -28,6 +27,7 @@ import org.jupnp.model.meta.RemoteDevice;
 import org.openhab.core.config.discovery.DiscoveryResult;
 import org.openhab.core.config.discovery.DiscoveryResultBuilder;
 import org.openhab.core.config.discovery.upnp.UpnpDiscoveryParticipant;
+import org.openhab.core.config.discovery.upnp.internal.UpnpDiscoveryService;
 import org.openhab.core.thing.ThingTypeUID;
 import org.openhab.core.thing.ThingUID;
 import org.osgi.service.component.ComponentContext;
@@ -83,16 +83,11 @@ public class AVMFritzUpnpDiscoveryParticipant implements UpnpDiscoveryParticipan
             if (uid != null) {
                 logger.debug("discovered: {} ({}) at {}", device.getDisplayString(),
                         device.getDetails().getFriendlyName(), device.getIdentity().getDescriptorURL().getHost());
-
-                Map<String, Object> properties = new HashMap<>();
-                properties.put(CONFIG_IP_ADDRESS, device.getIdentity().getDescriptorURL().getHost());
-                properties.put(PROPERTY_VENDOR, device.getDetails().getManufacturerDetails().getManufacturer());
-
-                DiscoveryResult result = DiscoveryResultBuilder.create(uid).withProperties(properties)
+                return DiscoveryResultBuilder.create(uid)
+                        .withProperties(Map.of(CONFIG_IP_ADDRESS, device.getIdentity().getDescriptorURL().getHost(),
+                                PROPERTY_VENDOR, device.getDetails().getManufacturerDetails().getManufacturer()))
                         .withLabel(device.getDetails().getFriendlyName()).withRepresentationProperty(CONFIG_IP_ADDRESS)
                         .build();
-
-                return result;
             }
         }
         return null;
diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml
index 8823f8c37..a3aa44053 100644
--- a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml
+++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml
@@ -17,6 +17,8 @@
 			<channel id="apply_template" typeId="apply_template"/>
 		</channels>
 
+		<representation-property>ipAddress</representation-property>
+
 		<config-description-ref uri="bridge-type:avmfritz:fritzbox"/>
 	</bridge-type>
 
@@ -34,6 +36,8 @@
 			<channel id="outlet" typeId="outlet"/>
 		</channels>
 
+		<representation-property>ipAddress</representation-property>
+
 		<config-description-ref uri="bridge-type:avmfritz:fritzpowerline"/>
 	</bridge-type>
 </thing:thing-descriptions>