diff --git a/basyx.aasenvironment/basyx.aasenvironment-core/src/main/java/org/eclipse/digitaltwin/basyx/aasenvironment/ConceptDescriptionIdCollector.java b/basyx.aasenvironment/basyx.aasenvironment-core/src/main/java/org/eclipse/digitaltwin/basyx/aasenvironment/ConceptDescriptionIdCollector.java index 8f83c731b..27e14c39e 100644 --- a/basyx.aasenvironment/basyx.aasenvironment-core/src/main/java/org/eclipse/digitaltwin/basyx/aasenvironment/ConceptDescriptionIdCollector.java +++ b/basyx.aasenvironment/basyx.aasenvironment-core/src/main/java/org/eclipse/digitaltwin/basyx/aasenvironment/ConceptDescriptionIdCollector.java @@ -290,11 +290,7 @@ public void visit(Operation operation) { } private Set getConceptDescriptionIds(List keys) { - return keys.stream().filter(this::isKeyOfTypeCD).map(Key::getValue).collect(Collectors.toSet()); - } - - private boolean isKeyOfTypeCD(Key key) { - return key.getType().equals(KeyTypes.CONCEPT_DESCRIPTION); + return keys.stream().map(Key::getValue).collect(Collectors.toSet()); } } diff --git a/basyx.aasenvironment/basyx.aasenvironment-core/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/TestConceptDescriptionIdCollector.java b/basyx.aasenvironment/basyx.aasenvironment-core/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/TestConceptDescriptionIdCollector.java index 9b7f92c67..21bf9dae9 100644 --- a/basyx.aasenvironment/basyx.aasenvironment-core/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/TestConceptDescriptionIdCollector.java +++ b/basyx.aasenvironment/basyx.aasenvironment-core/src/test/java/org/eclipse/digitaltwin/basyx/aasenvironment/TestConceptDescriptionIdCollector.java @@ -38,7 +38,7 @@ public class TestConceptDescriptionIdCollector { public void getAllConceptDescriptionIdsWithDefaultSetup() { defaultSetup(); - Set expectedCDIDs = Sets.newHashSet("0173-1#02-BAA120#008", "http://customer.com/cd/1/1/18EBD56F6B43D895"); + Set expectedCDIDs = Sets.newHashSet("0173-1#02-BAA120#008", "http://customer.com/cd/1/1/18EBD56F6B43D895","0173-1#01-AFZ615#016"); ConceptDescriptionIdCollector cdIdCollector = new ConceptDescriptionIdCollector(environment); @@ -49,7 +49,7 @@ public void getAllConceptDescriptionIdsWithDefaultSetup() { public void getAllConceptDescriptionIdsWithCustomtSetup() { customSetup(); - Set expectedCDIDs = Sets.newHashSet("dummyProperty1CDId", "dummySMC1CDId", "dummyProperty3CDId"); + Set expectedCDIDs = Sets.newHashSet("dummyProperty1CDId", "dummySMC1CDId", "dummyProperty3CDId","dummyProperty2CapabilityId","dummyNoCDSemanticPropertyBlobId"); ConceptDescriptionIdCollector cdIdCollector = new ConceptDescriptionIdCollector(environment);