spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-26 08:59:09 +00:00
Code Issues Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Sébastien Deleuze
2025-11-25 12:37:45 +01:00
parent 8642a39a03
commit 1b6b163f24
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/codec/AbstractJacksonEncoder.java
+2 -2
View File
@@ -130,10 +130,10 @@ public abstract class AbstractJacksonEncoder<T extends ObjectMapper> extends Jac
if (clazz == null) {
return true;
}
if (MappingJacksonValue.class.isAssignableFrom(elementType.resolve(clazz))) {
if (MappingJacksonValue.class.isAssignableFrom(clazz)) {
throw new UnsupportedOperationException("MappingJacksonValue is not supported, use hints instead");
}
return !String.class.isAssignableFrom(elementType.resolve(clazz));
return !String.class.isAssignableFrom(clazz);
}
@Override
spring-web/src/main/java/org/springframework/http/codec/json/GsonDecoder.java
+1 -4
View File
@@ -77,10 +77,7 @@ public class GsonDecoder extends AbstractDataBufferDecoder<Object> {
@Override
public boolean canDecode(ResolvableType elementType, @Nullable MimeType mimeType) {
if (!super.canDecode(elementType, mimeType)) {
return false;
}
return !CharSequence.class.isAssignableFrom(elementType.toClass());
return super.canDecode(elementType, mimeType) && !CharSequence.class.isAssignableFrom(elementType.toClass());
}
@Override
spring-web/src/main/java/org/springframework/http/codec/json/GsonEncoder.java
+1 -2
View File
@@ -106,8 +106,7 @@ public class GsonEncoder extends AbstractEncoder<Object> implements HttpMessageE
if (!super.canEncode(elementType, mimeType)) {
return false;
}
Class<?> clazz = elementType.toClass();
return !String.class.isAssignableFrom(elementType.resolve(clazz));
return !String.class.isAssignableFrom(elementType.toClass());
}
@Override
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
+3 -3
View File
@@ -267,9 +267,9 @@ public abstract class AbstractMessageWriterResultHandler extends HandlerResultHa
private List<MediaType> getMediaTypesFor(ResolvableType elementType) {
List<MediaType> writableMediaTypes = new ArrayList<>();
for (HttpMessageWriter<?> converter : getMessageWriters()) {
if (converter.canWrite(elementType, null)) {
writableMediaTypes.addAll(converter.getWritableMediaTypes(elementType));
for (HttpMessageWriter<?> messageWriter : getMessageWriters()) {
if (messageWriter.canWrite(elementType, null)) {
writableMediaTypes.addAll(messageWriter.getWritableMediaTypes(elementType));
}
}
return writableMediaTypes;