OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
pull/4318/head
lolodomo 2024-07-14 20:28:11 +02:00 committed by GitHub
parent 98554af952
commit 9f80bbf0a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java
View File

@ -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<>()));