From 14ef7aa6de62f2f8be948fcac0a010f1ad214c9c Mon Sep 17 00:00:00 2001 From: Nikola Petrovic Date: Mon, 22 Dec 2014 17:47:03 +0100 Subject: [PATCH] #21 - added ability to searching deleted entities. Original PR: #27 --- .../support/EnversRevisionRepositoryImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 39c59ff..4db0914 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 @@ -117,6 +117,7 @@ public class EnversRevisionRepositoryImpl revisionNumbers = reader.getRevisions(type, id); return revisionNumbers.isEmpty() ? Revisions.none() - : getEntitiesForRevisions((List) revisionNumbers, id, reader); + : getEntitiesForRevisions((List) revisionNumbers, id, reader, true); } /* @@ -158,7 +159,7 @@ public class EnversRevisionRepositoryImpl revisionNumbers.size() ? revisionNumbers.size() : upperBound; List subList = revisionNumbers.subList(toInt(pageable.getOffset()), toInt(upperBound)); - Revisions revisions = getEntitiesForRevisions((List) subList, id, reader); + Revisions revisions = getEntitiesForRevisions((List) subList, id, reader, true); revisions = isDescending ? revisions.reverse() : revisions; @@ -174,7 +175,8 @@ public class EnversRevisionRepositoryImpl getEntitiesForRevisions(List revisionNumbers, ID id, AuditReader reader) { + private Revisions getEntitiesForRevisions(List revisionNumbers, ID id, AuditReader reader, + boolean includeDeletions) { Class type = entityInformation.getJavaType(); Map revisions = new HashMap(revisionNumbers.size()); @@ -184,7 +186,7 @@ public class EnversRevisionRepositoryImpl(revisionNumbers)); for (Number number : revisionNumbers) { - revisions.put((N) number, reader.find(type, id, number)); + revisions.put((N) number, reader.find(type, type.getName(), id, number, includeDeletions)); } return Revisions.of(toRevisions(revisions, revisionEntities));