From 9f80bbf0a7e492eda715aec27fed0e9d8d808a8d Mon Sep 17 00:00:00 2001
From: lolodomo <lg.hc@free.fr>
Date: Sun, 14 Jul 2024 20:28:11 +0200
Subject: [PATCH] Add default scope to profile when loading items file (#4314)

* Add default scope to profile when loading items file

Fix #4277

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---
 .../internal/GenericItemChannelLinkProvider.java     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java
index 7a386b17a..0bdc017af 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java
@@ -30,6 +30,7 @@ import org.openhab.core.model.item.BindingConfigReader;
 import org.openhab.core.thing.ChannelUID;
 import org.openhab.core.thing.link.ItemChannelLink;
 import org.openhab.core.thing.link.ItemChannelLinkProvider;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -88,6 +89,17 @@ public class GenericItemChannelLinkProvider extends AbstractProvider<ItemChannel
         } catch (IllegalArgumentException e) {
             throw new BindingConfigParseException(e.getMessage());
         }
+
+        // Fix the configuration in case a profile is defined without any scope
+        if (configuration.containsKey("profile") && configuration.get("profile") instanceof String profile
+                && profile.indexOf(":") == -1) {
+            String fullProfile = ProfileTypeUID.SYSTEM_SCOPE + ":" + profile;
+            configuration.put("profile", fullProfile);
+            logger.info(
+                    "Profile '{}' for channel '{}' is missing the scope prefix, assuming the correct UID is '{}'. Check your configuration.",
+                    profile, channelUID, fullProfile);
+        }
+
         ItemChannelLink itemChannelLink = new ItemChannelLink(itemName, channelUIDObject, configuration);
 
         Set<String> itemNames = Objects.requireNonNull(contextMap.computeIfAbsent(context, k -> new HashSet<>()));