From 5165ea59f6aa8e8fafebbea465b9bc6f6ff56b6c Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Tue, 15 Oct 2024 14:47:39 -0400
Subject: [PATCH] Use WHAT_WG uri parser type

See https://github.com/spring-projects/spring-framework/issues/33639
---
 .../cloud/config/client/ConfigClientProperties.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java
index 770a6e80..0f17b3f1 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java
@@ -356,8 +356,10 @@ public class ConfigClientProperties {
 			if (ObjectUtils.isEmpty(userInfo) || ":".equals(userInfo)) {
 				return result;
 			}
-			String bare = UriComponentsBuilder.fromHttpUrl(uri).userInfo(null).build().toUriString();
-			result.uri = bare;
+			result.uri = UriComponentsBuilder.fromUriString(uri, UriComponentsBuilder.ParserType.WHAT_WG)
+				.userInfo(null)
+				.build()
+				.toUriString();
 
 			// if userInfo does not contain a :, then append a : to it
 			if (!userInfo.contains(":")) {