Polishing contribution

Closes gh-27220

spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java

@@ -125,16 +125,17 @@ public interface ClientRequest {
 	// Static builder methods
 
 	/**
-	 * Create a builder with the method, URI, headers, cookies, attributes, and body of the given request.
+	 * Create a builder initialized with the HTTP method, url, headers, cookies,
-	 * @param other the request to copy the method, URI, headers, cookies, attributes, and body from
+	 * attributes, and body of the given request.
-	 * @return the created builder
+	 * @param other the request to copy from
+	 * @return the builder instance
 	 */
 	static Builder from(ClientRequest other) {
 		return new DefaultClientRequestBuilder(other);
 	}
 
 	/**
-	 * Create a builder with the given method and url.
+	 * Create a builder with the given HTTP method and url.
 	 * @param method the HTTP method (GET, POST, etc)
 	 * @param url the url (as a URI instance)
 	 * @return the created builder
@@ -146,7 +147,7 @@ public interface ClientRequest {
 	}
 
 	/**
-	 * Create a request builder with the given method and url.
+	 * Create a request builder with the given HTTP method and url.
 	 * @param method the HTTP method (GET, POST, etc)
 	 * @param url the url (as a URI instance)
 	 * @return the created builder

spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java

@@ -51,20 +51,24 @@ import static org.springframework.http.HttpMethod.POST;
  */
 public class DefaultClientRequestBuilderTests {
 
+	private static final URI DEFAULT_URL = URI.create("https://example.com");
+
 	@Test
-	public void from() throws URISyntaxException {
+	public void from() {
-		ClientRequest other = ClientRequest.create(GET, URI.create("https://example.com"))
+		ClientRequest other = ClientRequest.create(GET, DEFAULT_URL)
 				.header("foo", "bar")
 				.cookie("baz", "qux")
 				.attribute("attributeKey", "attributeValue")
 				.attribute("anotherAttributeKey", "anotherAttributeValue")
 				.httpRequest(request -> {})
 				.build();
+
 		ClientRequest result = ClientRequest.from(other)
 				.headers(httpHeaders -> httpHeaders.set("foo", "baar"))
 				.cookies(cookies -> cookies.set("baz", "quux"))
 				.build();
-		assertThat(result.url()).isEqualTo(new URI("https://example.com"));
+
+		assertThat(result.url()).isEqualTo(DEFAULT_URL);
 		assertThat(result.method()).isEqualTo(GET);
 		assertThat(result.headers().size()).isEqualTo(1);
 		assertThat(result.headers().getFirst("foo")).isEqualTo("baar");
@@ -81,13 +85,10 @@ public class DefaultClientRequestBuilderTests {
 		BodyInserter<String, ClientHttpRequest> inserter = (response, strategies) -> {
 			byte[] bodyBytes = body.getBytes(UTF_8);
 			DataBuffer buffer = DefaultDataBufferFactory.sharedInstance.wrap(bodyBytes);
-
 			return response.writeWith(Mono.just(buffer));
 		};
 
-		ClientRequest other = ClientRequest.create(POST, URI.create("https://example.com"))
+		ClientRequest other = ClientRequest.create(POST, DEFAULT_URL).body(inserter).build();
-				.body(inserter).build();
-
 		ClientRequest result = ClientRequest.from(other).build();
 
 		List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
@@ -105,9 +106,8 @@ public class DefaultClientRequestBuilderTests {
 	}
 
 	@Test
-	public void method() throws URISyntaxException {
+	public void method() {
-		URI url = new URI("https://example.com");
+		ClientRequest.Builder builder = ClientRequest.create(DELETE, DEFAULT_URL);
-		ClientRequest.Builder builder = ClientRequest.create(DELETE, url);
 		assertThat(builder.build().method()).isEqualTo(DELETE);
 
 		builder.method(OPTIONS);
@@ -127,18 +127,17 @@ public class DefaultClientRequestBuilderTests {
 
 	@Test
 	public void cookie() {
-		ClientRequest result = ClientRequest.create(GET, URI.create("https://example.com"))
+		ClientRequest result = ClientRequest.create(GET, DEFAULT_URL).cookie("foo", "bar").build();
-				.cookie("foo", "bar").build();
 		assertThat(result.cookies().getFirst("foo")).isEqualTo("bar");
 	}
 
 	@Test
 	public void build() {
-		ClientRequest result = ClientRequest.create(GET, URI.create("https://example.com"))
+		ClientRequest result = ClientRequest.create(GET, DEFAULT_URL)
 				.header("MyKey", "MyValue")
 				.cookie("foo", "bar")
 				.httpRequest(request -> {
-					MockClientHttpRequest nativeRequest = (MockClientHttpRequest) request.getNativeRequest();
+					MockClientHttpRequest nativeRequest = request.getNativeRequest();
 					nativeRequest.getHeaders().add("MyKey2", "MyValue2");
 				})
 				.build();
@@ -158,16 +157,14 @@ public class DefaultClientRequestBuilderTests {
 	@Test
 	public void bodyInserter() {
 		String body = "foo";
-		BodyInserter<String, ClientHttpRequest> inserter =
+		BodyInserter<String, ClientHttpRequest> inserter = (response, strategies) -> {
-				(response, strategies) -> {
 			byte[] bodyBytes = body.getBytes(UTF_8);
 			DataBuffer buffer = DefaultDataBufferFactory.sharedInstance.wrap(bodyBytes);
 
 			return response.writeWith(Mono.just(buffer));
 		};
 
-		ClientRequest result = ClientRequest.create(POST, URI.create("https://example.com"))
+		ClientRequest result = ClientRequest.create(POST, DEFAULT_URL).body(inserter).build();
-				.body(inserter).build();
 
 		List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
 		messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes()));
@@ -179,17 +176,14 @@ public class DefaultClientRequestBuilderTests {
 		result.writeTo(request, strategies).block();
 		assertThat(request.getBody()).isNotNull();
 
-		StepVerifier.create(request.getBody())
+		StepVerifier.create(request.getBody()).expectNextCount(1).verifyComplete();
-				.expectNextCount(1)
-				.verifyComplete();
 	}
 
 	@Test
 	public void bodyClass() {
 		String body = "foo";
 		Publisher<String> publisher = Mono.just(body);
-		ClientRequest result = ClientRequest.create(POST, URI.create("https://example.com"))
+		ClientRequest result = ClientRequest.create(POST, DEFAULT_URL).body(publisher, String.class).build();
-				.body(publisher, String.class).build();
 
 		List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
 		messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes()));
@@ -201,9 +195,7 @@ public class DefaultClientRequestBuilderTests {
 		result.writeTo(request, strategies).block();
 		assertThat(request.getBody()).isNotNull();
 
-		StepVerifier.create(request.getBody())
+		StepVerifier.create(request.getBody()).expectNextCount(1).verifyComplete();
-				.expectNextCount(1)
-				.verifyComplete();
 	}
 
 	@Test
@@ -211,8 +203,7 @@ public class DefaultClientRequestBuilderTests {
 		String body = "foo";
 		Publisher<String> publisher = Mono.just(body);
 		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<String>() {};
-		ClientRequest result = ClientRequest.create(POST, URI.create("https://example.com"))
+		ClientRequest result = ClientRequest.create(POST, DEFAULT_URL).body(publisher, typeReference).build();
-				.body(publisher, typeReference).build();
 
 		List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
 		messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes()));
@@ -224,9 +215,7 @@ public class DefaultClientRequestBuilderTests {
 		result.writeTo(request, strategies).block();
 		assertThat(request.getBody()).isNotNull();
 
-		StepVerifier.create(request.getBody())
+		StepVerifier.create(request.getBody()).expectNextCount(1).verifyComplete();
-				.expectNextCount(1)
-				.verifyComplete();
 	}
 
 }