DATACMNS-943 - We prefer direct matches on repository query method overloads.

We now try to look up a target class method based on concrete name and parameter type before falling back on the more expensive type matches. This also eliminates the possibility of invalid method matches as described in the ticket.
This commit is contained in:
Oliver Gierke
2016-11-24 17:21:11 +01:00
parent 5cc7f7ab15
commit 7ceb761457
2 changed files with 28 additions and 1 deletions

View File

@@ -243,6 +243,12 @@ class DefaultRepositoryInformation implements RepositoryInformation {
return method;
}
Method result = findMethod(baseClass, method.getName(), method.getParameterTypes());
if (result != null) {
return result;
}
for (Method baseClassMethod : baseClass.getMethods()) {
// Wrong name

View File

@@ -254,6 +254,21 @@ public class DefaultRepositoryInformationUnitTests {
assertThat(information.isCustomMethod(customBaseRepositoryMethod), is(true));
}
/**
* @see DATACMNS-943
* @throws Exception
*/
@Test
public void usesCorrectSaveOverload() throws Exception {
RepositoryMetadata metadata = new DefaultRepositoryMetadata(DummyRepository.class);
RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, null);
Method method = DummyRepository.class.getMethod("save", Iterable.class);
assertThat(information.getTargetClassMethod(method), is(CrudRepository.class.getMethod("save", Iterable.class)));
}
private static Method getMethodFrom(Class<?> type, String name) {
for (Method method : type.getMethods()) {
@@ -303,7 +318,7 @@ public class DefaultRepositoryInformationUnitTests {
@Override
public Iterator<User> iterator() {
return Collections.<User>emptySet().iterator();
return Collections.<User> emptySet().iterator();
}
}
@@ -366,4 +381,10 @@ public class DefaultRepositoryInformationUnitTests {
}
static class Sample {}
interface DummyRepository extends CrudRepository<User, Integer> {
@Override
<S extends User> List<S> save(Iterable<S> entites);
}
}