From a889ebe1a1a76e43cbc058308d8544e0595484d9 Mon Sep 17 00:00:00 2001 From: Andrew Fiddian-Green Date: Thu, 9 May 2024 09:42:54 +0100 Subject: [PATCH] [hue] Fix migration of API v1 legacy data to new v2 things (#16714) Signed-off-by: Andrew Fiddian-Green Signed-off-by: Ciprian Pascu --- .../hue/internal/console/HueCommandExtension.java | 1 - .../internal/discovery/Clip2ThingDiscoveryService.java | 1 - .../hue/internal/handler/Clip2BridgeHandler.java | 10 ++++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java index 5d13c84ef4d..2ac6a1240c9 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/console/HueCommandExtension.java @@ -203,7 +203,6 @@ public class HueCommandExtension extends AbstractConsoleCommandExtension impleme Optional legacyThingOptional = clip2BridgeHandler.getLegacyThing(idv1); if (legacyThingOptional.isPresent()) { Thing legacyThing = legacyThingOptional.get(); - thingId = legacyThing.getUID().getId(); String legacyLabel = legacyThing.getLabel(); thingLabel = Objects.nonNull(legacyLabel) ? legacyLabel : thingLabel; } diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/Clip2ThingDiscoveryService.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/Clip2ThingDiscoveryService.java index 63b014b0f73..6baced87b1f 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/Clip2ThingDiscoveryService.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/Clip2ThingDiscoveryService.java @@ -121,7 +121,6 @@ public class Clip2ThingDiscoveryService extends AbstractThingHandlerDiscoverySer if (legacyThingOptional.isPresent()) { Thing legacyThing = legacyThingOptional.get(); legacyThingUID = legacyThing.getUID().getAsString(); - thingId = legacyThing.getUID().getId(); String legacyLabel = legacyThing.getLabel(); thingLabel = Objects.nonNull(legacyLabel) ? legacyLabel : thingLabel; } diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2BridgeHandler.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2BridgeHandler.java index ec2ce89203b..3fdeeab9feb 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2BridgeHandler.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2BridgeHandler.java @@ -366,13 +366,11 @@ public class Clip2BridgeHandler extends BaseBridgeHandler { } ThingUID legacyBridgeUID = legacyBridge.get().getUID(); - return thingRegistry.getAll().stream() // + return thingRegistry.getAll().stream() .filter(thing -> legacyBridgeUID.equals(thing.getBridgeUID()) - && V1_THING_TYPE_UIDS.contains(thing.getThingTypeUID())) // - .filter(thing -> { - Object id = thing.getConfiguration().get(config); - return (id instanceof String) && targetIdV1.endsWith("/" + (String) id); - }).findFirst(); + && V1_THING_TYPE_UIDS.contains(thing.getThingTypeUID()) + && thing.getConfiguration().get(config) instanceof String id && targetIdV1.endsWith("/" + id)) + .findFirst(); } /**