[deconz] fix gateway discovery (#9362)

Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>

diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/discovery/BridgeDiscoveryParticipant.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/discovery/BridgeDiscoveryParticipant.java
index bcaf26a06102f5578c5a3e6d6e164a2794e647eb..42047927055a22df8ea5f5d3a90001c120834be9 100644 (file)
--- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/discovery/BridgeDiscoveryParticipant.java
+++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/discovery/BridgeDiscoveryParticipant.java
@@ -14,6 +14,7 @@ package org.openhab.binding.deconz.internal.discovery;
 
 import static org.openhab.binding.deconz.internal.BindingConstants.*;
 
+import java.net.URI;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Map;
@@ -23,6 +24,7 @@ import java.util.TreeMap;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.jupnp.model.meta.DeviceDetails;
+import org.jupnp.model.meta.ManufacturerDetails;
 import org.jupnp.model.meta.RemoteDevice;
 import org.openhab.core.config.discovery.DiscoveryResult;
 import org.openhab.core.config.discovery.DiscoveryResultBuilder;
@@ -67,7 +69,7 @@ public class BridgeDiscoveryParticipant implements UpnpDiscoveryParticipant {
         // Add host+port
         String host = descriptorURL.getHost();
         int port = descriptorURL.getPort();
-        name = name + " (" + host + ":" + String.valueOf(port) + ")";
+        name = name + " (" + host + ":" + port + ")";
 
         Map<String, Object> properties = new TreeMap<>();
 
@@ -82,9 +84,15 @@ public class BridgeDiscoveryParticipant implements UpnpDiscoveryParticipant {
     @Override
     public @Nullable ThingUID getThingUID(RemoteDevice device) {
         DeviceDetails details = device.getDetails();
-        if (details != null && details.getManufacturerDetails() != null
-                && "dresden elektronik".equals(details.getManufacturerDetails().getManufacturer())) {
-            return new ThingUID(BRIDGE_TYPE, details.getSerialNumber());
+        if (details != null) {
+            ManufacturerDetails manufacturerDetails = details.getManufacturerDetails();
+            if (manufacturerDetails != null) {
+                URI manufacturerUri = manufacturerDetails.getManufacturerURI();
+                if ((manufacturerUri != null && manufacturerUri.toString().contains("dresden"))
+                        || "dresden elektronik".equals(manufacturerDetails.getManufacturer())) {
+                    return new ThingUID(BRIDGE_TYPE, details.getSerialNumber());
+                }
+            }
         }
         return null;
     }