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

#1121 - Shortcut ignored property lookups to prevent NullPointerExceptions.

Browse Source
This commit is contained in:
Oliver Drotbohm
2019-11-18 20:53:20 +01:00
parent fc42597091
commit aa9e449841
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/springframework/hateoas/mediatype/PropertyUtils.java
View File

@@ -204,7 +204,7 @@ public class PropertyUtils {
.filter(descriptor -> !FIELDS_TO_IGNORE.contains(descriptor.getName()))
.filter(descriptor -> !descriptorToBeIgnoredByJackson(type, descriptor))
.filter(descriptor -> !toBeIgnoredByJackson(type, descriptor.getName()))
.filter(descriptor -> !readerIsNotToBeIgnoredByJackson(descriptor));
.filter(descriptor -> !readerIsToBeIgnoredByJackson(descriptor));
}
/**
@@ -229,8 +229,11 @@ public class PropertyUtils {
* @param descriptor
* @return
*/
private static boolean readerIsNotToBeIgnoredByJackson(PropertyDescriptor descriptor) {
return toBeIgnoredByJackson(MergedAnnotations.from(descriptor.getReadMethod()));
private static boolean readerIsToBeIgnoredByJackson(PropertyDescriptor descriptor) {
Method reader = descriptor.getReadMethod();
return reader == null ? false : toBeIgnoredByJackson(MergedAnnotations.from(reader));
}
/**