Merge branch 'master' into feature/log-improvement

Author: claudiamurialdo

common/pom.xml

@@ -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>

common/src/main/java/com/genexus/GXExternalCollection.java

@@ -100,13 +100,13 @@ public Vector getStruct()
 	}
 
 	@SuppressWarnings("unchecked")
-	public ArrayList getExternalInstance() {
-		ArrayList list = new ArrayList();
+	public <E> ArrayList<E> getExternalInstance() {
+		ArrayList<E> list = new ArrayList<>();
 		for (T Item : this)
 		{
 			try
 			{
-				list.add(Item.getClass().getMethod("getExternalInstance", new Class[]{}).invoke(Item));
+				list.add((E) Item.getClass().getMethod("getExternalInstance", new Class[]{}).invoke(Item));
 			}
 			catch (Exception e)
 			{

common/src/main/java/com/genexus/internet/GXHttpClient.java

@@ -483,6 +483,8 @@ protected void resetState()
 
 	public abstract String getString();
 
+	public abstract void unreadChunk();
+
 	public abstract String readChunk();
 
 	public abstract boolean getEof();

common/src/main/java/com/genexus/internet/HttpClient.java

@@ -253,6 +253,11 @@ public String getString()
 		return session.getString();
 	}
 
+	public void unreadChunk()
+	{
+		session.unreadChunk();
+	}
+
 	public String readChunk()
 	{
 		return session.readChunk();

common/src/main/java/com/genexus/internet/HttpClientManual.java

@@ -436,6 +436,9 @@ public boolean getEof() {
 		return true;
 	}
 
+	public void unreadChunk() {
+	}
+
 	public String readChunk() {
 		return getString();
 	}

common/src/main/java/com/genexus/internet/IHttpClient.java

@@ -48,6 +48,7 @@ public interface IHttpClient {
 	public void getHeader(String name, double[] value);
 	public InputStream getInputStream() throws IOException;
 	public String getString();
+	public void unreadChunk();
 	public String readChunk();
 	public boolean getEof();
 	public void toFile(String fileName);

common/src/main/java/com/genexus/util/GXFileInfo.java

@@ -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(){
@@ -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));
 	}

gxcloudstorage-awss3-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.java

@@ -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;
@@ -220,19 +219,14 @@ else if (acl == ResourceAccessControlList.PublicReadWrite) {
 	}
 
 	public String upload(String externalFileName, InputStream input, ResourceAccessControlList acl) {
-		byte[] bytes;
-		try {
-			bytes = IOUtils.toByteArray(input);
+		try (ExternalProviderHelper.InputStreamWithLength 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);

gxcloudstorage-awss3-v2/src/main/java/com/genexus/db/driver/ExternalProviderS3V2.java

@@ -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;
@@ -603,8 +601,7 @@ else if (acl == ResourceAccessControlList.PublicReadWrite)
 	}
 
 	private String uploadWithACL(String externalFileName, InputStream input, ResourceAccessControlList acl) {
-		try {
-			ByteBuffer byteBuffer = ByteBuffer.wrap(IoUtils.toByteArray(input));
+		try (ExternalProviderHelper.InputStreamWithLength streamInfo = ExternalProviderHelper.getInputStreamContentLength(input)) {
 			PutObjectRequest.Builder putObjectRequestBuilder = PutObjectRequest.builder()
 				.bucket(bucket)
 				.key(externalFileName)
@@ -613,7 +610,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"));
 			}
@@ -727,15 +724,14 @@ private String uploadWithoutACL(String localFile, String externalFileName) {
 	}
 
 	private String uploadWithoutACL(String externalFileName, InputStream input) {
-		try {
-			ByteBuffer byteBuffer = ByteBuffer.wrap(IoUtils.toByteArray(input));
+		try (ExternalProviderHelper.InputStreamWithLength 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"));
 			}

gxcloudstorage-azureblob/src/main/java/com/genexus/db/driver/ExternalProviderAzureStorage.java

@@ -139,17 +139,14 @@ public String upload(String localFile, String externalFileName, ResourceAccessCo
 	}
 
 	public String upload(String externalFileName, InputStream input, ResourceAccessControlList acl) {
-
-		try {
+		try (ExternalProviderHelper.InputStreamWithLength 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);