Fixes problem with hardcoded contentType in AAS Env

aaronzi · aaronzi · commit c44e7629b1ba · 2025-06-28T00:41:13.000+02:00
diff --git a/basyx.aasenvironment/basyx.aasenvironment-core/src/main/java/org/eclipse/digitaltwin/basyx/aasenvironment/base/DefaultAASEnvironment.java b/basyx.aasenvironment/basyx.aasenvironment-core/src/main/java/org/eclipse/digitaltwin/basyx/aasenvironment/base/DefaultAASEnvironment.java
@@ -198,7 +198,8 @@ private void setFileToFileElement(String submodelId, List<SubmodelElement> fileS
 			return;
 		}
 
-		submodelRepository.setFileValue(submodelId, fileSMEIdShortPath, getFileName(inMemoryFile.getPath()), "application/octet-stream", new ByteArrayInputStream(inMemoryFile.getFileContent()));
+		String contentType = (fileSME.getContentType() != null && !fileSME.getContentType().trim().isEmpty()) ? fileSME.getContentType() : null;
+		submodelRepository.setFileValue(submodelId, fileSMEIdShortPath, getFileName(inMemoryFile.getPath()), contentType, new ByteArrayInputStream(inMemoryFile.getFileContent()));
 	}
 
 	private String getFileName(String path) {

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,8 @@ private void setFileToFileElement(String submodelId, List<SubmodelElement> fileS`
`198`	`198`	`return;`
`199`	`199`	`}`
`200`	`200`
`201`		`- submodelRepository.setFileValue(submodelId, fileSMEIdShortPath, getFileName(inMemoryFile.getPath()), "application/octet-stream", new ByteArrayInputStream(inMemoryFile.getFileContent()));`
	`201`	`+ String contentType = (fileSME.getContentType() != null && !fileSME.getContentType().trim().isEmpty()) ? fileSME.getContentType() : null;`
	`202`	`+ submodelRepository.setFileValue(submodelId, fileSMEIdShortPath, getFileName(inMemoryFile.getPath()), contentType, new ByteArrayInputStream(inMemoryFile.getFileContent()));`
`202`	`203`	`}`
`203`	`204`
`204`	`205`	`private String getFileName(String path) {`