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

Fix failing tests

Browse Source
This commit is contained in:
Rossen Stoyanchev
2017-03-21 11:37:42 -04:00
parent 041437fd68
commit 5345bd4a85
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultControllerSpec.java
View File

@@ -25,8 +25,8 @@ import java.util.function.Consumer;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.format.FormatterRegistry;
import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.codec.HttpMessageWriter;
import org.springframework.http.codec.ServerHttpMessageReader;
import org.springframework.http.codec.ServerHttpMessageWriter;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.Validator;
@@ -85,13 +85,13 @@ class DefaultControllerSpec extends AbstractMockServerSpec<WebTestClient.Control
}
@Override
public DefaultControllerSpec messageReaders(Consumer<List<HttpMessageReader<?>>> consumer) {
public DefaultControllerSpec messageReaders(Consumer<List<ServerHttpMessageReader<?>>> consumer) {
this.configurer.readersConsumer = consumer;
return this;
}
@Override
public DefaultControllerSpec messageWriters(Consumer<List<HttpMessageWriter<?>>> consumer) {
public DefaultControllerSpec messageWriters(Consumer<List<ServerHttpMessageWriter<?>>> consumer) {
this.configurer.writersConsumer = consumer;
return this;
}
@@ -145,9 +145,9 @@ class DefaultControllerSpec extends AbstractMockServerSpec<WebTestClient.Control
private Consumer<PathMatchConfigurer> pathMatchConsumer;
private Consumer<List<HttpMessageReader<?>>> readersConsumer;
private Consumer<List<ServerHttpMessageReader<?>>> readersConsumer;
private Consumer<List<HttpMessageWriter<?>>> writersConsumer;
private Consumer<List<ServerHttpMessageWriter<?>>> writersConsumer;
private Consumer<FormatterRegistry> formattersConsumer;
@@ -178,14 +178,14 @@ class DefaultControllerSpec extends AbstractMockServerSpec<WebTestClient.Control
}
@Override
public void extendMessageReaders(List<HttpMessageReader<?>> readers) {
public void extendMessageReaders(List<ServerHttpMessageReader<?>> readers) {
if (this.readersConsumer != null) {
this.readersConsumer.accept(readers);
}
}
@Override
public void extendMessageWriters(List<HttpMessageWriter<?>> writers) {
public void extendMessageWriters(List<ServerHttpMessageWriter<?>> writers) {
if (this.writersConsumer != null) {
this.writersConsumer.accept(writers);
}

8
spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
View File

@@ -34,8 +34,8 @@ import org.springframework.format.FormatterRegistry;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.client.reactive.ClientHttpRequest;
import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.codec.HttpMessageWriter;
import org.springframework.http.codec.ServerHttpMessageReader;
import org.springframework.http.codec.ServerHttpMessageWriter;
import org.springframework.util.MultiValueMap;
import org.springframework.validation.Validator;
import org.springframework.web.reactive.accept.RequestedContentTypeResolverBuilder;
@@ -247,13 +247,13 @@ public interface WebTestClient {
* Modify or extend the list of built-in message readers.
* @see WebFluxConfigurer#configureMessageReaders
*/
ControllerSpec messageReaders(Consumer<List<HttpMessageReader<?>>> readers);
ControllerSpec messageReaders(Consumer<List<ServerHttpMessageReader<?>>> readers);
/**
* Modify or extend the list of built-in message writers.
* @see WebFluxConfigurer#configureMessageWriters
*/
ControllerSpec messageWriters(Consumer<List<HttpMessageWriter<?>>> writers);
ControllerSpec messageWriters(Consumer<List<ServerHttpMessageWriter<?>>> writers);
/**
* Register formatters and converters to use for type conversion.