From c4c692a74bc097f4533b7138335fc101dd16051c Mon Sep 17 00:00:00 2001 From: morph166955 <53797132+morph166955@users.noreply.github.com> Date: Sun, 14 Jan 2024 10:47:20 -0600 Subject: [PATCH] [androidtv] Resolves discovery issues (#16264) Signed-off-by: Ben Rosenblum --- .../discovery/GoogleTVDiscoveryParticipant.java | 17 ++++++++--------- .../discovery/ShieldTVDiscoveryParticipant.java | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/discovery/GoogleTVDiscoveryParticipant.java b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/discovery/GoogleTVDiscoveryParticipant.java index eae5b03aa0..ed4c239b27 100644 --- a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/discovery/GoogleTVDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/discovery/GoogleTVDiscoveryParticipant.java @@ -15,7 +15,6 @@ package org.openhab.binding.androidtv.internal.discovery; import static org.openhab.binding.androidtv.internal.AndroidTVBindingConstants.*; import java.net.InetAddress; -import java.util.Map; import java.util.Set; import javax.jmdns.ServiceInfo; @@ -45,7 +44,7 @@ public class GoogleTVDiscoveryParticipant implements MDNSDiscoveryParticipant { @Override public Set getSupportedThingTypeUIDs() { - return SUPPORTED_THING_TYPES; + return Set.of(THING_TYPE_GOOGLETV); } @Override @@ -54,8 +53,8 @@ public class GoogleTVDiscoveryParticipant implements MDNSDiscoveryParticipant { } @Override - public @Nullable DiscoveryResult createResult(@Nullable ServiceInfo service) { - if ((service == null) || !service.hasData()) { + public @Nullable DiscoveryResult createResult(ServiceInfo service) { + if (!service.hasData()) { return null; } @@ -79,9 +78,9 @@ public class GoogleTVDiscoveryParticipant implements MDNSDiscoveryParticipant { if (uid != null) { final String id = uid.getId(); final String label = service.getName() + " (" + id + ")"; - final Map properties = Map.of(PARAMETER_IP_ADDRESS, ipAddress); - - return DiscoveryResultBuilder.create(uid).withProperties(properties).withLabel(label).build(); + return DiscoveryResultBuilder.create(uid).withLabel(label) + .withRepresentationProperty(PARAMETER_IP_ADDRESS).withProperty(PARAMETER_IP_ADDRESS, ipAddress) + .build(); } else { return null; } @@ -91,8 +90,8 @@ public class GoogleTVDiscoveryParticipant implements MDNSDiscoveryParticipant { } @Override - public @Nullable ThingUID getThingUID(@Nullable ServiceInfo service) { - if ((service == null) || !service.hasData() || (service.getPropertyString("bt") == null)) { + public @Nullable ThingUID getThingUID(ServiceInfo service) { + if (!service.hasData() || (service.getPropertyString("bt") == null)) { return null; } diff --git a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/discovery/ShieldTVDiscoveryParticipant.java b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/discovery/ShieldTVDiscoveryParticipant.java index 428367fbc9..8a2eaaf2e1 100644 --- a/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/discovery/ShieldTVDiscoveryParticipant.java +++ b/bundles/org.openhab.binding.androidtv/src/main/java/org/openhab/binding/androidtv/internal/discovery/ShieldTVDiscoveryParticipant.java @@ -15,7 +15,6 @@ package org.openhab.binding.androidtv.internal.discovery; import static org.openhab.binding.androidtv.internal.AndroidTVBindingConstants.*; import java.net.InetAddress; -import java.util.Map; import java.util.Set; import javax.jmdns.ServiceInfo; @@ -45,7 +44,7 @@ public class ShieldTVDiscoveryParticipant implements MDNSDiscoveryParticipant { @Override public Set getSupportedThingTypeUIDs() { - return SUPPORTED_THING_TYPES; + return Set.of(THING_TYPE_SHIELDTV); } @Override @@ -54,8 +53,8 @@ public class ShieldTVDiscoveryParticipant implements MDNSDiscoveryParticipant { } @Override - public @Nullable DiscoveryResult createResult(@Nullable ServiceInfo service) { - if (service == null || !service.hasData()) { + public @Nullable DiscoveryResult createResult(ServiceInfo service) { + if (!service.hasData()) { return null; } @@ -81,9 +80,9 @@ public class ShieldTVDiscoveryParticipant implements MDNSDiscoveryParticipant { if (uid != null) { final String id = uid.getId(); final String label = service.getName() + " (" + id + ")"; - final Map properties = Map.of(PARAMETER_IP_ADDRESS, ipAddress); - - return DiscoveryResultBuilder.create(uid).withProperties(properties).withLabel(label).build(); + return DiscoveryResultBuilder.create(uid).withLabel(label) + .withRepresentationProperty(PARAMETER_IP_ADDRESS).withProperty(PARAMETER_IP_ADDRESS, ipAddress) + .build(); } else { return null; } @@ -93,8 +92,8 @@ public class ShieldTVDiscoveryParticipant implements MDNSDiscoveryParticipant { } @Override - public @Nullable ThingUID getThingUID(@Nullable ServiceInfo service) { - if (service == null || !service.hasData() || (service.getPropertyString("SERVER") == null)) { + public @Nullable ThingUID getThingUID(ServiceInfo service) { + if (!service.hasData() || (service.getPropertyString("SERVER") == null)) { return null; } -- 2.47.3