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

DATACMNS-1421 - Lookup most specific wither method for a property.

Browse Source 
We now inspect all methods that match the wither method pattern (name, accepting a single argument) to find the most specific method returning the actual entity type.

Previously, we attempted to find a method only considering name and argument properties and not the return type. This lookup strategy could find a method returning the entity super type that isn't assignable to the entity type.

Original pull request: #323.
This commit is contained in:
Mark Paluch
2018-11-19 10:15:00 +01:00
committed by Oliver Drotbohm
parent 9d16739943
commit 5bbb458dc5
2 changed files with 70 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/springframework/data/mapping/model/Property.java
View File

@@ -22,6 +22,7 @@ import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import org.springframework.data.util.Lazy;
@@ -79,19 +80,23 @@ public class Property {
.filter(it -> type.getParameterTypes(it).get(0).getType().isAssignableFrom(getType()));
this.wither = Lazy.of(() -> findWither(type, getName(), getType()));
}
private static Optional<Method> findWither(TypeInformation<?> owner, String propertyName, Class<?> rawType) {
Method method = ReflectionUtils.findMethod(owner.getType(),
String.format("with%s", StringUtils.capitalize(propertyName)), rawType);
AtomicReference<Method> resultHolder = new AtomicReference<>();
String methodName = String.format("with%s", StringUtils.capitalize(propertyName));
if (method != null && owner.isAssignableFrom(owner.getReturnType(method))) {
return Optional.of(method);
}
ReflectionUtils.doWithMethods(owner.getType(), it -> {
return Optional.empty();
if (owner.isAssignableFrom(owner.getReturnType(it))) {
resultHolder.set(it);
}
}, it -> it.getName().equals(methodName) && it.getParameterCount() == 1
&& it.getParameterTypes()[0].equals(rawType));
Method method = resultHolder.get();
return method != null ? Optional.of(method) : Optional.empty();
}
/**