Fixes InMemory Implementation of filtering

Author: FriedJannik

basyx.aasrepository/basyx.aasrepository-http/src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/http/AasRepositoryHTTPSuite.java

@@ -43,7 +43,6 @@
 import org.apache.hc.core5.http.ProtocolException;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.DeserializationException;
-import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultAssetAdministrationShell;
 import org.eclipse.digitaltwin.basyx.http.Base64UrlEncodedIdentifier;
 import org.eclipse.digitaltwin.basyx.http.HttpBaSyxHeader;
 import org.eclipse.digitaltwin.basyx.http.pagination.Base64UrlEncodedCursor;
@@ -193,15 +192,25 @@ public void getAllAasWithIdShort() throws IOException, ParseException {
 	}
 
 	@Test
-	public void getAllAasWithMultipleAssetIds() throws IOException, ParseException {
+	public void getAllAasWithMultipleDifferentGlobalAssetIds() throws IOException, ParseException {
 		createMultipleAasOnServer();
-		CloseableHttpResponse retrievalResponse = getAllAasMultipleGlobalAssetIdsParam();
+		CloseableHttpResponse retrievalResponse = getAllAasMultipleDifferentGlobalAssetIdsParam();
 		assertEquals(HttpStatus.OK.value(), retrievalResponse.getCode());
 
 		String actualJsonFromServer = BaSyxHttpTestUtils.getResponseAsString(retrievalResponse);
 		BaSyxHttpTestUtils.assertSameJSONContent(getEmptyResultJSONString(), getJSONWithoutCursorInfo(actualJsonFromServer));
 	}
 
+	@Test
+	public void getAllAasWithMultipleIdenticalGlobalAssetIds() throws IOException, ParseException {
+		createMultipleAasOnServer();
+		CloseableHttpResponse retrievalResponse = getAllAasMultipleIdenticalGlobalAssetIdsParam();
+		assertEquals(HttpStatus.OK.value(), retrievalResponse.getCode());
+
+		String actualJsonFromServer = BaSyxHttpTestUtils.getResponseAsString(retrievalResponse);
+		BaSyxHttpTestUtils.assertSameJSONContent(getPaginatedAas1JSONString(), getJSONWithoutCursorInfo(actualJsonFromServer));
+	}
+
 	@Test
 	public void deleteAas() throws IOException {
 		createDummyAasOnServer(getAas1JSONString());
@@ -503,10 +512,14 @@ protected CloseableHttpResponse getAllAasGlobalAssetIdsParam() throws IOExceptio
 		return BaSyxHttpTestUtils.executeGetOnURL(getURL()+"?assetIds=ew0KIm5hbWUiOiJnbG9iYWxBc3NldElkIiwNCiJ2YWx1ZSI6Imdsb2JhbEFzc2V0SWQiDQp9");
 	}
 
-	protected CloseableHttpResponse getAllAasMultipleGlobalAssetIdsParam() throws IOException {
+	protected CloseableHttpResponse getAllAasMultipleDifferentGlobalAssetIdsParam() throws IOException {
 		return BaSyxHttpTestUtils.executeGetOnURL(getURL()+"?assetIds=ew0KIm5hbWUiOiJnbG9iYWxBc3NldElkIiwNCiJ2YWx1ZSI6Imdsb2JhbEFzc2V0SWQiDQp9&assetIds=ew0KIm5hbWUiOiJnbG9iYWxBc3NldElkIiwNCiJ2YWx1ZSI6ImR1bW15QWFzQXNzZXRJZCINCn0");
 	}
 
+	protected CloseableHttpResponse getAllAasMultipleIdenticalGlobalAssetIdsParam() throws IOException {
+		return BaSyxHttpTestUtils.executeGetOnURL(getURL()+"?assetIds=ew0KIm5hbWUiOiJnbG9iYWxBc3NldElkIiwNCiJ2YWx1ZSI6Imdsb2JhbEFzc2V0SWQiDQp9&assetIds=ew0KIm5hbWUiOiJnbG9iYWxBc3NldElkIiwNCiJ2YWx1ZSI6Imdsb2JhbEFzc2V0SWQiDQp9");
+	}
+
 	protected CloseableHttpResponse getAllAasIdShortParam() throws IOException {
 		return BaSyxHttpTestUtils.executeGetOnURL(getURL()+"?idShort=ExampleMotor");
 	}

basyx.aasservice/basyx.aasservice-backend-inmemory/src/main/java/org/eclipse/digitaltwin/basyx/aasservice/backend/InMemoryAasBackend.java

@@ -35,6 +35,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.TreeMap;
@@ -115,12 +116,9 @@ public AssetInformation getAssetInformation(String aasId) {
 	public Iterable<AssetAdministrationShell> getAllAas(List<SpecificAssetId> assetIds, String idShort) {
 		Iterable<AssetAdministrationShell> allAas = findAll();
 		List<AssetAdministrationShell> filteredAas = new java.util.ArrayList<>();
-		String globalAssetId = null;
+		List<SpecificAssetId> globalAssetIds = new ArrayList<>();
 		try {
-			if(assetIds.stream().filter(assetId -> assetId.getName().equals("globalAssetId")).count() > 1){
-				return filteredAas;
-			}
-			globalAssetId = assetIds.stream().filter(assetId -> assetId.getName().equals("globalAssetId")).findFirst().get().getValue();
+			globalAssetIds = assetIds.stream().filter(assetId -> assetId.getName().equals("globalAssetId")).toList();
 			assetIds = assetIds.stream().filter(assetId -> !assetId.getName().equals("globalAssetId")).collect(Collectors.toList());
 		} catch (Exception e) {}
 		for (AssetAdministrationShell aas : allAas){
@@ -132,7 +130,16 @@ public Iterable<AssetAdministrationShell> getAllAas(List<SpecificAssetId> assetI
 				matchesAssetIds = false;
 			}
 			boolean matchesIdShort = (idShort == null || aas.getIdShort().equals(idShort));
-			boolean matchesGlobalAssetId = (globalAssetId == null || (aas.getAssetInformation() != null && aas.getAssetInformation().getGlobalAssetId() != null && aas.getAssetInformation().getGlobalAssetId().equals(globalAssetId)));
+			boolean matchesGlobalAssetId = globalAssetIds.isEmpty();
+			for (SpecificAssetId globalAssetId : globalAssetIds){
+				String id = globalAssetId.getValue();
+				if (aas.getAssetInformation().getGlobalAssetId().equals(id)){
+					matchesGlobalAssetId = true;
+				} else {
+					matchesGlobalAssetId = false;
+					break;
+				}
+			}
 			if (matchesAssetIds && matchesIdShort && matchesGlobalAssetId) {
 				filteredAas.add(aas);
 			}