demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

YAML things: clean map when removing the last elements for a model (#4763)

Browse Source 
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo
2025-04-30 22:14:13 +02:00
committed by GitHub
parent 3404384c47
commit a65b9a4b83
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/things/YamlThingProvider.java
+7 -6
View File
@@ -227,8 +227,7 @@ public class YamlThingProvider extends AbstractProvider<Thing>
@Override
public void removedModel(String modelName, Collection<YamlThingDTO> elements) {
List<Thing> removed = elements.stream().map(this::mapThing).filter(Objects::nonNull).toList();
Collection<Thing> modelThings = Objects
.requireNonNull(thingsMap.computeIfAbsent(modelName, k -> new ArrayList<>()));
Collection<Thing> modelThings = thingsMap.getOrDefault(modelName, List.of());
removed.forEach(t -> {
modelThings.stream().filter(th -> th.getUID().equals(t.getUID())).findFirst().ifPresentOrElse(oldThing -> {
modelThings.remove(oldThing);
@@ -236,6 +235,9 @@ public class YamlThingProvider extends AbstractProvider<Thing>
notifyListenersAboutRemovedElement(oldThing);
}, () -> logger.debug("model {} thing {} not found", modelName, t.getUID()));
});
if (modelThings.isEmpty()) {
thingsMap.remove(modelName);
}
}
@Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC)
@@ -357,8 +359,7 @@ public class YamlThingProvider extends AbstractProvider<Thing>
Map<String, YamlChannelDTO> channelsDto, List<ChannelDefinition> channelDefinitions) {
Set<String> addedChannelIds = new HashSet<>();
List<Channel> channels = new ArrayList<>();
channelsDto.entrySet().forEach(entry -> {
YamlChannelDTO channelDto = entry.getValue();
channelsDto.forEach((channelId, channelDto) -> {
ChannelTypeUID channelTypeUID = null;
ChannelKind kind = channelDto.getKind();
String itemType = channelDto.getItemType();
@@ -386,11 +387,11 @@ public class YamlThingProvider extends AbstractProvider<Thing>
}
}
Channel channel = ChannelBuilder.create(new ChannelUID(thingUID, entry.getKey()), itemType).withKind(kind)
Channel channel = ChannelBuilder.create(new ChannelUID(thingUID, channelId), itemType).withKind(kind)
.withConfiguration(configuration).withType(channelTypeUID).withLabel(label)
.withAutoUpdatePolicy(autoUpdatePolicy).build();
channels.add(channel);
addedChannelIds.add(entry.getKey());
addedChannelIds.add(channelId);
});
channelDefinitions.forEach(channelDef -> {