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

Author: Sabrina Juarez Garcia

gxcloudstorage-tests/src/test/java/com/genexus/db/driver/TestExternalProvider.java

@@ -1,5 +1,6 @@
 package com.genexus.db.driver;
 
+import com.genexus.GXDbFile;
 import com.genexus.specific.java.Connect;
 import org.junit.Assume;
 import org.junit.Before;
@@ -28,6 +29,7 @@ public abstract class TestExternalProvider {
 
 	private String testSampleFileName;
 	private String testSampleFilePath;
+	private String testSampleSubFolderFileName;
 	private String uniqueId;
 
 
@@ -58,6 +60,7 @@ public void beforeEachTestMethod() {
 
 		uniqueId = Integer.toString(new Random().nextInt(5000));
 		testSampleFileName = String.format("text-%s.txt", uniqueId);
+		testSampleSubFolderFileName = String.format("SubFolder/text-%s.txt", uniqueId);
 		testSampleFilePath = Paths.get("resources", testSampleFileName).toString();
 
 		try {
@@ -78,6 +81,15 @@ public void testUploadPublicMethod(){
 		ensureUrl(upload, ResourceAccessControlList.PublicRead);
 	}
 
+	@Test
+	public void testUploadSubFoldersPublicMethod(){
+		String upload = provider.upload(testSampleFilePath, testSampleSubFolderFileName, ResourceAccessControlList.PublicRead);
+		ensureUrl(upload, ResourceAccessControlList.PublicRead);
+		String fileName = GXDbFile.getFileName(upload);
+		Boolean fileMatch = fileName.matches("^text-\\d+$");
+		assertTrue("Blob Name does not match",fileMatch);
+	}
+
 	@Test
 	public void testUploadDefaultMethod(){
 		String upload = provider.upload(testSampleFilePath, testSampleFileName, ResourceAccessControlList.Default);

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

@@ -252,13 +252,13 @@ private static String safeDecodeUrl(String uri) {
 			if (!hasEncodedSegments) {
 				return uri;
 			}
-			String decodedPath = java.net.URLDecoder.decode(rawPath, "UTF-8");
+			String decodedPath = URLDecoder.decode(rawPath, StandardCharsets.UTF_8.name());
 			return new URI(
 				u.getScheme(),
 				u.getAuthority(),
 				decodedPath,
 				u.getRawQuery(),
-				null
+				u.getRawFragment()
 			).toString();
 
 		} catch (Exception e) {