Skip to content

The method createNewFile converts all the inputstream to memory. This… #980

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

The method createNewFile converts all the inputstream to memory. This… #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c656db
The method createNewFile converts all the inputstream to memory. This…
iroqueta Jul 4, 2025
860e6bf
The method createNewFile converts all the inputstream to memory. This…
iroqueta Jul 4, 2025
fea969c
Merge branch 'master' into CreateFileFromStream
iroqueta Jul 11, 2025
e131aea
Tries to determine the content-type of files uploaded to external sto…
iroqueta Jul 11, 2025
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
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
Expand Down
12 changes: 11 additions & 1 deletion common/src/main/java/com/genexus/util/GXFileInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public boolean createNewFile() throws IOException{
return fileSource.createNewFile();
}
public boolean createNewFile(InputStream input) throws IOException{
fromBytes(SpecificImplementation.GXutil.toByteArray(input));
fromInputStream(input);
return true;
}
public boolean delete(){
Expand Down Expand Up @@ -180,6 +180,16 @@ public void fromBytes(byte[] data) throws IOException
destination.write(data, 0, data.length);
}
}
private void fromInputStream(InputStream input) throws IOException
{
try (OutputStream output = new BufferedOutputStream(new FileOutputStream(fileSource))) {
byte[] buffer = new byte[8192];
int bytesRead;
while ((bytesRead = input.read(buffer)) != -1) {
output.write(buffer, 0, bytesRead);
}
}
}
public String readAllText(String encoding)throws IOException{
return SpecificImplementation.FileUtils.readFileToString(fileSource, CommonUtil.normalizeEncodingName(encoding));
}
Expand Down
27 changes: 16 additions & 11 deletions gxcloudstorage-awss3-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.util.IOUtils;

import java.io.FileNotFoundException;
import java.io.FileOutputStream;
Expand Down Expand Up @@ -220,23 +219,29 @@ else if (acl == ResourceAccessControlList.PublicReadWrite) {
}

public String upload(String externalFileName, InputStream input, ResourceAccessControlList acl) {
byte[] bytes;
ExternalProviderHelper.InputStreamWithLength streamInfo = null;
try {
bytes = IOUtils.toByteArray(input);
streamInfo = ExternalProviderHelper.getInputStreamContentLength(input);

ObjectMetadata metadata = new ObjectMetadata();
metadata.setContentLength(bytes.length);
if (externalFileName.endsWith(".tmp")) {
metadata.setContentType("image/jpeg");
}
metadata.setContentLength(streamInfo.contentLength);
metadata.setContentType((externalFileName.endsWith(".tmp") && "application/octet-stream".equals(streamInfo.detectedContentType)) ? "image/jpeg" : streamInfo.detectedContentType);

String upload = "";
try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes)) {
client.putObject(new PutObjectRequest(bucket, externalFileName, byteArrayInputStream, metadata).withCannedAcl(internalToAWSACL(acl)));
upload = getResourceUrl(externalFileName, acl, defaultExpirationMinutes);
}
client.putObject(new PutObjectRequest(bucket, externalFileName, streamInfo.inputStream, metadata).withCannedAcl(internalToAWSACL(acl)));
upload = getResourceUrl(externalFileName, acl, defaultExpirationMinutes);
return upload;
} catch (IOException ex) {
logger.error("Error while uploading file to the external provider.", ex);
return "";
} finally {
if (streamInfo != null && streamInfo.tempFile != null && streamInfo.tempFile.exists()) {
try {
streamInfo.tempFile.delete();
} catch (Exception e) {
logger.warn("Could not delete temporary file: " + streamInfo.tempFile.getAbsolutePath(), e);
}
}
}
}

Expand Down
34 changes: 27 additions & 7 deletions gxcloudstorage-awss3-v2/src/main/java/com/genexus/db/driver/ExternalProviderS3V2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@
import com.genexus.util.StorageUtils;
import com.genexus.StructSdtMessages_Message;
import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
import software.amazon.awssdk.utils.IoUtils;

import java.io.*;
import java.net.URI;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -603,8 +601,10 @@ else if (acl == ResourceAccessControlList.PublicReadWrite)
}

private String uploadWithACL(String externalFileName, InputStream input, ResourceAccessControlList acl) {
ExternalProviderHelper.InputStreamWithLength streamInfo = null;
try {
ByteBuffer byteBuffer = ByteBuffer.wrap(IoUtils.toByteArray(input));
streamInfo = ExternalProviderHelper.getInputStreamContentLength(input);

PutObjectRequest.Builder putObjectRequestBuilder = PutObjectRequest.builder()
.bucket(bucket)
.key(externalFileName)
Expand All @@ -613,7 +613,7 @@ private String uploadWithACL(String externalFileName, InputStream input, Resourc
putObjectRequestBuilder = putObjectRequestBuilder.acl(internalToAWSACLWithACL(acl));
PutObjectRequest putObjectRequest = putObjectRequestBuilder.build();

PutObjectResponse response = client.putObject(putObjectRequest, RequestBody.fromByteBuffer(byteBuffer));
PutObjectResponse response = client.putObject(putObjectRequest, RequestBody.fromInputStream(streamInfo.inputStream, streamInfo.contentLength));
if (!response.sdkHttpResponse().isSuccessful()) {
logger.error("Error while uploading file: " + response.sdkHttpResponse().statusText().orElse("Unknown error"));
}
Expand All @@ -622,6 +622,15 @@ private String uploadWithACL(String externalFileName, InputStream input, Resourc
} catch (IOException ex) {
logger.error("Error while uploading file to the external provider.", ex);
return "";
} finally {
// Clean up the temporary file if it was created
if (streamInfo != null && streamInfo.tempFile != null && streamInfo.tempFile.exists()) {
try {
streamInfo.tempFile.delete();
} catch (Exception e) {
logger.warn("Could not delete temporary file: " + streamInfo.tempFile.getAbsolutePath(), e);
}
}
}
}

Expand Down Expand Up @@ -727,15 +736,17 @@ private String uploadWithoutACL(String localFile, String externalFileName) {
}

private String uploadWithoutACL(String externalFileName, InputStream input) {
ExternalProviderHelper.InputStreamWithLength streamInfo = null;
try {
ByteBuffer byteBuffer = ByteBuffer.wrap(IoUtils.toByteArray(input));
streamInfo = ExternalProviderHelper.getInputStreamContentLength(input);

PutObjectRequest.Builder putObjectRequestBuilder = PutObjectRequest.builder()
.bucket(bucket)
.key(externalFileName)
.contentType(externalFileName.endsWith(".tmp") ? "image/jpeg" : null);
.contentType((externalFileName.endsWith(".tmp") && "application/octet-stream".equals(streamInfo.detectedContentType)) ? "image/jpeg" : streamInfo.detectedContentType);
PutObjectRequest putObjectRequest = putObjectRequestBuilder.build();

PutObjectResponse response = client.putObject(putObjectRequest, RequestBody.fromByteBuffer(byteBuffer));
PutObjectResponse response = client.putObject(putObjectRequest, RequestBody.fromInputStream(streamInfo.inputStream, streamInfo.contentLength));
if (!response.sdkHttpResponse().isSuccessful()) {
logger.error("Error while uploading file: " + response.sdkHttpResponse().statusText().orElse("Unknown error"));
}
Expand All @@ -744,6 +755,15 @@ private String uploadWithoutACL(String externalFileName, InputStream input) {
} catch (IOException ex) {
logger.error("Error while uploading file to the external provider.", ex);
return "";
} finally {
// Clean up the temporary file if it was created
if (streamInfo != null && streamInfo.tempFile != null && streamInfo.tempFile.exists()) {
try {
streamInfo.tempFile.delete();
} catch (Exception e) {
logger.warn("Could not delete temporary file: " + streamInfo.tempFile.getAbsolutePath(), e);
}
}
}
}

Expand Down
25 changes: 17 additions & 8 deletions ...udstorage-azureblob/src/main/java/com/genexus/db/driver/ExternalProviderAzureStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,17 @@ public String upload(String localFile, String externalFileName, ResourceAccessCo
}

public String upload(String externalFileName, InputStream input, ResourceAccessControlList acl) {

ExternalProviderHelper.InputStreamWithLength streamInfo = null;
try {
streamInfo = ExternalProviderHelper.getInputStreamContentLength(input);

CloudBlockBlob blob = getCloudBlockBlob(externalFileName, acl);
if (externalFileName.endsWith(".tmp")) {
blob.getProperties().setContentType("image/jpeg");
}
blob.getProperties().setContentType((externalFileName.endsWith(".tmp") && "application/octet-stream".equals(streamInfo.detectedContentType)) ? "image/jpeg" : streamInfo.detectedContentType);
try (BlobOutputStream blobOutputStream = blob.openOutputStream()) {
int next = input.read();
while (next != -1) {
blobOutputStream.write(next);
next = input.read();
byte[] buffer = new byte[8192];
int bytesRead;
while ((bytesRead = streamInfo.inputStream.read(buffer)) != -1) {
blobOutputStream.write(buffer, 0, bytesRead);
}
}
return getResourceUrl(externalFileName, acl, DEFAULT_EXPIRATION_MINUTES);
Expand All @@ -163,6 +163,15 @@ public String upload(String externalFileName, InputStream input, ResourceAccessC
logger.error("Error uploading file", ex);
return "";
}
finally {
if (streamInfo != null && streamInfo.tempFile != null && streamInfo.tempFile.exists()) {
try {
streamInfo.tempFile.delete();
} catch (Exception e) {
logger.warn("Could not delete temporary file: " + streamInfo.tempFile.getAbsolutePath(), e);
}
}
}
}

public String get(String externalFileName, ResourceAccessControlList acl, int expirationMinutes) {
Expand Down
5 changes: 5 additions & 0 deletions gxcloudstorage-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>3.2.0</version>
</dependency>
</dependencies>

</project>
35 changes: 35 additions & 0 deletions gxcloudstorage-common/src/main/java/com/genexus/db/driver/ExternalProviderHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
import com.genexus.util.Encryption;
import com.genexus.util.GXService;

import java.io.*;
import org.apache.tika.Tika;

public class ExternalProviderHelper {

public static String getServicePropertyValue(GXService s, String propName, boolean isSecure){
Expand All @@ -23,4 +26,36 @@ public static String getEnvironmentVariable(String name, boolean required) throw
}
return value;
}

public static InputStreamWithLength getInputStreamContentLength(InputStream input) throws IOException {
File tempFile = File.createTempFile("upload-", ".tmp");
try (OutputStream out = new FileOutputStream(tempFile)) {
byte[] buffer = new byte[8192];
int bytesRead;
while ((bytesRead = input.read(buffer)) != -1) {
out.write(buffer, 0, bytesRead);
}
}
long size = tempFile.length();
InputStream bufferedInput = new BufferedInputStream(new FileInputStream(tempFile));
bufferedInput.mark(128 * 1024);
Tika tika = new Tika();
String detectedContentType = tika.detect(bufferedInput);
bufferedInput.reset();
return new InputStreamWithLength(bufferedInput, size, tempFile, detectedContentType);
}

public static class InputStreamWithLength {
public final InputStream inputStream;
public final long contentLength;
public final File tempFile; // nullable
public final String detectedContentType;

public InputStreamWithLength(InputStream inputStream, long contentLength, File tempFile, String detectedContentType) {
this.inputStream = inputStream;
this.contentLength = contentLength;
this.tempFile = tempFile;
this.detectedContentType = detectedContentType;
}
}
}
17 changes: 14 additions & 3 deletions ...torage-googlecloudstorage/src/main/java/com/genexus/db/driver/ExternalProviderGoogle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import com.google.api.services.storage.model.StorageObject;
import com.google.auth.oauth2.ServiceAccountCredentials;
import com.google.cloud.storage.*;
import org.apache.commons.io.IOUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand Down Expand Up @@ -170,16 +169,28 @@ private void setBlobAcl(BlobId blobId, ResourceAccessControlList acl) {
}

public String upload(String externalFileName, InputStream input, ResourceAccessControlList acl) {
ExternalProviderHelper.InputStreamWithLength streamInfo = null;
try {
streamInfo = ExternalProviderHelper.getInputStreamContentLength(input);

BlobId blobId = BlobId.of(bucket, externalFileName);
BlobInfo blobInfo = BlobInfo.newBuilder(blobId).build();
byte[] targetArray = IOUtils.toByteArray(input);
storageClient.create(blobInfo, targetArray);

storageClient.createFrom(blobInfo, streamInfo.tempFile.toPath());

setBlobAcl(blobId, acl);
return getResourceUrl(blobInfo, acl);
} catch (IOException ex) {
handleIOException(ex);
return "";
} finally {
if (streamInfo != null && streamInfo.tempFile != null && streamInfo.tempFile.exists()) {
try {
streamInfo.tempFile.delete();
} catch (Exception e) {
logger.warn("Could not delete temporary file: " + streamInfo.tempFile.getAbsolutePath(), e);
}
}
}
}

Expand Down
29 changes: 16 additions & 13 deletions gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import com.ibm.cloud.objectstorage.services.s3.AmazonS3Client;
import com.ibm.cloud.objectstorage.services.s3.AmazonS3ClientBuilder;
import com.ibm.cloud.objectstorage.services.s3.model.*;
import com.ibm.cloud.objectstorage.util.IOUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand Down Expand Up @@ -150,24 +149,28 @@ else if (acl == ResourceAccessControlList.PublicReadWrite) {
}

public String upload(String externalFileName, InputStream input, ResourceAccessControlList acl) {
byte[] bytes;
try {
bytes = IOUtils.toByteArray(input);
ExternalProviderHelper.InputStreamWithLength streamInfo = null;
try {
streamInfo = ExternalProviderHelper.getInputStreamContentLength(input);
ObjectMetadata metadata = new ObjectMetadata();
metadata.setContentLength(bytes.length);
if (externalFileName.endsWith(".tmp")) {
metadata.setContentType("image/jpeg");
}
metadata.setContentLength(streamInfo.contentLength);
metadata.setContentType((externalFileName.endsWith(".tmp") && "application/octet-stream".equals(streamInfo.detectedContentType)) ? "image/jpeg" : streamInfo.detectedContentType);
String upload = "";
try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes)) {
client.putObject(new PutObjectRequest(bucket, externalFileName, byteArrayInputStream, metadata).withCannedAcl(internalToAWSACL(acl)));
upload = getResourceUrl(externalFileName, acl, defaultExpirationMinutes);
}
client.putObject(new PutObjectRequest(bucket, externalFileName, streamInfo.inputStream, metadata).withCannedAcl(internalToAWSACL(acl)));
upload = getResourceUrl(externalFileName, acl, defaultExpirationMinutes);
return upload;
} catch (IOException ex) {
logger.error("Error while uploading file to the external provider.", ex);
return "";
}
} finally {
if (streamInfo != null && streamInfo.tempFile != null && streamInfo.tempFile.exists()) {
try {
streamInfo.tempFile.delete();
} catch (Exception e) {
logger.warn("Could not delete temporary file: " + streamInfo.tempFile.getAbsolutePath(), e);
}
}
}
}

public String get(String externalFileName, ResourceAccessControlList acl, int expirationMinutes) {
Expand Down
5 changes: 0 additions & 5 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@
<artifactId>javax.jms</artifactId>
<version>3.1.2.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions wrappercommon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
Expand Down
Loading