From e73710374dbef2fe76a228375522253a510ea03e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Thu, 30 Mar 2017 16:18:59 +0200
Subject: [PATCH] DATACMNS-1023 - We prefer direct matches on reactive
 repository query method overloads.

We now attempt to look up a target class method based on exact name and parameter types before falling back on the more expensive type matches. This also eliminates the possibility of invalid method matches as described in the ticket.

Related ticket: DATACMNS-943.
Original Pull Request: #194
---
 .../ReactiveRepositoryInformation.java        | 14 +++++++++----
 ...eactiveRepositoryInformationUnitTests.java | 21 +++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformation.java b/src/main/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformation.java
index 916fd5893..95df89175 100644
--- a/src/main/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformation.java
+++ b/src/main/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,9 @@
 package org.springframework.data.repository.core.support;
 
 import static org.springframework.core.GenericTypeResolver.*;
+import static org.springframework.util.ReflectionUtils.*;
+
+import lombok.Value;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
@@ -29,7 +32,6 @@ import java.util.function.Supplier;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import lombok.Value;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.convert.ConversionService;
@@ -76,7 +78,10 @@ public class ReactiveRepositoryInformation extends DefaultRepositoryInformation
 	@Override
 	Method getTargetClassMethod(Method method, Optional<Class<?>> baseClass) {
 
-		return baseClass.flatMap(it -> {
+		Supplier<Optional<Method>> directMatch = () -> baseClass
+				.map(it -> findMethod(it, method.getName(), method.getParameterTypes()));
+
+		Supplier<Optional<Method>> detailedComparison = () -> baseClass.flatMap(it -> {
 
 			List<Supplier<Optional<Method>>> suppliers = new ArrayList<>();
 
@@ -88,8 +93,9 @@ public class ReactiveRepositoryInformation extends DefaultRepositoryInformation
 			suppliers.add(() -> getMethodCandidate(method, it, matchParameterOrComponentType(getRepositoryInterface())));
 
 			return Optionals.firstNonEmpty(Streamable.of(suppliers));
+		});
 
-		}).orElse(method);
+		return Optionals.firstNonEmpty(directMatch, detailedComparison).orElse(method);
 	}
 
 	/**
diff --git a/src/test/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformationUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformationUnitTests.java
index 16305eb23..a51ed236f 100644
--- a/src/test/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformationUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformationUnitTests.java
@@ -18,6 +18,7 @@ package org.springframework.data.repository.core.support;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
+import reactor.core.publisher.Flux;
 import rx.Observable;
 
 import java.io.Serializable;
@@ -28,6 +29,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.reactivestreams.Publisher;
+import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.reactive.ReactiveCrudRepository;
 import org.springframework.data.repository.reactive.ReactiveSortingRepository;
@@ -112,6 +114,19 @@ public class ReactiveRepositoryInformationUnitTests {
 		assertThat(reference.getParameterTypes()[0], is(equalTo(Object.class)));
 	}
 
+	@Test // DATACMNS-1023
+	public void usesCorrectSaveOverload() throws Exception {
+
+		RepositoryMetadata metadata = new DefaultRepositoryMetadata(DummyRepository.class);
+		RepositoryInformation information = new ReactiveRepositoryInformation(metadata, ReactiveCrudRepository.class,
+				Optional.empty());
+
+		Method method = DummyRepository.class.getMethod("save", Iterable.class);
+
+		assertThat(information.getTargetClassMethod(method),
+				is(ReactiveCrudRepository.class.getMethod("save", Iterable.class)));
+	}
+
 	interface RxJava1InterfaceWithGenerics extends RxJava1CrudRepository<User, String> {}
 
 	interface ReactiveJavaInterfaceWithGenerics extends ReactiveCrudRepository<User, String> {}
@@ -121,6 +136,12 @@ public class ReactiveRepositoryInformationUnitTests {
 
 	}
 
+	interface DummyRepository extends ReactiveCrudRepository<User, Integer> {
+
+		@Override
+		<S extends User> Flux<S> save(Iterable<S> entities);
+	}
+
 	static class User {
 
 		String id;