Fixes Serialization of AAS Environment (eclipse-basyx#320)

geso02 · Jul 5, 2024 · 4dd6827 · 4dd6827
1 parent 27019a5
commit 4dd6827
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/...main/java/org/eclipse/digitaltwin/basyx/aasenvironment/ConceptDescriptionIdCollector.java b/...main/java/org/eclipse/digitaltwin/basyx/aasenvironment/ConceptDescriptionIdCollector.java
@@ -290,11 +290,7 @@ public void visit(Operation operation) {
 	}
 
 	private Set<String> getConceptDescriptionIds(List<Key> 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/.../java/org/eclipse/digitaltwin/basyx/aasenvironment/TestConceptDescriptionIdCollector.java b/.../java/org/eclipse/digitaltwin/basyx/aasenvironment/TestConceptDescriptionIdCollector.java
@@ -38,7 +38,7 @@ public class TestConceptDescriptionIdCollector {
 	public void getAllConceptDescriptionIdsWithDefaultSetup() {
 		defaultSetup();
 
-		Set<String> expectedCDIDs = Sets.newHashSet("0173-1#02-BAA120#008", "http://customer.com/cd/1/1/18EBD56F6B43D895");
+		Set<String> 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<String> expectedCDIDs = Sets.newHashSet("dummyProperty1CDId", "dummySMC1CDId", "dummyProperty3CDId");
+		Set<String> expectedCDIDs = Sets.newHashSet("dummyProperty1CDId", "dummySMC1CDId", "dummyProperty3CDId","dummyProperty2CapabilityId","dummyNoCDSemanticPropertyBlobId");
 
 		ConceptDescriptionIdCollector cdIdCollector = new ConceptDescriptionIdCollector(environment);