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

@@ -14,7 +14,6 @@
 import com.azure.storage.blob.sas.BlobServiceSasSignatureValues;
 import com.azure.storage.blob.specialized.BlockBlobClient;
 import com.azure.storage.common.StorageSharedKeyCredential;
-import com.azure.storage.blob.options.BlobParallelUploadOptions;
 import com.genexus.StructSdtMessages_Message;
 import com.genexus.util.GXService;
 import com.genexus.util.StorageUtils;
@@ -178,6 +177,7 @@ private boolean isPrivateAcl(ResourceAccessControlList acl) {
 
 	public String upload(String localFile, String externalFileName, ResourceAccessControlList acl) {
 		try {
+			externalFileName = getExternalFileName(externalFileName);
 			BlobClient blobClient = getBlobClient(externalFileName, acl);
 			blobClient.uploadFromFile(localFile, true);
 			return getResourceUrl(externalFileName, acl, defaultExpirationMinutes);
@@ -191,10 +191,9 @@ public String upload(String externalFileName, InputStream input, ResourceAccessC
 		//https://docs.azure.cn/en-us/storage/blobs/storage-blob-upload-java
 		try (ExternalProviderHelper.InputStreamWithLength streamInfo =
 					 ExternalProviderHelper.getInputStreamContentLength(input)) {
-
+			externalFileName = getExternalFileName(externalFileName);
 			BlockBlobClient blobClient =
 					getBlobClient(externalFileName, acl).getBlockBlobClient();
-
 			String contentType =
 					(externalFileName.endsWith(".tmp") &&
 							"application/octet-stream".equals(streamInfo.detectedContentType))
@@ -224,6 +223,7 @@ public String upload(String externalFileName, InputStream input, ResourceAccessC
 
 	public String get(String externalFileName, ResourceAccessControlList acl, int expirationMinutes) {
 		try {
+			externalFileName = getExternalFileName(externalFileName);
 			if (exists(externalFileName, acl)) {
 				return getResourceUrl(externalFileName, acl, expirationMinutes);
 			}
@@ -235,6 +235,8 @@ public String get(String externalFileName, ResourceAccessControlList acl, int ex
 	}
 
 	private String getResourceUrl(String externalFileName, ResourceAccessControlList acl, int expirationMinutes) {
+
+		externalFileName = getExternalFileName(externalFileName);
 		if (isPrivateAcl(acl)) {
 			return getPrivate(externalFileName, expirationMinutes);
 		} else {
@@ -244,14 +246,14 @@ private String getResourceUrl(String externalFileName, ResourceAccessControlList
 			////https://github.com/Azure/azure-sdk-for-java/issues/21610
 
 			String url = blobClient.getBlobUrl();
-
-			//Decode only when not SAS
-			return safeDecodeUrl(url);
+			return url;
+			//return safeDecodeUrl(url);
 		}
 	}
 
 	private String getPrivate(String externalFileName, int expirationMinutes) {
 		try {
+			externalFileName = getExternalFileName(externalFileName);
 			BlobClient blobClient = privateContainerClient.getBlobClient(externalFileName);
 			expirationMinutes = expirationMinutes > 0 ? expirationMinutes : defaultExpirationMinutes;
 			OffsetDateTime expiryTime = OffsetDateTime.now().plusMinutes(expirationMinutes);
@@ -616,6 +618,15 @@ private static String safeDecodeUrl(String uri) {
 		}
 	}
 
+	private String getExternalFileName(String externalFileName)
+	{
+		//Defensive code, as externalFileName may have a leading / and this causes a double / at blob uri
+		//The latest Azure SDK is strict at uri format and encodes special characters
+		if (externalFileName == "")
+			return externalFileName;
+		return externalFileName.startsWith("/") ? externalFileName.substring(1) : externalFileName;
+	}
+
 	private void handleAndLogException(String message, Exception ex) {
 		if (ex instanceof BlobStorageException) {
 			logger.error("Azure Storage error: {} (Status: {}, Code: {})",