DATACMNS-836 - Provide wrapper conversion, ReactiveWrappers and RxJava 2 type conversion.

Author: mp911de

pom.xml

@@ -17,8 +17,8 @@
 
 	<properties>
 		<scala>2.11.7</scala>
-		<reactor>2.5.0.M4</reactor>
 		<xmlbeam>1.4.8</xmlbeam>
+		<spring>5.0.0.BUILD-SNAPSHOT</spring>
 	</properties>
 
 	<dependencies>
@@ -114,6 +114,20 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>io.reactivex</groupId>
+			<artifactId>rxjava-reactive-streams</artifactId>
+			<version>${rxjava-reactive-streams}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>io.reactivex.rxjava2</groupId>
+			<artifactId>rxjava</artifactId>
+			<version>${rxjava2}</version>
+			<optional>true</optional>
+		</dependency>
+
 		<!--  Querydsl -->
 
 		<dependency>

src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java

@@ -43,6 +43,7 @@
  * {@link #getModulePrefix()}). Stubs out the post-processing methods as they might not be needed by default.
  * 
  * @author Oliver Gierke
+ * @author Mark Paluch
  */
 public abstract class RepositoryConfigurationExtensionSupport implements RepositoryConfigurationExtension {
 
@@ -293,7 +294,7 @@ protected boolean isStrictRepositoryCandidate(Class<?> repositoryInterface) {
 	 * @param loader must not be {@literal null}.
 	 * @return the repository interface or {@literal null} if it can't be loaded.
 	 */
-	private Class<?> loadRepositoryInterface(RepositoryConfiguration<?> configuration, ResourceLoader loader) {
+	protected Class<?> loadRepositoryInterface(RepositoryConfiguration<?> configuration, ResourceLoader loader) {
 
 		String repositoryInterface = configuration.getRepositoryInterface();
 		ClassLoader classLoader = loader.getClassLoader();

src/main/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformation.java

@@ -33,6 +33,7 @@
  * converted for invocation of implementation methods.
  * 
  * @author Mark Paluch
+ * @since 2.0
  */
 public class ReactiveRepositoryInformation extends DefaultRepositoryInformation {
 
@@ -75,7 +76,7 @@ Method getTargetClassMethod(Method method, Class<?> baseClass) {
 		boolean wantsWrappers = wantsMethodUsingReactiveWrapperParameters(method);
 
 		if (wantsWrappers) {
-			Method candidate = getMethodCandidate(method, baseClass, new ExactWrapperMatch(method));
+			Method candidate = getMethodCandidate(method, baseClass, new AssignableWrapperMatch(method));
 
 			if (candidate != null) {
 				return candidate;
@@ -171,6 +172,11 @@ static boolean isNonunwrappingWrapper(Class<?> parameterType) {
 				&& !QueryExecutionConverters.supportsUnwrapping(parameterType);
 	}
 
+	/**
+	 * {@link BiPredicate} to check whether a method parameter is a {@link #isNonunwrappingWrapper(Class)} and can be
+	 * converted into a different wrapper. Usually {@link rx.Observable} to {@link org.reactivestreams.Publisher}
+	 * conversion.
+	 */
 	static class WrapperConversionMatch implements BiPredicate<Class<?>, Integer> {
 
 		final Method declaredMethod;
@@ -187,7 +193,6 @@ public WrapperConversionMatch(Method declaredMethod, ConversionService conversio
 		@Override
 		public boolean test(Class<?> candidateParameterType, Integer index) {
 
-			// TODO: should check for component type
 			if (isNonunwrappingWrapper(candidateParameterType) && isNonunwrappingWrapper(declaredParameterTypes[index])) {
 
 				if (conversionService.canConvert(declaredParameterTypes[index], candidateParameterType)) {
@@ -197,15 +202,19 @@ public boolean test(Class<?> candidateParameterType, Integer index) {
 
 			return false;
 		}
-
 	}
 
-	static class ExactWrapperMatch implements BiPredicate<Class<?>, Integer> {
+	/**
+	 * {@link BiPredicate} to check parameter assignability between a {@link #isNonunwrappingWrapper(Class)} parameter and
+	 * a declared parameter. Usually {@link reactor.core.publisher.Flux} vs. {@link org.reactivestreams.Publisher}
+	 * conversion.
+	 */
+	static class AssignableWrapperMatch implements BiPredicate<Class<?>, Integer> {
 
 		final Method declaredMethod;
 		final Class<?>[] declaredParameterTypes;
 
-		public ExactWrapperMatch(Method declaredMethod) {
+		public AssignableWrapperMatch(Method declaredMethod) {
 
 			this.declaredMethod = declaredMethod;
 			this.declaredParameterTypes = declaredMethod.getParameterTypes();
@@ -214,7 +223,6 @@ public ExactWrapperMatch(Method declaredMethod) {
 		@Override
 		public boolean test(Class<?> candidateParameterType, Integer index) {
 
-			// TODO: should check for component type
 			if (isNonunwrappingWrapper(candidateParameterType) && isNonunwrappingWrapper(declaredParameterTypes[index])) {
 
 				if (declaredParameterTypes[index].isAssignableFrom(candidateParameterType)) {
@@ -224,9 +232,14 @@ public boolean test(Class<?> candidateParameterType, Integer index) {
 
 			return false;
 		}
-
 	}
 
+	/**
+	 * {@link BiPredicate} to check parameter assignability between a parameters in which the declared parameter may be
+	 * wrapped but supports unwrapping. Usually types like {@link java.util.Optional} or {@link java.util.stream.Stream}.
+	 * 
+	 * @see QueryExecutionConverters
+	 */
 	static class MatchParameterOrComponentType implements BiPredicate<Class<?>, Integer> {
 
 		final Method declaredMethod;
@@ -253,7 +266,5 @@ public boolean test(Class<?> candidateParameterType, Integer index) {
 
 			return true;
 		}
-
 	}
-
 }