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

Do not provide hints for can*() methods anymore

Browse Source 
Issue: SPR-14557
This commit is contained in:
Sebastien Deleuze
2016-09-20 11:49:16 +02:00
parent b83a6daf4b
commit 38f3d12e45
38 changed files with 85 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java
View File

@@ -102,7 +102,7 @@ public abstract class BodyExtractors {
MediaType contentType = contentType(request);
Supplier<Stream<HttpMessageReader<?>>> messageReaders = strategies.messageReaders();
return messageReaders.get()
.filter(r -> r.canRead(elementType, contentType, Collections.emptyMap()))
.filter(r -> r.canRead(elementType, contentType))
.findFirst()
.map(BodyExtractors::<T>cast)
.map(readerFunction)

3
spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyInserters.java
View File

@@ -208,8 +208,7 @@ public abstract class BodyInserters {
// TODO: use ContentNegotiatingResultHandlerSupport
MediaType contentType = response.getHeaders().getContentType();
return strategies.messageWriters().get()
.filter(messageWriter -> messageWriter.canWrite(bodyType, contentType, Collections
.emptyMap()))
.filter(messageWriter -> messageWriter.canWrite(bodyType, contentType))
.findFirst()
.map(BodyInserters::cast)
.map(messageWriter -> messageWriter

6
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/HttpMessageWriterView.java
View File

@@ -124,7 +124,7 @@ public class HttpMessageWriterView implements View {
else if (map.size() == 1) {
return map.values().iterator().next();
}
else if (getMessageWriter().canWrite(ResolvableType.forClass(Map.class), null, Collections.emptyMap())) {
else if (getMessageWriter().canWrite(ResolvableType.forClass(Map.class), null)) {
return map;
}
else {
@@ -143,10 +143,10 @@ public class HttpMessageWriterView implements View {
protected boolean isEligibleAttribute(String attributeName, Object attributeValue) {
ResolvableType type = ResolvableType.forClass(attributeValue.getClass());
if (getModelKeys().isEmpty()) {
return getMessageWriter().canWrite(type, null, Collections.emptyMap());
return getMessageWriter().canWrite(type, null);
}
if (getModelKeys().contains(attributeName)) {
if (getMessageWriter().canWrite(type, null, Collections.emptyMap())) {
if (getMessageWriter().canWrite(type, null)) {
return true;
}
throw new IllegalStateException(

4
spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java
View File

@@ -271,7 +271,7 @@ public class WebReactiveConfigurationTests {
private void assertHasMessageReader(List<HttpMessageReader<?>> readers, Class<?> clazz, MediaType mediaType) {
ResolvableType type = ResolvableType.forClass(clazz);
assertTrue(readers.stream()
.filter(c -> mediaType == null || c.canRead(type, mediaType, Collections.emptyMap()))
.filter(c -> mediaType == null || c.canRead(type, mediaType))
.findAny()
.isPresent());
}
@@ -279,7 +279,7 @@ public class WebReactiveConfigurationTests {
private void assertHasMessageWriter(List<HttpMessageWriter<?>> writers, Class<?> clazz, MediaType mediaType) {
ResolvableType type = ResolvableType.forClass(clazz);
assertTrue(writers.stream()
.filter(c -> mediaType == null || c.canWrite(type, mediaType, Collections.emptyMap()))
.filter(c -> mediaType == null || c.canWrite(type, mediaType))
.findAny()
.isPresent());
}

4
spring-web-reactive/src/test/java/org/springframework/web/reactive/function/StrategiesSupplierTests.java
View File

@@ -92,7 +92,7 @@ public class StrategiesSupplierTests {
private static class DummyMessageWriter implements HttpMessageWriter<Object> {
@Override
public boolean canWrite(ResolvableType type, MediaType mediaType, Map<String, Object> hints) {
public boolean canWrite(ResolvableType type, MediaType mediaType) {
return false;
}
@@ -113,7 +113,7 @@ public class StrategiesSupplierTests {
private static class DummyMessageReader implements HttpMessageReader<Object> {
@Override
public boolean canRead(ResolvableType type, MediaType mediaType, Map<String, Object> hints) {
public boolean canRead(ResolvableType type, MediaType mediaType) {
return false;
}