Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename fromObject to fromValue in BodyInserters

Browse Source 
Closes gh-23587
This commit is contained in:
Sebastien Deleuze
2019-09-09 00:08:47 +02:00
parent 665e8aa51c
commit 5bb8c47b14
11 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java
View File

@@ -117,7 +117,7 @@ public class BodyInsertersTests {
@Test
public void ofString() {
String body = "foo";
BodyInserter<String, ReactiveHttpOutputMessage> inserter = BodyInserters.fromObject(body);
BodyInserter<String, ReactiveHttpOutputMessage> inserter = BodyInserters.fromValue(body);
MockServerHttpResponse response = new MockServerHttpResponse();
Mono<Void> result = inserter.insert(response, this.context);
@@ -134,7 +134,7 @@ public class BodyInsertersTests {
@Test
public void ofObject() {
User body = new User("foo", "bar");
BodyInserter<User, ReactiveHttpOutputMessage> inserter = BodyInserters.fromObject(body);
BodyInserter<User, ReactiveHttpOutputMessage> inserter = BodyInserters.fromValue(body);
MockServerHttpResponse response = new MockServerHttpResponse();
Mono<Void> result = inserter.insert(response, this.context);
StepVerifier.create(result).expectComplete().verify();
@@ -148,7 +148,7 @@ public class BodyInsertersTests {
@Test
public void ofObjectWithHints() {
User body = new User("foo", "bar");
BodyInserter<User, ReactiveHttpOutputMessage> inserter = BodyInserters.fromObject(body);
BodyInserter<User, ReactiveHttpOutputMessage> inserter = BodyInserters.fromValue(body);
this.hints.put(JSON_VIEW_HINT, SafeToSerialize.class);
MockServerHttpResponse response = new MockServerHttpResponse();
Mono<Void> result = inserter.insert(response, this.context);

3
spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java
View File

@@ -41,7 +41,6 @@ import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse
import org.springframework.mock.web.test.server.MockServerWebExchange;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.reactive.function.BodyInserters;
import org.springframework.web.reactive.result.view.ViewResolver;
import static org.assertj.core.api.Assertions.assertThat;
@@ -315,7 +314,7 @@ public class DefaultServerResponseBuilderTests {
serverResponse = ServerResponse.ok()
.cookie(ResponseCookie.from("foo", "bar").build())
.body(BodyInserters.fromObject("body"));
.bodyValue("body");
assertThat(serverResponse.block().cookies().isEmpty()).isFalse();

5
spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionTests.java
View File

@@ -21,7 +21,6 @@ import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.web.reactive.function.BodyInserters.fromObject;
/**
* @author Arjen Poutsma
@@ -49,7 +48,7 @@ public class RouterFunctionTests {
@Test
public void andOther() {
HandlerFunction<ServerResponse> handlerFunction =
request -> ServerResponse.ok().body(fromObject("42"));
request -> ServerResponse.ok().bodyValue("42");
RouterFunction<?> routerFunction1 = request -> Mono.empty();
RouterFunction<ServerResponse> routerFunction2 =
request -> Mono.just(handlerFunction);
@@ -120,7 +119,7 @@ public class RouterFunctionTests {
private Mono<ServerResponse> handlerMethod(ServerRequest request) {
return ServerResponse.ok().body(fromObject("42"));
return ServerResponse.ok().bodyValue("42");
}
}