From 39cb502d428b402e518b9b05ec3ab15f26bbbcef Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Wed, 4 Oct 2017 18:07:21 +0200
Subject: [PATCH] DATAJPA-949 - Polishing.

Some formatting and Stream code cleanups in test cases.
---
 .../repository/query/JpaQueryExecution.java   | 12 ++--
 .../jpa/repository/UserRepositoryTests.java   | 66 ++-----------------
 2 files changed, 13 insertions(+), 65 deletions(-)

diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
index a91a57613..14f40c761 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
@@ -102,8 +102,9 @@ public abstract class JpaQueryExecution {
 			return result;
 		}
 
-		return CONVERSION_SERVICE.canConvert(result.getClass(), requiredType)
-				? CONVERSION_SERVICE.convert(result, requiredType) : result;
+		return CONVERSION_SERVICE.canConvert(result.getClass(), requiredType) //
+				? CONVERSION_SERVICE.convert(result, requiredType) //
+				: result;
 	}
 
 	/**
@@ -188,7 +189,8 @@ public abstract class JpaQueryExecution {
 			ParameterAccessor accessor = new ParametersParameterAccessor(parameters, values);
 			Query query = repositoryQuery.createQuery(values);
 
-			return PageableExecutionUtils.getPage(query.getResultList(), accessor.getPageable(), () -> count(repositoryQuery, values));
+			return PageableExecutionUtils.getPage(query.getResultList(), accessor.getPageable(),
+					() -> count(repositoryQuery, values));
 
 		}
 
@@ -199,7 +201,6 @@ public abstract class JpaQueryExecution {
 		}
 	}
 
-
 	/**
 	 * Executes a {@link AbstractStringBasedJpaQuery} to return a single entity.
 	 */
@@ -398,8 +399,7 @@ public abstract class JpaQueryExecution {
 				Class<?> optionalType = ClassUtils.forName("java.util.Optional", classLoader);
 				conversionService.removeConvertible(Object.class, optionalType);
 
-			} catch (ClassNotFoundException | LinkageError o_O) {
-			}
+			} catch (ClassNotFoundException | LinkageError o_O) {}
 		}
 	}
 }
diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
index 0f297b88d..d0f3b0a32 100644
--- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
@@ -30,8 +30,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.persistence.EntityManager;
@@ -1638,25 +1636,9 @@ public class UserRepositoryTests {
 
 		flushTestUsers();
 
-		Stream<User> stream = repository.findAllByCustomQueryAndStream();
-
-		final List<User> users = new ArrayList<>();
-
-		try {
-
-			stream.forEach(new Consumer<User>() {
-
-				@Override
-				public void accept(User user) {
-					users.add(user);
-				}
-			});
-
-		} finally {
-			stream.close();
+		try (Stream<User> stream = repository.findAllByCustomQueryAndStream()) {
+			assertThat(stream).hasSize(4);
 		}
-
-		assertThat(users).hasSize(4);
 	}
 
 	@Test // DATAJPA-677
@@ -1664,25 +1646,9 @@ public class UserRepositoryTests {
 
 		flushTestUsers();
 
-		Stream<User> stream = repository.readAllByFirstnameNotNull();
-
-		final List<User> users = new ArrayList<>();
-
-		try {
-
-			stream.forEach(new Consumer<User>() {
-
-				@Override
-				public void accept(User user) {
-					users.add(user);
-				}
-			});
-
-		} finally {
-			stream.close();
+		try (Stream<User> stream = repository.readAllByFirstnameNotNull()) {
+			assertThat(stream).hasSize(4);
 		}
-
-		assertThat(users).hasSize(4);
 	}
 
 	@Test // DATAJPA-677
@@ -1690,25 +1656,9 @@ public class UserRepositoryTests {
 
 		flushTestUsers();
 
-		Stream<User> stream = repository.streamAllPaged(PageRequest.of(0, 2));
-
-		final List<User> users = new ArrayList<>();
-
-		try {
-
-			stream.forEach(new Consumer<User>() {
-
-				@Override
-				public void accept(User user) {
-					users.add(user);
-				}
-			});
-
-		} finally {
-			stream.close();
+		try (Stream<User> stream = repository.streamAllPaged(PageRequest.of(0, 2));) {
+			assertThat(stream).hasSize(2);
 		}
-
-		assertThat(users).hasSize(2);
 	}
 
 	@Test // DATAJPA-218
@@ -2073,9 +2023,7 @@ public class UserRepositoryTests {
 
 		flushTestUsers();
 
-		Stream<User> users = repository.findAsStreamByFirstnameLike("%O%", User.class);
-
-		assertThat(users.collect(Collectors.toList())).hasSize(1);
+		assertThat(repository.findAsStreamByFirstnameLike("%O%", User.class)).hasSize(1);
 	}
 
 	@Test // DATAJPA-1185