Skip to content

Correct blob path in ImageAPI with external storage #706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 15, 2023
Merged

Correct blob path in ImageAPI with external storage #706

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63e0d7d
Correct blob path in ImageAPI with external storage
tomas-sexenian Apr 14, 2023
735cdb7
Remove KB file filesize fix, to be added in another PR
tomas-sexenian Apr 14, 2023
be053a5
Merge branch 'master' into ImageAPIExternalStorage
tomas-sexenian Apr 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions java/src/main/java/com/genexus/GxImageUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,22 @@ public static String crop(String imageFile, int x, int y, int width, int height)

private static String writeImage(BufferedImage croppedImage, String destinationFilePathOrUrl) throws IOException {
String newFileName = PrivateUtilities.getTempFileName(CommonUtil.getFileType(destinationFilePathOrUrl));
try (ByteArrayOutputStream outStream = new ByteArrayOutputStream()) {
IHttpContext httpContext = com.genexus.ModelContext.getModelContext().getHttpContext();
try (ByteArrayOutputStream outStream = new ByteArrayOutputStream()){
ImageIO.write(croppedImage, CommonUtil.getFileType(newFileName), outStream);
outStream.flush();
byte[] imageInByte = outStream.toByteArray();
return GXutil.blobFromBytes(imageInByte);
if (destinationFilePathOrUrl.toLowerCase().startsWith("http://") || destinationFilePathOrUrl.toLowerCase().startsWith("https://") ||
(httpContext.isHttpContextWeb() && destinationFilePathOrUrl.startsWith(httpContext.getContextPath()))){
try (ByteArrayInputStream inStream = new ByteArrayInputStream(outStream.toByteArray())) {
GXFile file = getGXFile(newFileName);
file.create(inStream, true);
file.close();
return file.getURI();
}
} else {
outStream.flush();
byte[] imageInByte = outStream.toByteArray();
return GXutil.blobFromBytes(imageInByte);
}
}
}

Expand Down