From c7ea0782df77682211418b0c0c06ba9809460b51 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Fri, 26 Jul 2019 08:48:33 +0200
Subject: [PATCH] DATAMONGO-2324 - Adapt to API changes in Commons.

---
 .../repository/query/ConvertingParameterAccessor.java    | 9 +++++++++
 .../query/MongoParametersParameterAccessor.java          | 7 +------
 .../repository/query/ReactiveMongoParameterAccessor.java | 4 +---
 .../mongodb/repository/query/StubParameterAccessor.java  | 9 +++++++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java
index 6d98f30bc..1ede41714 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java
@@ -103,6 +103,15 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 		return delegate.getDynamicProjection();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.ParameterAccessor#findDynamicProjection()
+	 */
+	@Override
+	public Class<?> findDynamicProjection() {
+		return delegate.findDynamicProjection();
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.query.ParameterAccessor#getBindableValue(int)
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java
index 2364f6862..5f26803dd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java
@@ -15,9 +15,6 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.springframework.data.domain.Range;
 import org.springframework.data.domain.Range.Bound;
 import org.springframework.data.geo.Distance;
@@ -41,7 +38,6 @@ import org.springframework.util.ClassUtils;
 public class MongoParametersParameterAccessor extends ParametersParameterAccessor implements MongoParameterAccessor {
 
 	private final MongoQueryMethod method;
-	private final List<Object> values;
 
 	/**
 	 * Creates a new {@link MongoParametersParameterAccessor}.
@@ -54,7 +50,6 @@ public class MongoParametersParameterAccessor extends ParametersParameterAccesso
 		super(method.getParameters(), values);
 
 		this.method = method;
-		this.values = Arrays.asList(values);
 	}
 
 	public Range<Distance> getDistanceRange() {
@@ -156,6 +151,6 @@ public class MongoParametersParameterAccessor extends ParametersParameterAccesso
 	 */
 	@Override
 	public Object[] getValues() {
-		return values.toArray();
+		return super.getValues();
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoParameterAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoParameterAccessor.java
index ddc42f03a..9c3261134 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoParameterAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoParameterAccessor.java
@@ -35,14 +35,12 @@ import org.springframework.data.repository.util.ReactiveWrappers;
  */
 class ReactiveMongoParameterAccessor extends MongoParametersParameterAccessor {
 
-	private final Object[] values;
 	private final List<MonoProcessor<?>> subscriptions;
 
 	public ReactiveMongoParameterAccessor(MongoQueryMethod method, Object[] values) {
 
 		super(method, values);
 
-		this.values = values;
 		this.subscriptions = new ArrayList<>(values.length);
 
 		for (int i = 0; i < values.length; i++) {
@@ -82,7 +80,7 @@ class ReactiveMongoParameterAccessor extends MongoParametersParameterAccessor {
 	@Override
 	public Object[] getValues() {
 
-		Object[] result = new Object[values.length];
+		Object[] result = new Object[super.getValues().length];
 		for (int i = 0; i < result.length; i++) {
 			result[i] = getValue(i);
 		}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java
index 5672c2e91..788a2925c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java
@@ -163,4 +163,13 @@ class StubParameterAccessor implements MongoParameterAccessor {
 	public Optional<Class<?>> getDynamicProjection() {
 		return Optional.empty();
 	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.ParameterAccessor#findDynamicProjection()
+	 */
+	@Override
+	public Class<?> findDynamicProjection() {
+		return null;
+	}
 }