Fixes problem with hardcoded contentType in AAS Env#792
Merged
aaronzi merged 1 commit intoeclipse-basyx:mainfrom Jun 27, 2025
Merged
Fixes problem with hardcoded contentType in AAS Env#792aaronzi merged 1 commit intoeclipse-basyx:mainfrom
aaronzi merged 1 commit intoeclipse-basyx:mainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR replaces the previous hardcoded “application/octet-stream” contentType in setFileToFileElement with a dynamic value pulled from the SubmodelElement’s contentType field, falling back to null if none is provided.
- Use the SubmodelElement’s
contentTypeinstead of a fixed value - Default to
nullwhencontentTypeis missing or blank
Comments suppressed due to low confidence (2)
basyx.aasenvironment/basyx.aasenvironment-core/src/main/java/org/eclipse/digitaltwin/basyx/aasenvironment/base/DefaultAASEnvironment.java:202
- [nitpick] Add unit tests for
setFileToFileElementcovering scenarios wherecontentTypeis provided, blank, or null to ensure the repository call behaves correctly in each case.
submodelRepository.setFileValue(submodelId, fileSMEIdShortPath, getFileName(inMemoryFile.getPath()), contentType, new ByteArrayInputStream(inMemoryFile.getFileContent()));
basyx.aasenvironment/basyx.aasenvironment-core/src/main/java/org/eclipse/digitaltwin/basyx/aasenvironment/base/DefaultAASEnvironment.java:201
- If
contentTypeis null,setFileValuemay not handle it as intended. Consider falling back to a default value such as "application/octet-stream" when the field is empty or missing.
String contentType = (fileSME.getContentType() != null && !fileSME.getContentType().trim().isEmpty()) ? fileSME.getContentType() : null;
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of Changes
This PR fixes a small bug that got introduced in #791 where the AAS Environment used a hardcoded contentType in
setFileToFileElement