Use StringUtils.uriDecode where feasible

Signed-off-by: Dmytro Nosan <[email protected]>

Author: nosan

loader/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/AsciiBytes.java

@@ -235,10 +235,6 @@ public String toString() {
 		return this.string;
 	}
 
-	static String toString(byte[] bytes) {
-		return new String(bytes, StandardCharsets.UTF_8);
-	}
-
 	static int hashCode(CharSequence charSequence) {
 		// We're compatible with String's hashCode()
 		if (charSequence instanceof StringSequence) {

loader/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java

@@ -16,18 +16,18 @@
 
 package org.springframework.boot.loader.jar;
 
-import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.net.URLEncoder;
 import java.net.URLStreamHandler;
 import java.nio.charset.StandardCharsets;
 import java.security.Permission;
 
+import org.springframework.util.StringUtils;
+
 /**
  * {@link java.net.JarURLConnection} used to support {@link JarFile#getUrl()}.
  *
@@ -307,41 +307,7 @@ private StringSequence decode(StringSequence source) {
 			if (source.isEmpty() || (source.indexOf('%') < 0)) {
 				return source;
 			}
-			ByteArrayOutputStream bos = new ByteArrayOutputStream(source.length());
-			write(source.toString(), bos);
-			// AsciiBytes is what is used to store the JarEntries so make it symmetric
-			return new StringSequence(AsciiBytes.toString(bos.toByteArray()));
-		}
-
-		private void write(String source, ByteArrayOutputStream outputStream) {
-			int length = source.length();
-			for (int i = 0; i < length; i++) {
-				int c = source.charAt(i);
-				if (c > 127) {
-					String encoded = URLEncoder.encode(String.valueOf((char) c), StandardCharsets.UTF_8);
-					write(encoded, outputStream);
-				}
-				else {
-					if (c == '%') {
-						if ((i + 2) >= length) {
-							throw new IllegalArgumentException(
-									"Invalid encoded sequence \"" + source.substring(i) + "\"");
-						}
-						c = decodeEscapeSequence(source, i);
-						i += 2;
-					}
-					outputStream.write(c);
-				}
-			}
-		}
-
-		private char decodeEscapeSequence(String source, int i) {
-			int hi = Character.digit(source.charAt(i + 1), 16);
-			int lo = Character.digit(source.charAt(i + 2), 16);
-			if (hi == -1 || lo == -1) {
-				throw new IllegalArgumentException("Invalid encoded sequence \"" + source.substring(i) + "\"");
-			}
-			return ((char) ((hi << 4) + lo));
+			return new StringSequence(StringUtils.uriDecode(source.toString(), StandardCharsets.UTF_8));
 		}
 
 		CharSequence toCharSequence() {

loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection.java

@@ -26,6 +26,7 @@
 import java.net.URLClassLoader;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
+import java.nio.charset.StandardCharsets;
 import java.security.Permission;
 import java.util.Collections;
 import java.util.List;
@@ -35,7 +36,7 @@
 import java.util.jar.JarFile;
 
 import org.springframework.boot.loader.jar.NestedJarFile;
-import org.springframework.boot.loader.net.util.UrlDecoder;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link java.net.JarURLConnection} alternative to
@@ -341,7 +342,7 @@ static JarUrlConnection open(URL url) throws IOException {
 				if ("runtime".equals(url.getRef())) {
 					jarFileUrl = new URL(jarFileUrl, "#runtime");
 				}
-				String entryName = UrlDecoder.decode(spec.substring(separator + 2));
+				String entryName = StringUtils.uriDecode(spec.substring(separator + 2), StandardCharsets.UTF_8);
 				JarFile jarFile = jarFiles.getOrCreate(true, jarFileUrl);
 				jarFiles.cacheIfAbsent(true, jarFileUrl, jarFile);
 				if (!hasEntry(jarFile, entryName)) {

loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/UrlJarFileFactory.java

@@ -21,14 +21,15 @@
 import java.io.InputStream;
 import java.lang.Runtime.Version;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.function.Consumer;
 import java.util.jar.JarFile;
 
 import org.springframework.boot.loader.net.protocol.nested.NestedLocation;
-import org.springframework.boot.loader.net.util.UrlDecoder;
+import org.springframework.util.StringUtils;
 
 /**
  * Factory used by {@link UrlJarFiles} to create {@link JarFile} instances.
@@ -76,7 +77,7 @@ private boolean isLocal(String host) {
 
 	private JarFile createJarFileForLocalFile(URL url, Runtime.Version version, Consumer<JarFile> closeAction)
 			throws IOException {
-		String path = UrlDecoder.decode(url.getPath());
+		String path = StringUtils.uriDecode(url.getPath(), StandardCharsets.UTF_8);
 		return new UrlJarFile(new File(path), version, closeAction);
 	}
 

loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/nested/NestedLocation.java

@@ -19,11 +19,12 @@
 import java.io.File;
 import java.net.URI;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.springframework.boot.loader.net.util.UrlDecoder;
+import org.springframework.util.StringUtils;
 
 /**
  * A location obtained from a {@code nested:} {@link URL} consisting of a jar file and an
@@ -75,7 +76,7 @@ public static NestedLocation fromUrl(URL url) {
 		if (url == null || !"nested".equalsIgnoreCase(url.getProtocol())) {
 			throw new IllegalArgumentException("'url' must not be null and must use 'nested' protocol");
 		}
-		return parse(UrlDecoder.decode(url.toString().substring(7)));
+		return parse(StringUtils.uriDecode(url.toString().substring(7), StandardCharsets.UTF_8));
 	}
 
 	/**

loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/util/UrlDecoder.java

@@ -19,13 +19,14 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.jar.JarEntry;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import org.springframework.boot.loader.net.util.UrlDecoder;
+import org.springframework.util.StringUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -93,7 +94,7 @@ void createWithReservedCharsInName() throws Exception {
 		setup();
 		URL url = JarUrl.create(this.jarFile, "lib.jar", "com/example/My.class");
 		assertThat(url).hasToString("jar:nested:%s/!lib.jar!/com/example/My.class".formatted(this.jarFileUrlPath));
-		assertThat(UrlDecoder.decode(url.toString())).contains(badFolderName);
+		assertThat(StringUtils.uriDecode(url.toString(), StandardCharsets.UTF_8)).contains(badFolderName);
 	}
 
 }