root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Improve Javadoc for ClientRequest#from 

See gh-27220
This commit is contained in:
Alexej Timonin 2021-07-30 21:32:36 +02:00 committed by Rossen Stoyanchev
parent 8670b1c3f0
commit e290ae285c
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -125,8 +125,8 @@ public interface ClientRequest {
// Static builder methods
/**
* Create a builder with the method, URI, headers, and cookies of the given request.
* @param other the request to copy the method, URI, headers, and cookies from
* Create a builder with the method, URI, headers, cookies, attributes, and body of the given request.
* @param other the request to copy the method, URI, headers, cookies, attributes, and body from
* @return the created builder
*/
static Builder from(ClientRequest other) {

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

@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -56,6 +56,8 @@ public class DefaultClientRequestBuilderTests {
ClientRequest other = ClientRequest.create(GET, URI.create("https://example.com"))
.header("foo", "bar")
.cookie("baz", "qux")
.attribute("attributeKey", "attributeValue")
.attribute("anotherAttributeKey", "anotherAttributeValue")
.httpRequest(request -> {})
.build();
ClientRequest result = ClientRequest.from(other)
@ -69,6 +71,37 @@ public class DefaultClientRequestBuilderTests {
assertThat(result.cookies().size()).isEqualTo(1);
assertThat(result.cookies().getFirst("baz")).isEqualTo("quux");
assertThat(result.httpRequest()).isNotNull();
assertThat(result.attributes().get("attributeKey")).isEqualTo("attributeValue");
assertThat(result.attributes().get("anotherAttributeKey")).isEqualTo("anotherAttributeValue");
}
@Test
public void fromCopiesBody() {
String body = "foo";
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"))
.body(inserter).build();
ClientRequest result = ClientRequest.from(other).build();
List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes()));
ExchangeStrategies strategies = mock(ExchangeStrategies.class);
given(strategies.messageWriters()).willReturn(messageWriters);
MockClientHttpRequest request = new MockClientHttpRequest(POST, "/");
result.writeTo(request, strategies).block();
String copiedBody = request.getBodyAsString().block();
assertThat(copiedBody).isEqualTo("foo");
}
@Test