Adds HTTP Tests

Author: FriedJannik

basyx.aasrepository/basyx.aasrepository-http/src/main/java/org/eclipse/digitaltwin/basyx/aasrepository/http/AasRepositoryApiHTTPController.java

@@ -38,6 +38,7 @@
 import org.eclipse.digitaltwin.aas4j.v3.model.AssetInformation;
 import org.eclipse.digitaltwin.aas4j.v3.model.Reference;
 import org.eclipse.digitaltwin.aas4j.v3.model.SpecificAssetId;
+import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultSpecificAssetId;
 import org.eclipse.digitaltwin.basyx.aasrepository.AasRepository;
 import org.eclipse.digitaltwin.basyx.aasrepository.http.pagination.GetAssetAdministrationShellsResult;
 import org.eclipse.digitaltwin.basyx.aasrepository.http.pagination.GetReferencesResult;
@@ -241,7 +242,7 @@ private List<SpecificAssetId> getDecodedSpecificAssetIds(List<Base64UrlEncodedId
 		for (Base64UrlEncodedIdentifier base64UrlEncodedIdentifier : assetIds) {
 
 			var decodedString = base64UrlEncodedIdentifier.getIdentifier();
-			result.add(objectMapper.readValue(decodedString, SpecificAssetId.class));
+			result.add(objectMapper.readValue(decodedString, DefaultSpecificAssetId.class));
 
 		}
 

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

@@ -43,6 +43,7 @@
 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;
@@ -148,19 +149,49 @@ public void getAllAasWhenEmpty() throws IOException {
 
 		assertEquals(HttpStatus.OK.value(), retrievalResponse.getCode());
 	}
-	
+
 	@Test
 	public void getAllPaginatedAas() throws IOException, ParseException {
 		createMultipleAasOnServer();
-		
+
 		CloseableHttpResponse retrievalResponse = getAllAas();
 		assertEquals(HttpStatus.OK.value(), retrievalResponse.getCode());
-		
+
 		String actualJsonFromServer = BaSyxHttpTestUtils.getResponseAsString(retrievalResponse);
-		
+
 		BaSyxHttpTestUtils.assertSameJSONContent(getPaginatedAasJSONString(), getJSONWithoutCursorInfo(actualJsonFromServer));
 	}
 
+	@Test
+	public void getAllAasWithAssetIds() throws IOException, ParseException {
+		createMultipleAasOnServer();
+		CloseableHttpResponse retrievalResponse = getAllAasAssetIdsParam();
+		assertEquals(HttpStatus.OK.value(), retrievalResponse.getCode());
+
+		String actualJsonFromServer = BaSyxHttpTestUtils.getResponseAsString(retrievalResponse);
+		BaSyxHttpTestUtils.assertSameJSONContent(getPaginatedAas1JSONString(), getJSONWithoutCursorInfo(actualJsonFromServer));
+	}
+
+	@Test
+	public void getAllAasWithGlobalAssetIds() throws IOException, ParseException {
+		createMultipleAasOnServer();
+		CloseableHttpResponse retrievalResponse = getAllAasGlobalAssetIdsParam();
+		assertEquals(HttpStatus.OK.value(), retrievalResponse.getCode());
+
+		String actualJsonFromServer = BaSyxHttpTestUtils.getResponseAsString(retrievalResponse);
+		BaSyxHttpTestUtils.assertSameJSONContent(getPaginatedAas1JSONString(), getJSONWithoutCursorInfo(actualJsonFromServer));
+	}
+
+	@Test
+	public void getAllAasWithIdShort() throws IOException, ParseException {
+		createMultipleAasOnServer();
+		CloseableHttpResponse retrievalResponse = getAllAasIdShortParam();
+		assertEquals(HttpStatus.OK.value(), retrievalResponse.getCode());
+
+		String actualJsonFromServer = BaSyxHttpTestUtils.getResponseAsString(retrievalResponse);
+		BaSyxHttpTestUtils.assertSameJSONContent(getPaginatedAas1JSONString(), getJSONWithoutCursorInfo(actualJsonFromServer));
+	}
+
 	@Test
 	public void deleteAas() throws IOException {
 		createDummyAasOnServer(getAas1JSONString());
@@ -450,6 +481,18 @@ protected CloseableHttpResponse getAllAas() throws IOException {
 		return BaSyxHttpTestUtils.executeGetOnURL(getURL());
 	}
 
+	protected CloseableHttpResponse getAllAasAssetIdsParam() throws IOException {
+		return BaSyxHttpTestUtils.executeGetOnURL(getURL()+"?assetIds=ew0KIm5hbWUiOiJ0ZXN0SWQiLA0KInZhbHVlIjoidGVzdFZhbHVlIg0KfQ");
+	}
+
+	protected CloseableHttpResponse getAllAasGlobalAssetIdsParam() throws IOException {
+		return BaSyxHttpTestUtils.executeGetOnURL(getURL()+"?assetIds=ew0KIm5hbWUiOiJnbG9iYWxBc3NldElkIiwNCiJ2YWx1ZSI6Imdsb2JhbEFzc2V0SWQiDQp9");
+	}
+
+	protected CloseableHttpResponse getAllAasIdShortParam() throws IOException {
+		return BaSyxHttpTestUtils.executeGetOnURL(getURL()+"?idShort=ExampleMotor");
+	}
+
 	private CloseableHttpResponse getSpecificAas(String aasId) throws IOException {
 		String url = getSpecificAasAccessURL(aasId);
 		return BaSyxHttpTestUtils.executeGetOnURL(url);

basyx.aasrepository/basyx.aasrepository-http/src/test/resources/AasSimple_1.json

@@ -4,6 +4,12 @@
 	"id": "customIdentifier",
 	"assetInformation": {
 		"assetKind": "Instance",
-		"globalAssetId": "globalAssetId"
+		"globalAssetId": "globalAssetId",
+		"specificAssetIds": [
+			{
+				"name": "testId",
+				"value": "testValue"
+			}
+		]
 	}
 }

basyx.aasrepository/basyx.aasrepository-http/src/test/resources/AllPaginatedAas.json

@@ -14,7 +14,8 @@
 			"modelType": "AssetAdministrationShell",
 			"assetInformation": {
 				"assetKind": "Instance",
-				"globalAssetId": "globalAssetId"
+				"globalAssetId": "globalAssetId",
+				"specificAssetIds":[{"name":"testId","value":"testValue"}]
 			},
 			"id": "customIdentifier",
 			"idShort": "ExampleMotor"

basyx.aasrepository/basyx.aasrepository-http/src/test/resources/PaginatedAasSimple_1.json

@@ -5,7 +5,8 @@
 			"modelType": "AssetAdministrationShell",
 			"assetInformation": {
 				"assetKind": "Instance",
-				"globalAssetId": "globalAssetId"
+				"globalAssetId": "globalAssetId",
+				"specificAssetIds":[{"name":"testId","value":"testValue"}]
 			},
 			"id": "customIdentifier",
 			"idShort": "ExampleMotor"

basyx.aasrepository/basyx.aasrepository-http/src/test/resources/assetInfoSimple.json

@@ -1,4 +1,5 @@
 {
 		"assetKind":"Instance",
-		"globalAssetId":"globalAssetId"
+		"globalAssetId":"globalAssetId",
+		"specificAssetIds":[{"name":"testId","value":"testValue"}]
 }