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

Polishing

Browse Source 
This commit polishes previous one by also accepting
generic types explicitly declared with a class that
extends DataBuffer allowing to write Flux<DefaultDataBuffer>
for example.

Issue: SPR-14952
This commit is contained in:
Sebastien Deleuze
2016-11-25 09:59:08 +01:00
parent a98be035a3
commit 8d26c738a0
14 changed files with 77 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpResponse.java
View File

@@ -50,9 +50,9 @@ public class MockServerHttpResponse implements ServerHttpResponse {
private final MultiValueMap<String, ResponseCookie> cookies = new LinkedMultiValueMap<>();
private Publisher<DataBuffer> body;
private Publisher<? extends DataBuffer> body;
private Publisher<? extends Publisher<DataBuffer>> bodyWithFlushes;
private Publisher<? extends Publisher<? extends DataBuffer>> bodyWithFlushes;
private DataBufferFactory bufferFactory = new DefaultDataBufferFactory();
@@ -77,22 +77,22 @@ public class MockServerHttpResponse implements ServerHttpResponse {
return this.cookies;
}
public Publisher<DataBuffer> getBody() {
public Publisher<? extends DataBuffer> getBody() {
return this.body;
}
public Publisher<? extends Publisher<DataBuffer>> getBodyWithFlush() {
public Publisher<? extends Publisher<? extends DataBuffer>> getBodyWithFlush() {
return this.bodyWithFlushes;
}
@Override
public Mono<Void> writeWith(Publisher<DataBuffer> body) {
public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
this.body = body;
return Flux.from(this.body).then();
}
@Override
public Mono<Void> writeAndFlushWith(Publisher<? extends Publisher<DataBuffer>> body) {
public Mono<Void> writeAndFlushWith(Publisher<? extends Publisher<? extends DataBuffer>> body) {
this.bodyWithFlushes = body;
return Flux.from(this.bodyWithFlushes).then();
}