From eaaa37d4ff32344f1960d756b04438b99fdc0fdd Mon Sep 17 00:00:00 2001
From: SergiiTsypanov <stsypanov@corelogic.com>
Date: Tue, 25 Feb 2020 09:38:42 +0100
Subject: [PATCH] DATACMNS-1673 - Polishing.

Use method references where possible. Cleanup generics. Omit superfluous calls.

Original pull request: #426.
---
 .../data/mapping/callback/EntityCallbackDiscoverer.java       | 2 +-
 .../data/mapping/model/BasicPersistentEntity.java             | 4 +---
 .../repository/core/support/MethodInvocationValidator.java    | 4 ++--
 .../data/repository/support/ReflectionRepositoryInvoker.java  | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java b/src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java
index d8669e39a..6ac23fd09 100644
--- a/src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java
+++ b/src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java
@@ -307,7 +307,7 @@ class EntityCallbackDiscoverer {
 
 		Collection<Method> methods = new ArrayList<>(1);
 
-		ReflectionUtils.doWithMethods(callbackType, mc -> methods.add(mc), method -> {
+		ReflectionUtils.doWithMethods(callbackType, methods::add, method -> {
 
 			if (!Modifier.isPublic(method.getModifiers()) || method.getParameterCount() != args.length + 1
 					|| method.isBridge() || ReflectionUtils.isObjectMethod(method)) {
diff --git a/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java b/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java
index a25110144..2c48ed39a 100644
--- a/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java
+++ b/src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java
@@ -278,9 +278,7 @@ public class BasicPersistentEntity<T, P extends PersistentProperty<P>> implement
 
 		Assert.notNull(association, "Association must not be null!");
 
-		if (!associations.contains(association)) {
-			associations.add(association);
-		}
+		associations.add(association);
 	}
 
 	/*
diff --git a/src/main/java/org/springframework/data/repository/core/support/MethodInvocationValidator.java b/src/main/java/org/springframework/data/repository/core/support/MethodInvocationValidator.java
index 93f65ecc0..88d9758ff 100644
--- a/src/main/java/org/springframework/data/repository/core/support/MethodInvocationValidator.java
+++ b/src/main/java/org/springframework/data/repository/core/support/MethodInvocationValidator.java
@@ -111,13 +111,13 @@ public class MethodInvocationValidator implements MethodInterceptor {
 
 		boolean nullableReturn;
 		boolean[] nullableParameters;
-		MethodParameter methodParameters[];
+		MethodParameter[] methodParameters;
 
 		static Nullability of(Method method, ParameterNameDiscoverer discoverer) {
 
 			boolean nullableReturn = isNullableParameter(new MethodParameter(method, -1));
 			boolean[] nullableParameters = new boolean[method.getParameterCount()];
-			MethodParameter methodParameters[] = new MethodParameter[method.getParameterCount()];
+			MethodParameter[] methodParameters = new MethodParameter[method.getParameterCount()];
 
 			for (int i = 0; i < method.getParameterCount(); i++) {
 
diff --git a/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java b/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java
index f8e5c8fc4..38a2d4a97 100644
--- a/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java
+++ b/src/main/java/org/springframework/data/repository/support/ReflectionRepositoryInvoker.java
@@ -178,7 +178,7 @@ class ReflectionRepositoryInvoker implements RepositoryInvoker {
 	 * @see org.springframework.data.rest.core.invoke.RepositoryInvoker#invokeQueryMethod(java.lang.reflect.Method, java.util.Map, org.springframework.data.domain.Pageable, org.springframework.data.domain.Sort)
 	 */
 	@Override
-	public Optional<Object> invokeQueryMethod(Method method, MultiValueMap<String, ? extends Object> parameters,
+	public Optional<Object> invokeQueryMethod(Method method, MultiValueMap<String, ?> parameters,
 			Pageable pageable, Sort sort) {
 
 		Assert.notNull(method, "Method must not be null!");
@@ -191,7 +191,7 @@ class ReflectionRepositoryInvoker implements RepositoryInvoker {
 		return returnAsOptional(invoke(method, prepareParameters(method, parameters, pageable, sort)));
 	}
 
-	private Object[] prepareParameters(Method method, MultiValueMap<String, ? extends Object> rawParameters,
+	private Object[] prepareParameters(Method method, MultiValueMap<String, ?> rawParameters,
 			Pageable pageable, Sort sort) {
 
 		List<MethodParameter> parameters = new MethodParameters(method, Optional.of(PARAM_ANNOTATION)).getParameters();