root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2020-02-12 18:32:32 +01:00
parent d0d8c6e749
commit a4179b4795
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java
View File

@ -541,6 +541,7 @@ public class ImportSelectorTests {
.collect(Collectors.toMap(entry -> entry.getKey().getClassName(), .collect(Collectors.toMap(entry -> entry.getKey().getClassName(),
Map.Entry::getValue)); Map.Entry::getValue));
} }
private final List<Entry> instanceImports = new ArrayList<>(); private final List<Entry> instanceImports = new ArrayList<>();
@Override @Override

3
spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java
View File

@ -112,7 +112,7 @@ public abstract class AbstractJackson2Decoder extends Jackson2CodecSupport imple
ObjectMapper mapper = getObjectMapper(); ObjectMapper mapper = getObjectMapper();
boolean forceUseOfBigDecimal = mapper.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS); boolean forceUseOfBigDecimal = mapper.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS);
if (elementType != null && BigDecimal.class.equals(elementType.getType())) { if (BigDecimal.class.equals(elementType.getType())) {
forceUseOfBigDecimal = true; forceUseOfBigDecimal = true;
} }
@ -224,6 +224,7 @@ public abstract class AbstractJackson2Decoder extends Jackson2CodecSupport imple
return getMimeTypes(); return getMimeTypes();
} }
// Jackson2CodecSupport // Jackson2CodecSupport
@Override @Override

1
spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java
View File

@ -240,6 +240,7 @@ public abstract class AbstractJackson2Encoder extends Jackson2CodecSupport imple
private ObjectWriter createObjectWriter(ResolvableType valueType, @Nullable MimeType mimeType, private ObjectWriter createObjectWriter(ResolvableType valueType, @Nullable MimeType mimeType,
@Nullable Map<String, Object> hints) { @Nullable Map<String, Object> hints) {
JavaType javaType = getJavaType(valueType.getType(), null); JavaType javaType = getJavaType(valueType.getType(), null);
Class<?> jsonView = (hints != null ? (Class<?>) hints.get(Jackson2CodecSupport.JSON_VIEW_HINT) : null); Class<?> jsonView = (hints != null ? (Class<?>) hints.get(Jackson2CodecSupport.JSON_VIEW_HINT) : null);
ObjectWriter writer = (jsonView != null ? ObjectWriter writer = (jsonView != null ?