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

Make JSON assertions more strict

Browse Source
This commit is contained in:
Stephane Nicoll
2022-04-11 16:36:04 +02:00
parent f65136dd68
commit 10dc10dbf9
6 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-core/src/main/java/org/springframework/aot/nativex/ResourceHintsWriter.java
View File

@@ -46,7 +46,7 @@ class ResourceHintsWriter {
public void write(BasicJsonWriter writer, ResourceHints hints) {
Map<String, Object> attributes = new LinkedHashMap<>();
attributes.put("resources", toAttributes(hints));
addIfNotEmpty(attributes, "resources", toAttributes(hints));
handleResourceBundles(attributes, hints.resourceBundles());
writer.writeObject(attributes);
}
@@ -81,7 +81,17 @@ class ResourceHintsWriter {
}
private void addIfNotEmpty(Map<String, Object> attributes, String name, @Nullable Object value) {
if (value != null && (value instanceof Collection<?> collection && !collection.isEmpty())) {
if (value instanceof Collection<?> collection) {
if (!collection.isEmpty()) {
attributes.put(name, value);
}
}
else if (value instanceof Map<?, ?> map) {
if (!map.isEmpty()) {
attributes.put(name, value);
}
}
else if (value != null) {
attributes.put(name, value);
}
}