From 23a532ed820383ac56747890b0235e97a2d522af Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Fri, 9 Jan 2026 15:03:35 +0000 Subject: [PATCH] Polishing contribution Closes gh-36097 --- .../web/client/DefaultApiVersionInserter.java | 1 - .../DefaultApiVersionInsertersTests.java | 21 ++++++------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultApiVersionInserter.java b/spring-web/src/main/java/org/springframework/web/client/DefaultApiVersionInserter.java index ce0d3dfb866..e7b60543f6c 100644 --- a/spring-web/src/main/java/org/springframework/web/client/DefaultApiVersionInserter.java +++ b/spring-web/src/main/java/org/springframework/web/client/DefaultApiVersionInserter.java @@ -33,7 +33,6 @@ import org.springframework.web.util.UriComponentsBuilder; * Default implementation of {@link ApiVersionInserter}. * * @author Rossen Stoyanchev - * @author Nabil Fawwaz Elqayyim * @since 7.0 * @see DefaultApiVersionInserterBuilder */ diff --git a/spring-web/src/test/java/org/springframework/web/client/DefaultApiVersionInsertersTests.java b/spring-web/src/test/java/org/springframework/web/client/DefaultApiVersionInsertersTests.java index 8ccb567fb08..50995e2933d 100644 --- a/spring-web/src/test/java/org/springframework/web/client/DefaultApiVersionInsertersTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/DefaultApiVersionInsertersTests.java @@ -24,29 +24,20 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link DefaultApiVersionInserter}. - * * @author Nabil Fawwaz Elqayyim */ class DefaultApiVersionInsertersTests { @Test - void insertVersionPreservesExistingEncoding() { - URI uri = URI.create("http://localhost/test?foo=%20"); - DefaultApiVersionInserter inserter = (DefaultApiVersionInserter) ApiVersionInserter.usePathSegment(0); - - URI result = inserter.insertVersion("1", uri); - - assertThat(result.toString()).isEqualTo("http://localhost/1/test?foo=%20"); + void insertVersionViaPathPreservesExistingEncoding() { + URI result = ApiVersionInserter.usePathSegment(0).insertVersion("1", URI.create("/path?q=%20")); + assertThat(result.toString()).isEqualTo("/1/path?q=%20"); } @Test - void insertVersionAsQueryParamPreservesEncoding() { - URI uri = URI.create("http://localhost/test?foo=%20"); - DefaultApiVersionInserter inserter = (DefaultApiVersionInserter) ApiVersionInserter.useQueryParam("v"); - - URI result = inserter.insertVersion("1", uri); - - assertThat(result.toString()).isEqualTo("http://localhost/test?foo=%20&v=1"); + void insertVersionViaQueryParamPreservesEncoding() { + URI result = ApiVersionInserter.useQueryParam("version").insertVersion("1", URI.create("/path?q=%20")); + assertThat(result.toString()).isEqualTo("/path?q=%20&version=1"); } }