Polishing contribution

Closes gh-33715

Author: rstoyanchev

spring-web/src/main/java/org/springframework/web/util/RfcUriParser.java

@@ -29,7 +29,6 @@
  * Parser for URI's based on RFC 3986 syntax.
  *
  * @author Rossen Stoyanchev
- * @author Yanming Zhou
  * @since 6.2
  *
  * @see <a href="https://www.rfc-editor.org/info/rfc3986">RFC 3986</a>

spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java

@@ -633,29 +633,17 @@ void buildAndExpandOpaque(ParserType parserType) {
 	@ParameterizedTest // gh-33699
 	@EnumSource(value = ParserType.class)
 	void schemeVariableMixedCase(ParserType parserType) {
-		URI uri = UriComponentsBuilder
-				.fromUriString("{TheScheme}://example.org", parserType)
-				.buildAndExpand(Map.of("TheScheme", "ws"))
-				.toUri();
-		assertThat(uri.toString()).isEqualTo("ws://example.org");
-
-		uri = UriComponentsBuilder
-				.fromUriString("{TheScheme}s://example.org", parserType)
-				.buildAndExpand(Map.of("TheScheme", "ws"))
-				.toUri();
-		assertThat(uri.toString()).isEqualTo("wss://example.org");
 
-		uri = UriComponentsBuilder
-				.fromUriString("s{TheScheme}://example.org", parserType)
-				.buildAndExpand(Map.of("TheScheme", "ws"))
-				.toUri();
-		assertThat(uri.toString()).isEqualTo("sws://example.org");
+		BiConsumer<String, String> tester = (scheme, value) -> {
+			URI uri = UriComponentsBuilder.fromUriString(scheme + "://example.org", parserType)
+					.buildAndExpand(Map.of("TheScheme", value))
+					.toUri();
+			assertThat(uri.toString()).isEqualTo("wss://example.org");
+		};
 
-		uri = UriComponentsBuilder
-				.fromUriString("s{TheScheme}s://example.org", parserType)
-				.buildAndExpand(Map.of("TheScheme", "ws"))
-				.toUri();
-		assertThat(uri.toString()).isEqualTo("swss://example.org");
+		tester.accept("{TheScheme}", "wss");
+		tester.accept("{TheScheme}s", "ws");
+		tester.accept("ws{TheScheme}", "s");
 	}
 
 	@ParameterizedTest