Cherry pick branch 'genexuslabs:feature/Update_AzureStorage_SDK' into beta

Author: Sabrina Juarez Garcia

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

@@ -2,6 +2,7 @@
 
 import com.azure.core.exception.ClientAuthenticationException;
 import com.azure.core.exception.HttpRequestException;
+import com.azure.core.util.Context;
 import com.azure.identity.DefaultAzureCredential;
 import com.azure.identity.DefaultAzureCredentialBuilder;
 import com.azure.storage.blob.BlobClient;
@@ -189,17 +190,30 @@ public String upload(String localFile, String externalFileName, ResourceAccessCo
 	public String upload(String externalFileName, InputStream input, ResourceAccessControlList acl) {
 		//https://docs.azure.cn/en-us/storage/blobs/storage-blob-upload-java
 		try (ExternalProviderHelper.InputStreamWithLength streamInfo =
-				 ExternalProviderHelper.getInputStreamContentLength(input)) {
+					 ExternalProviderHelper.getInputStreamContentLength(input)) {
+
 			BlockBlobClient blobClient =
-				getBlobClient(externalFileName, acl).getBlockBlobClient();
-			// Set content type
+					getBlobClient(externalFileName, acl).getBlockBlobClient();
+
 			String contentType =
-				(externalFileName.endsWith(".tmp") &&
-					"application/octet-stream".equals(streamInfo.detectedContentType))
-					? "image/jpeg"
-					: streamInfo.detectedContentType;
+					(externalFileName.endsWith(".tmp") &&
+							"application/octet-stream".equals(streamInfo.detectedContentType))
+							? "image/jpeg"
+							: streamInfo.detectedContentType;
+
 			BlobHttpHeaders headers = new BlobHttpHeaders().setContentType(contentType);
-			blobClient.upload(streamInfo.inputStream, streamInfo.contentLength, true);
+			blobClient.uploadWithResponse(
+					streamInfo.inputStream,
+					streamInfo.contentLength,
+					headers,
+					null,
+					null,
+					null,
+					null,
+					null,
+					Context.NONE
+			);
+
 			return getResourceUrl(externalFileName, acl, DEFAULT_EXPIRATION_MINUTES);
 		}
 		catch (Exception ex) {
@@ -281,9 +295,7 @@ public String copy(String objectName, String newName, ResourceAccessControlList
 		try {
 			BlobClient sourceBlob = getBlobClient(objectName, acl);
 			BlobClient targetBlob = getBlobClient(newName, acl);
-
 			String sourceBlobUrl;
-
 			if (useManagedIdentity) {
 				//Needs RBAC permissions: https://learn.microsoft.com/en-us/azure/storage/blobs/authorize-access-azure-active-directory
 				sourceBlobUrl = sourceBlob.getBlobUrl();
@@ -334,7 +346,6 @@ public String copy(String objectUrl, String newName, String tableName, String fi
 
 				sourceBlobUrl = sourceBlob.getBlobUrl() + "?" + sourceBlob.generateSas(values);
 			}
-
 			targetBlob.beginCopy(sourceBlobUrl, null);
 			return getResourceUrl(newName, acl, defaultExpirationMinutes);
 
@@ -398,7 +409,6 @@ public boolean existsDirectory(String directoryName) {
 		try {
 			// List all blobs with the directory prefix
 			ListBlobsOptions options = new ListBlobsOptions().setPrefix(directoryName);
-			
 			// Check if there are any blobs with this prefix
 			boolean exists = false;
 			for (BlobItem blobItem : publicContainerClient.listBlobs(options, null)) {
@@ -483,7 +493,6 @@ public void renameDirectory(String directoryName, String newDirectoryName) {
 					}
 				}
 			}
-			
 			// Delete the original directory
 			deleteDirectory(directoryName);
 		} catch (Exception ex) {

java/src/main/java/com/genexus/GXDbFile.java

@@ -5,6 +5,8 @@
 import com.genexus.util.GXServices;
 
 import java.io.File;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -26,6 +28,7 @@ public static String getFileName(String uri)
 	{
 		try
 		{
+			uri = safeDecodeUrl(uri);
 			return CommonUtil.getFileName(uri);
 		}
 		catch (Exception e)		
@@ -235,4 +238,20 @@ public static String pathToUrl(String path, boolean forceAbsPath)
 		return pathToUrl(path, webContext, forceAbsPath);
 	}
 
+	private static String safeDecodeUrl(String uri) {
+		if (uri == null || uri.isEmpty()) {
+			return uri;
+		}
+		boolean hasEncodedSegments =
+			uri.matches(".*%[0-9A-Fa-f]{2}.*");
+
+		if (!hasEncodedSegments) {
+			return uri;
+		}
+		try {
+			return URLDecoder.decode(uri);
+		} catch (IllegalArgumentException e) {
+			return uri;
+		}
+	}
 }