Fixes failing tests

Author: aaronzi

basyx.aasservice/basyx.aasservice-feature-mqtt/src/test/java/org/eclipse/digitaltwin/basyx/aasservice/feature/mqtt/TestMqttAasService.java

@@ -46,8 +46,8 @@
 import org.eclipse.digitaltwin.basyx.aasservice.backend.InMemoryAasBackend;
 import org.eclipse.digitaltwin.basyx.common.mqttcore.encoding.URLEncoder;
 import org.eclipse.digitaltwin.basyx.common.mqttcore.listener.MqttTestListener;
-import org.eclipse.digitaltwin.basyx.core.filerepository.FileMetadata;
 import org.eclipse.digitaltwin.basyx.core.filerepository.FileRepository;
+import org.eclipse.digitaltwin.basyx.core.filerepository.FileRepositoryHelper;
 import org.eclipse.digitaltwin.basyx.core.filerepository.InMemoryFileRepository;
 import org.eclipse.digitaltwin.basyx.http.Aas4JHTTPSerializationExtension;
 import org.eclipse.digitaltwin.basyx.http.BaSyxHTTPConfiguration;
@@ -109,9 +109,7 @@ protected AasService getAasServiceWithThumbnail() throws IOException {
 		AssetAdministrationShell expected = DummyAssetAdministrationShellFactory.createForThumbnail();
 		AasService aasServiceWithThumbnail = getAasService(expected);
 
-		FileMetadata defaultThumbnail = new FileMetadata("dummyImgA.jpeg", "", createDummyImageIS_A());
-		
-		String thumbnailFilePath = fileRepository.save(defaultThumbnail);
+		String thumbnailFilePath = FileRepositoryHelper.saveOrOverwriteFile(fileRepository, "dummyImgA.jpeg", "", createDummyImageIS_A());
 
 		Resource defaultResource = new DefaultResource.Builder().path(thumbnailFilePath).contentType("").build();
 		AssetInformation defaultAasAssetInformation = aasServiceWithThumbnail.getAssetInformation();

basyx.submodelregistry/basyx.submodelregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/submodelregistry/service/tests/integration/BaseIntegrationTest.java

@@ -143,8 +143,14 @@ protected void cleanup() throws ApiException, InterruptedException, Deserializat
 		adapter.assertNoAdditionalMessages();
 		GetSubmodelDescriptorsResult result = api.getAllSubmodelDescriptors(null, null);
 		for (SubmodelDescriptor eachDescriptor : result.getResult()) {
-			api.deleteSubmodelDescriptorById(eachDescriptor.getId());
-			assertThatEventWasSend(RegistryEvent.builder().id(eachDescriptor.getId()).type(EventType.SUBMODEL_UNREGISTERED).build());
+			try {
+				api.deleteSubmodelDescriptorById(eachDescriptor.getId());
+				assertThatEventWasSend(RegistryEvent.builder().id(eachDescriptor.getId()).type(EventType.SUBMODEL_UNREGISTERED).build());
+			} catch (ApiException e) {
+				if (e.getCode() != NOT_FOUND) {
+					throw e;
+				}
+			}
 		}
 	}
 

basyx.submodelrepository/basyx.submodelrepository-feature-authorization/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/authorization/AuthorizedSubmodelRepository.java

@@ -309,6 +309,11 @@ public InputStream getFileByFilePath(String submodelId, String filePath) {
 		return decorated.getFileByFilePath(submodelId, filePath);
 	}
 
+	@Override
+	public String getOriginalFileNameByPath(String submodelId, String idShortPath) {
+		return decorated.getOriginalFileNameByPath(submodelId, idShortPath);
+	}
+
 	private List<String> getIdAsList(String id) {
 		return new ArrayList<>(Arrays.asList(id));
 	}

basyx.submodelrepository/basyx.submodelrepository-feature-kafka/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/kafka/KafkaSubmodelRepository.java

@@ -196,6 +196,11 @@ public InputStream getFileByFilePath(String submodelId, String filePath) {
 		return decorated.getFileByFilePath(submodelId, filePath);
 	}
 
+	@Override
+	public String getOriginalFileNameByPath(String submodelId, String idShortPath) {
+		return decorated.getOriginalFileNameByPath(submodelId, idShortPath);
+	}
+
 	@Override
 	public CursorResult<List<Submodel>> getAllSubmodels(String semanticId, PaginationInfo pInfo) {
 		return decorated.getAllSubmodels(semanticId, pInfo);

basyx.submodelrepository/basyx.submodelrepository-feature-mqtt/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/mqtt/MqttSubmodelRepository.java

@@ -202,6 +202,11 @@ public InputStream getFileByFilePath(String submodelId, String filePath) {
 		return decorated.getFileByFilePath(submodelId, filePath);
 	}
 
+	@Override
+	public String getOriginalFileNameByPath(String submodelId, String idShortPath) {
+		return decorated.getOriginalFileNameByPath(submodelId, idShortPath);
+	}
+
 	private void submodelCreated(Submodel submodel, String repoId) {
 		sendMqttMessage(topicFactory.createCreateSubmodelTopic(repoId), SubmodelSerializer.serializeSubmodel(submodel));
 	}

basyx.submodelrepository/basyx.submodelrepository-feature-operation-delegation/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/operation/delegation/OperationDelegationSubmodelRepository.java

@@ -184,4 +184,9 @@ public InputStream getFileByFilePath(String submodelId, String filePath) {
 		return decorated.getFileByFilePath(submodelId, filePath);
 	}
 
+	@Override
+	public String getOriginalFileNameByPath(String submodelId, String idShortPath) {
+		return decorated.getOriginalFileNameByPath(submodelId, idShortPath);
+	}
+
 }

basyx.submodelrepository/basyx.submodelrepository-feature-registry-integration/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/registry/integration/RegistryIntegrationSubmodelRepository.java

@@ -233,4 +233,9 @@ public InputStream getFileByFilePath(String submodelId, String filePath) {
 		return decorated.getFileByFilePath(submodelId, filePath);
 	}
 
+	@Override
+	public String getOriginalFileNameByPath(String submodelId, String idShortPath) {
+		return decorated.getOriginalFileNameByPath(submodelId, idShortPath);
+	}
+
 }

basyx.submodelrepository/basyx.submodelrepository-feature-search/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/search/SearchSubmodelRepository.java

@@ -183,6 +183,11 @@ public InputStream getFileByFilePath(String submodelId, String filePath) {
 		return decorated.getFileByFilePath(submodelId, filePath);
 	}
 
+	@Override
+	public String getOriginalFileNameByPath(String submodelId, String idShortPath) {
+		return decorated.getOriginalFileNameByPath(submodelId, idShortPath);
+	}
+
 	private void indexSM(Submodel submodel) {
 		try {
 			JsonNode normalizedSubmodel = IndexNormalizer.toIndexable(submodel);