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

DATACMNS-1284 - Polishing.

Browse Source 
Backport of 06116b7.

Related ticket: DATACMNS-1206.
Original commit: 06116b7.
This commit is contained in:
Mark Paluch
2018-04-03 10:39:37 +02:00
committed by Oliver Gierke
parent 428b0decd5
commit 999d26436b
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/data/projection/DefaultProjectionInformation.java
View File

@@ -122,7 +122,14 @@ class DefaultProjectionInformation implements ProjectionInformation {
final Map<String, Integer> orders = getMethodOrder(metadata);
for (PropertyDescriptor descriptor : filterDefaultMethods(BeanUtils.getPropertyDescriptors(type))) {
if (metadata == null || orders.containsKey(descriptor.getReadMethod().getName())) {
Method readMethod = descriptor.getReadMethod();
if (readMethod == null) {
continue;
}
if (metadata == null || orders.containsKey(readMethod.getName())) {
result.add(descriptor);
}
}
@@ -237,6 +244,6 @@ class DefaultProjectionInformation implements ProjectionInformation {
Method method = descriptor.getReadMethod();
return method == null ? false : ReflectionUtils.isDefaultMethod(method);
return method != null && ReflectionUtils.isDefaultMethod(method);
}
}