Spring/spring-data-envers
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#21 - added ability to searching deleted entities.

Browse Source 
Original PR: #27
This commit is contained in:
Nikola Petrovic
2014-12-22 17:47:03 +01:00
committed by Jens Schauder
parent 92934b99b4
commit 14ef7aa6de
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java
View File

@@ -117,6 +117,7 @@ public class EnversRevisionRepositoryImpl<T, ID, N extends Number & Comparable<N
Assert.notNull(revisionNumber, "Revision number must not be null!");
return getEntityForRevision(revisionNumber, id, AuditReaderFactory.get(entityManager));
}
/*
@@ -131,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);
: getEntitiesForRevisions((List<N>) revisionNumbers, id, reader, true);
}
/*
@@ -158,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);
Revisions<N, T> revisions = getEntitiesForRevisions((List<N>) subList, id, reader, true);
revisions = isDescending ? revisions.reverse() : revisions;
@@ -174,7 +175,8 @@ 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) {
private Revisions<N, T> getEntitiesForRevisions(List<N> revisionNumbers, ID id, AuditReader reader,
boolean includeDeletions) {
Class<T> type = entityInformation.getJavaType();
Map<N, T> revisions = new HashMap<N, T>(revisionNumbers.size());
@@ -184,7 +186,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, id, number));
revisions.put((N) number, reader.find(type, type.getName(), id, number, includeDeletions));
}
return Revisions.of(toRevisions(revisions, revisionEntities));