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-core/src/main/java/org/springframework/core/codec/AbstractDecoder.java
View File

@@ -50,7 +50,7 @@ public abstract class AbstractDecoder<T> implements Decoder<T> {
}
@Override
public boolean canDecode(ResolvableType elementType, MimeType mimeType, Map<String, Object> hints) {
public boolean canDecode(ResolvableType elementType, MimeType mimeType) {
if (mimeType == null) {
return true;
}

2
spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java
View File

@@ -46,7 +46,7 @@ public abstract class AbstractEncoder<T> implements Encoder<T> {
}
@Override
public boolean canEncode(ResolvableType elementType, MimeType mimeType, Map<String, Object> hints) {
public boolean canEncode(ResolvableType elementType, MimeType mimeType) {
if (mimeType == null) {
return true;
}

4
spring-core/src/main/java/org/springframework/core/codec/ByteBufferDecoder.java
View File

@@ -43,9 +43,9 @@ public class ByteBufferDecoder extends AbstractDecoder<ByteBuffer> {
@Override
public boolean canDecode(ResolvableType elementType, MimeType mimeType, Map<String, Object> hints) {
public boolean canDecode(ResolvableType elementType, MimeType mimeType) {
Class<?> clazz = elementType.getRawClass();
return (super.canDecode(elementType, mimeType, hints) && ByteBuffer.class.isAssignableFrom(clazz));
return (super.canDecode(elementType, mimeType) && ByteBuffer.class.isAssignableFrom(clazz));
}
@Override

4
spring-core/src/main/java/org/springframework/core/codec/ByteBufferEncoder.java
View File

@@ -42,9 +42,9 @@ public class ByteBufferEncoder extends AbstractEncoder<ByteBuffer> {
@Override
public boolean canEncode(ResolvableType elementType, MimeType mimeType, Map<String, Object> hints) {
public boolean canEncode(ResolvableType elementType, MimeType mimeType) {
Class<?> clazz = elementType.getRawClass();
return (super.canEncode(elementType, mimeType, hints) && ByteBuffer.class.isAssignableFrom(clazz));
return (super.canEncode(elementType, mimeType) && ByteBuffer.class.isAssignableFrom(clazz));
}
@Override

4
spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java
View File

@@ -49,9 +49,9 @@ public class CharSequenceEncoder extends AbstractEncoder<CharSequence> {
@Override
public boolean canEncode(ResolvableType elementType, MimeType mimeType, Map<String, Object> hints) {
public boolean canEncode(ResolvableType elementType, MimeType mimeType) {
Class<?> clazz = elementType.getRawClass();
return (super.canEncode(elementType, mimeType, hints) && CharSequence.class.isAssignableFrom(clazz));
return (super.canEncode(elementType, mimeType) && CharSequence.class.isAssignableFrom(clazz));
}
@Override

3
spring-core/src/main/java/org/springframework/core/codec/Decoder.java
View File

@@ -43,10 +43,9 @@ public interface Decoder<T> {
* type of the source stream.
* @param elementType the target element type for the output stream
* @param mimeType the mime type associated with the stream to decode
* @param hints additional information about how to do encode
* @return {@code true} if supported, {@code false} otherwise
*/
boolean canDecode(ResolvableType elementType, MimeType mimeType, Map<String, Object> hints);
boolean canDecode(ResolvableType elementType, MimeType mimeType);
/**
* Decode a {@link DataBuffer} input stream into a Flux of {@code T}.

3
spring-core/src/main/java/org/springframework/core/codec/Encoder.java
View File

@@ -44,10 +44,9 @@ public interface Encoder<T> {
* type for the output stream.
* @param elementType the type of elements in the source stream
* @param mimeType the MIME type for the output stream
* @param hints additional information about how to do encode
* @return {@code true} if supported, {@code false} otherwise
*/
boolean canEncode(ResolvableType elementType, MimeType mimeType, Map<String, Object> hints);
boolean canEncode(ResolvableType elementType, MimeType mimeType);
/**
* Encode a stream of Objects of type {@code T} into a {@link DataBuffer}

4
spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java
View File

@@ -46,11 +46,11 @@ public class ResourceDecoder extends AbstractDecoder<Resource> {
@Override
public boolean canDecode(ResolvableType elementType, MimeType mimeType, Map<String, Object> hints) {
public boolean canDecode(ResolvableType elementType, MimeType mimeType) {
Class<?> clazz = elementType.getRawClass();
return (InputStreamResource.class.equals(clazz) ||
clazz.isAssignableFrom(ByteArrayResource.class)) &&
super.canDecode(elementType, mimeType, hints);
super.canDecode(elementType, mimeType);
}
@Override

4
spring-core/src/main/java/org/springframework/core/codec/ResourceEncoder.java
View File

@@ -57,9 +57,9 @@ public class ResourceEncoder extends AbstractSingleValueEncoder<Resource> {
@Override
public boolean canEncode(ResolvableType elementType, MimeType mimeType, Map<String, Object> hints) {
public boolean canEncode(ResolvableType elementType, MimeType mimeType) {
Class<?> clazz = elementType.getRawClass();
return (super.canEncode(elementType, mimeType, hints) && Resource.class.isAssignableFrom(clazz));
return (super.canEncode(elementType, mimeType) && Resource.class.isAssignableFrom(clazz));
}
@Override

4
spring-core/src/main/java/org/springframework/core/codec/StringDecoder.java
View File

@@ -78,8 +78,8 @@ public class StringDecoder extends AbstractDecoder<String> {
@Override
public boolean canDecode(ResolvableType elementType, MimeType mimeType, Map<String, Object> hints) {
return (super.canDecode(elementType, mimeType, hints) &&
public boolean canDecode(ResolvableType elementType, MimeType mimeType) {
return (super.canDecode(elementType, mimeType) &&
String.class.equals(elementType.getRawClass()));
}