From e6d064255f452071166d3cce015d6faaadb5f21a Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@pivotal.io>
Date: Wed, 3 Jan 2018 13:18:12 +0100
Subject: [PATCH] #21 - Polishing.

Removed superfluous property from pom.
Removed includeDeletion parameter since it is always set to true.
Add toString for Country for easier debugging.
---
 pom.xml                                        |  1 -
 .../support/EnversRevisionRepositoryImpl.java  | 18 +++++++++---------
 .../data/envers/sample/Country.java            |  3 +++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index a104618..413d9b6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,6 @@
 	</scm>
 
 	<properties>
-		<springdata.commons>2.1.0.BUILD-SNAPSHOT</springdata.commons>
 		<springdata.jpa>2.1.0.BUILD-SNAPSHOT</springdata.jpa>
 		<hibernate.envers>5.2.11</hibernate.envers>
 		<java-module-name>spring.data.envers</java-module-name>
diff --git a/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java b/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java
index 9780e5a..6680a80 100755
--- a/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java
+++ b/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java
@@ -42,7 +42,6 @@ import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
 import org.springframework.data.repository.core.EntityInformation;
 import org.springframework.data.repository.history.RevisionRepository;
 import org.springframework.data.repository.history.support.RevisionEntityInformation;
-import org.springframework.data.util.Pair;
 import org.springframework.data.util.StreamUtils;
 import org.springframework.util.Assert;
 
@@ -133,7 +132,7 @@ public class EnversRevisionRepositoryImpl<T, ID, N extends Number & Comparable<N
 		List<? extends Number> revisionNumbers = reader.getRevisions(type, id);
 
 		return revisionNumbers.isEmpty() ? Revisions.none()
-				: getEntitiesForRevisions((List<N>) revisionNumbers, id, reader, true);
+				: getEntitiesForRevisions((List<N>) revisionNumbers, id, reader);
 	}
 
 	/*
@@ -160,7 +159,7 @@ public class EnversRevisionRepositoryImpl<T, ID, N extends Number & Comparable<N
 		upperBound = upperBound > revisionNumbers.size() ? revisionNumbers.size() : upperBound;
 
 		List<? extends Number> subList = revisionNumbers.subList(toInt(pageable.getOffset()), toInt(upperBound));
-		Revisions<N, T> revisions = getEntitiesForRevisions((List<N>) subList, id, reader, true);
+		Revisions<N, T> revisions = getEntitiesForRevisions((List<N>) subList, id, reader);
 
 		revisions = isDescending ? revisions.reverse() : revisions;
 
@@ -176,8 +175,7 @@ public class EnversRevisionRepositoryImpl<T, ID, N extends Number & Comparable<N
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	private Revisions<N, T> getEntitiesForRevisions(List<N> revisionNumbers, ID id, AuditReader reader,
-			boolean includeDeletions) {
+	private Revisions<N, T> getEntitiesForRevisions(List<N> revisionNumbers, ID id, AuditReader reader) {
 
 		Class<T> type = entityInformation.getJavaType();
 		Map<N, T> revisions = new HashMap<N, T>(revisionNumbers.size());
@@ -187,7 +185,7 @@ public class EnversRevisionRepositoryImpl<T, ID, N extends Number & Comparable<N
 				new HashSet<Number>(revisionNumbers));
 
 		for (Number number : revisionNumbers) {
-			revisions.put((N) number, reader.find(type, type.getName(), id, number, includeDeletions));
+			revisions.put((N) number, reader.find(type, type.getName(), id, number, true));
 		}
 
 		return Revisions.of(toRevisions(revisions, revisionEntities));
@@ -215,9 +213,11 @@ public class EnversRevisionRepositoryImpl<T, ID, N extends Number & Comparable<N
 	@SuppressWarnings("unchecked")
 	private List<Revision<N, T>> toRevisions(Map<N, T> source, Map<Number, Object> revisionEntities) {
 
-		return source.entrySet().stream()//
-				.map(entry -> Revision.of((RevisionMetadata<N>) getRevisionMetadata(revisionEntities.get(entry.getKey())), entry.getValue()))//
-				.sorted()//
+		return source.entrySet().stream() //
+				.map(entry -> Revision.of( //
+						(RevisionMetadata<N>) getRevisionMetadata(revisionEntities.get(entry.getKey())), //
+						entry.getValue())) //
+				.sorted() //
 				.collect(StreamUtils.toUnmodifiableList());
 	}
 
diff --git a/src/test/java/org/springframework/data/envers/sample/Country.java b/src/test/java/org/springframework/data/envers/sample/Country.java
index 81596e3..42feee5 100755
--- a/src/test/java/org/springframework/data/envers/sample/Country.java
+++ b/src/test/java/org/springframework/data/envers/sample/Country.java
@@ -17,15 +17,18 @@ package org.springframework.data.envers.sample;
 
 import javax.persistence.Entity;
 
+import lombok.ToString;
 import org.hibernate.envers.Audited;
 
 /**
  * Sample domain class.
  * 
  * @author Oliver Gierke
+ * @author Jens Schauder
  */
 @Audited
 @Entity
+@ToString
 public class Country extends AbstractEntity {
 
 	public String code;