Revert this:

Encode non UTF-8 characters only once #943
Issue:203482

Author: iroqueta

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

@@ -9,7 +9,6 @@
 import java.math.BigDecimal;
 import java.io.*;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.text.*;
 import java.util.*;
 
@@ -3492,36 +3491,6 @@ public static String Sanitize(String input, HashMap<Character, Character> whiteL
 		return sanitizedInput.toString();
 	}
 
-	public static String encodeUtf8Once(String input) {
-		StringBuilder sb = new StringBuilder();
-		for (int i = 0; i < input.length(); i++) {
-			char c = input.charAt(i);
-			if (c == '%' && i + 2 < input.length() &&
-				(((input.charAt(i+1) >= '0' && input.charAt(i+1) <= '9') ||
-					(input.charAt(i+1) >= 'A' && input.charAt(i+1) <= 'F') ||
-					(input.charAt(i+1) >= 'a' && input.charAt(i+1) <= 'f')) &&
-					((input.charAt(i+2) >= '0' && input.charAt(i+2) <= '9') ||
-						(input.charAt(i+2) >= 'A' && input.charAt(i+2) <= 'F') ||
-						(input.charAt(i+2) >= 'a' && input.charAt(i+2) <= 'f')))) {
-				sb.append('%').append(input.charAt(i+1)).append(input.charAt(i+2));
-				i += 2;
-			}
-			else if ((c >= 'A' && c <= 'Z') ||
-				(c >= 'a' && c <= 'z') ||
-				(c >= '0' && c <= '9') ||
-				c == '-' || c == '_' || c == '.' || c == '~') {
-				sb.append(c);
-			}
-			else {
-				byte[] bytes = String.valueOf(c).getBytes(StandardCharsets.UTF_8);
-				for (byte b : bytes) {
-					sb.append(String.format("%%%02X", b));
-				}
-			}
-		}
-		return sb.toString();
-	}
-
 	public static boolean isKnownContentType(String type)
 	{
 		if (type != null)

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

@@ -1,6 +1,5 @@
 package com.genexus.db.driver;
 
-import com.genexus.CommonUtil;
 import software.amazon.awssdk.auth.credentials.*;
 import software.amazon.awssdk.core.ResponseBytes;
 import software.amazon.awssdk.core.ResponseInputStream;
@@ -25,6 +24,7 @@
 
 import java.io.*;
 import java.net.URI;
+import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -259,26 +259,13 @@ public String upload(String externalFileName, InputStream input, ResourceAccessC
 	public String get(String externalFileName, ResourceAccessControlList acl, int expirationMinutes) {
 		// Send a request to AWS S3 to retrieve the metadata for the specified object to see if
 		// the object exists and is accessible under the provided credentials and permissions.
-		try {
-			HeadObjectRequest headObjectRequest = HeadObjectRequest.builder()
-				.bucket(bucket)
-				.key(externalFileName)
-				.build();
-			client.headObject(headObjectRequest);
-			return getResourceUrl(externalFileName, acl, expirationMinutes);
-		} catch (Exception e) {
-			int lastIndex = Math.max(externalFileName.lastIndexOf('/'), externalFileName.lastIndexOf('\\'));
-			String path = lastIndex >= 0 ? externalFileName.substring(0, lastIndex + 1) : "";
-			String fileName = lastIndex >= 0 ? externalFileName.substring(lastIndex + 1) : externalFileName;
-			String encodedFileName = CommonUtil.encodeUtf8Once(fileName);
-			String encodedExternalFileName = path + encodedFileName;
-			HeadObjectRequest headObjectRequest = HeadObjectRequest.builder()
-				.bucket(bucket)
-				.key(encodedExternalFileName)
-				.build();
-			client.headObject(headObjectRequest);
-			return getResourceUrl(encodedExternalFileName, acl, expirationMinutes);
-		}
+		HeadObjectRequest headObjectRequest = HeadObjectRequest.builder()
+			.bucket(bucket)
+			.key(externalFileName)
+			.build();
+		client.headObject(headObjectRequest);
+
+		return getResourceUrl(externalFileName, acl, expirationMinutes);
 	}
 
 	private String getResourceUrl(String externalFileName, ResourceAccessControlList acl, int expirationMinutes) {
@@ -665,7 +652,7 @@ private String getResourceUrlWithACL(String externalFileName, ResourceAccessCont
 				int lastIndex = Math.max(externalFileName.lastIndexOf('/'), externalFileName.lastIndexOf('\\'));
 				String path = externalFileName.substring(0, lastIndex + 1);
 				String fileName = externalFileName.substring(lastIndex + 1);
-				String encodedFileName = CommonUtil.encodeUtf8Once(fileName);
+				String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString());
 
 				String url = String.format(
 					"https://%s.s3.%s.amazonaws.com/%s%s",
@@ -676,8 +663,8 @@ private String getResourceUrlWithACL(String externalFileName, ResourceAccessCont
 				);
 
 				return url;
-			} catch (Exception e) {
-				logger.error("Failed to encode resource URL for " + externalFileName, e);
+			} catch (UnsupportedEncodingException uee) {
+				logger.error("Failed to encode resource URL for " + externalFileName, uee);
 				return "";
 			}
 		}