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

[DSL generator] Consider a bridge thing as bridge if it contains things (#4740)

Browse Source 
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo
2025-04-23 19:05:12 +02:00
committed by GitHub
parent d0308a2348
commit 46dcfa674d
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/fileconverter/DslThingFileConverter.java
+4 -3
View File
@@ -101,7 +101,8 @@ public class DslThingFileConverter extends AbstractThingFileGenerator {
boolean topLevel, List<Thing> onlyThings, Set<Thing> handledThings) {
ModelThing model;
ModelBridge modelBridge;
if (preferPresentationAsTree && thing instanceof Bridge bridge && !bridge.getThings().isEmpty()) {
List<Thing> childThings = getChildThings(thing, onlyThings);
if (preferPresentationAsTree && thing instanceof Bridge && !childThings.isEmpty()) {
modelBridge = ThingFactory.eINSTANCE.createModelBridge();
modelBridge.setBridge(true);
model = modelBridge;
@@ -135,8 +136,8 @@ public class DslThingFileConverter extends AbstractThingFileGenerator {
if (preferPresentationAsTree && modelBridge != null) {
modelBridge.setThingsHeader(false);
for (Thing child : getChildThings(thing)) {
if (onlyThings.contains(child) && !handledThings.contains(child)) {
for (Thing child : childThings) {
if (!handledThings.contains(child)) {
modelBridge.getThings()
.add(buildModelThing(child, hideDefaultParameters, true, false, onlyThings, handledThings));
}
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/fileconverter/AbstractThingFileGenerator.java
+7 -5
View File
@@ -63,16 +63,18 @@ public abstract class AbstractThingFileGenerator implements ThingFileGenerator {
}
/**
* Get the child things of a bridge thing, ordered by UID.
* Get the child things of a bridge thing amongst a list of things, ordered by UID.
*
* @param thing the thing
* @param fromThings the list of things to look for
* @return the sorted list of child things or an empty list if the thing is not a bridge thing
*/
protected List<Thing> getChildThings(Thing thing) {
protected List<Thing> getChildThings(Thing thing, List<Thing> fromThings) {
if (thing instanceof Bridge bridge) {
return bridge.getThings().stream().sorted((thing1, thing2) -> {
return thing1.getUID().getAsString().compareTo(thing2.getUID().getAsString());
}).collect(Collectors.toList());
return fromThings.stream().filter(th -> bridge.getUID().equals(th.getBridgeUID()))
.sorted((thing1, thing2) -> {
return thing1.getUID().getAsString().compareTo(thing2.getUID().getAsString());
}).collect(Collectors.toList());
}
return List.of();
}