From 968cc56452ce7291dd653c63dd2cded912955ad7 Mon Sep 17 00:00:00 2001 From: Kai Kreuzer Date: Wed, 15 Jan 2025 16:45:23 +0100 Subject: [PATCH] Fix nullable issue (#18109) Signed-off-by: Kai Kreuzer --- .../openhab/binding/nuki/internal/NukiHandlerFactory.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiHandlerFactory.java b/bundles/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiHandlerFactory.java index 1ba96428f25..39890a64f27 100644 --- a/bundles/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiHandlerFactory.java +++ b/bundles/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiHandlerFactory.java @@ -12,6 +12,8 @@ */ package org.openhab.binding.nuki.internal; +import java.util.UUID; + import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jetty.client.HttpClient; @@ -106,7 +108,7 @@ public class NukiHandlerFactory extends BaseThingHandlerFactory { } } - private @Nullable String createCallbackUrl(String id) { + private @Nullable String createCallbackUrl(@Nullable String id) { final String ipAddress = networkAddressService.getPrimaryIpv4HostAddress(); if (ipAddress == null) { logger.warn("No network interface could be found to get callback address"); @@ -118,7 +120,8 @@ public class NukiHandlerFactory extends BaseThingHandlerFactory { logger.warn("Cannot find port of the http service."); return null; } - String callbackUrl = NukiLinkBuilder.callbackUri(ipAddress, port, id).toString(); + String callbackUrl = NukiLinkBuilder + .callbackUri(ipAddress, port, id != null ? id : UUID.randomUUID().toString()).toString(); logger.trace("callbackUrl[{}]", callbackUrl); return callbackUrl; }