From 594da202d9d704583af5d3a1c334f4d2907d1d76 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Mon, 3 Jul 2023 14:51:49 +0200
Subject: [PATCH] Polishing.

Fix backport to be Java 1.8 compatible.

See #2869
---
 .../AbstractRepositoryMetadataUnitTests.java    | 17 +++++++++--------
 .../repository/query/QueryMethodUnitTests.java  | 15 ++++++++-------
 ...eterUnitTests.kt => ParameterKtUnitTests.kt} |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)
 rename src/test/kotlin/org/springframework/data/repository/query/{ParameterUnitTests.kt => ParameterKtUnitTests.kt} (98%)

diff --git a/src/test/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadataUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadataUnitTests.java
index 1d93a47c1..18e4fbf04 100755
--- a/src/test/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadataUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadataUnitTests.java
@@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.*;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -121,13 +121,14 @@ class AbstractRepositoryMetadataUnitTests {
 	Stream<DynamicTest> detectsReturnTypesForStreamableAggregates() throws Exception {
 
 		RepositoryMetadata metadata = AbstractRepositoryMetadata.getMetadata(StreamableAggregateRepository.class);
-		Stream<Entry<String, Class<?>>> methods = Stream.of(
-				Map.entry("findBy", StreamableAggregate.class),
-				Map.entry("findSubTypeBy", StreamableAggregateSubType.class),
-				Map.entry("findAllBy", StreamableAggregate.class),
-				Map.entry("findOptional", StreamableAggregate.class));
 
-		return DynamicTest.stream(methods, //
+		Map<String, Class<?>> map = new LinkedHashMap<>();
+		map.put("findBy", StreamableAggregate.class);
+		map.put("findSubTypeBy", StreamableAggregateSubType.class);
+		map.put("findAllBy", StreamableAggregate.class);
+		map.put("findOptionalBy", StreamableAggregate.class);
+
+		return DynamicTest.stream(map.entrySet().stream(), //
 				it -> it.getKey() + "'s returned domain class is " + it.getValue(), //
 				it -> {
 
@@ -190,7 +191,7 @@ class AbstractRepositoryMetadataUnitTests {
 
 		Streamable<StreamableAggregate> findAllBy();
 
-		Optional<StreamableAggregate> findOptional();
+		Optional<StreamableAggregate> findOptionalBy();
 	}
 
 	static abstract class StreamableAggregateSubType extends StreamableAggregate {}
diff --git a/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java b/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java
index fc03880c0..b7f61fa6b 100755
--- a/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java
@@ -23,9 +23,9 @@ import reactor.core.publisher.Mono;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
@@ -269,13 +269,14 @@ class QueryMethodUnitTests {
 			throws Exception {
 
 		RepositoryMetadata metadata = AbstractRepositoryMetadata.getMetadata(StreamableAggregateRepository.class);
-		Stream<Entry<String, Boolean>> stream = Stream.of(
-				Map.entry("findBy", false),
-				Map.entry("findSubTypeBy", false),
-				Map.entry("findAllBy", true),
-				Map.entry("findOptionalBy", false));
 
-		return DynamicTest.stream(stream, //
+		Map<String, Boolean> map = new LinkedHashMap<>();
+		map.put("findBy", false);
+		map.put("findSubTypeBy", false);
+		map.put("findAllBy", true);
+		map.put("findOptionalBy", false);
+
+		return DynamicTest.stream(map.entrySet().stream(), //
 				it -> it.getKey() + " considered collection query -> " + it.getValue(), //
 				it -> {
 
diff --git a/src/test/kotlin/org/springframework/data/repository/query/ParameterUnitTests.kt b/src/test/kotlin/org/springframework/data/repository/query/ParameterKtUnitTests.kt
similarity index 98%
rename from src/test/kotlin/org/springframework/data/repository/query/ParameterUnitTests.kt
rename to src/test/kotlin/org/springframework/data/repository/query/ParameterKtUnitTests.kt
index ec6792f58..fca1ebabb 100644
--- a/src/test/kotlin/org/springframework/data/repository/query/ParameterUnitTests.kt
+++ b/src/test/kotlin/org/springframework/data/repository/query/ParameterKtUnitTests.kt
@@ -26,7 +26,7 @@ import kotlin.reflect.jvm.javaMethod
  *
  * @author Mark Paluch
  */
-class ParameterUnitTests {
+class ParameterKtUnitTests {
 
 	@Test // DATACMNS-1508
 	fun `should consider Continuation a special parameter`() {