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

#31 - Implemented method returning revision of entity for given revision-number.

Browse Source
This commit is contained in:
Michael Igler
2015-05-13 17:23:47 +02:00
committed by Oliver Gierke
parent 9567fda597
commit 6f076b5609
5 changed files with 64 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@@ -23,6 +23,11 @@
<organization>BLE</organization>
<organizationUrl>www.ble.de</organizationUrl>
</developer>
<developer>
<name>Michael Igler</name>
<email>michael.igler@forward-tech.de</email>
<organization>Freelancer</organization>
</developer>
</developers>
<licenses>

8
src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepository.java
View File

@@ -17,6 +17,7 @@ package org.springframework.data.envers.repository.support;
import java.io.Serializable;
import org.springframework.data.history.Revision;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.NoRepositoryBean;
import org.springframework.data.repository.history.RevisionRepository;
@@ -24,11 +25,12 @@ import org.springframework.data.repository.history.RevisionRepository;
/**
* Convenience interface to allow pulling in {@link JpaRepository} and {@link RevisionRepository} functionality in one
* go.
*
*
* @author Oliver Gierke
*/
@NoRepositoryBean
public interface EnversRevisionRepository<T, ID extends Serializable, N extends Number & Comparable<N>> extends
RevisionRepository<T, ID, N>, JpaRepository<T, ID> {
public interface EnversRevisionRepository<T, ID extends Serializable, N extends Number & Comparable<N>>
extends RevisionRepository<T, ID, N>, JpaRepository<T, ID> {
Revision<N, T> findRevision(ID id, N revisionNumber);
}

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

@@ -16,12 +16,7 @@
package org.springframework.data.envers.repository.support;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import javax.persistence.EntityManager;
@@ -47,12 +42,12 @@ import org.springframework.util.Assert;
/**
* Repository implementation using Hibernate Envers to implement revision specific query methods.
*
*
* @author Oliver Gierke
* @author Philipp Huegelmeyer
* @author Michael Igler
*/
public class EnversRevisionRepositoryImpl<T, ID extends Serializable, N extends Number & Comparable<N>> extends
SimpleJpaRepository<T, ID> implements RevisionRepository<T, ID, N> {
public class EnversRevisionRepositoryImpl<T, ID extends Serializable, N extends Number & Comparable<N>> extends SimpleJpaRepository<T, ID> implements RevisionRepository<T, ID, N> {
private final EntityInformation<T, ?> entityInformation;
private final RevisionEntityInformation revisionEntityInformation;
@@ -61,13 +56,13 @@ public class EnversRevisionRepositoryImpl<T, ID extends Serializable, N extends
/**
* Creates a new {@link EnversRevisionRepositoryImpl} using the given {@link JpaEntityInformation},
* {@link RevisionEntityInformation} and {@link EntityManager}.
*
*
* @param entityInformation must not be {@literal null}.
* @param revisionEntityInformation must not be {@literal null}.
* @param entityManager must not be {@literal null}.
*/
public EnversRevisionRepositoryImpl(JpaEntityInformation<T, ?> entityInformation,
RevisionEntityInformation revisionEntityInformation, EntityManager entityManager) {
RevisionEntityInformation revisionEntityInformation, EntityManager entityManager) {
super(entityInformation, entityManager);
@@ -103,6 +98,14 @@ public class EnversRevisionRepositoryImpl<T, ID extends Serializable, N extends
return new Revision<N, T>(metadata, reader.find(type, id, latestRevision));
}
@SuppressWarnings("unchecked")
public Revision<N, T> findRevision(ID id, N revisionNumber) {
AuditReader reader = AuditReaderFactory.get(entityManager);
return getEntityForRevision(revisionNumber, id, reader);
}
/*
* (non-Javadoc)
* @see org.springframework.data.repository.history.RevisionRepository#findRevisions(java.io.Serializable)
@@ -130,7 +133,7 @@ public class EnversRevisionRepositoryImpl<T, ID extends Serializable, N extends
List<Number> revisionNumbers = reader.getRevisions(type, id);
if (pageable.getOffset() > revisionNumbers.size()) {
return new PageImpl<Revision<N, T>>(Collections.<Revision<N, T>> emptyList(), pageable, 0);
return new PageImpl<Revision<N, T>>(Collections.<Revision<N, T>>emptyList(), pageable, 0);
}
int upperBound = pageable.getOffset() + pageable.getPageSize();
@@ -142,9 +145,10 @@ public class EnversRevisionRepositoryImpl<T, ID extends Serializable, N extends
return new PageImpl<Revision<N, T>>(revisions.getContent(), pageable, revisionNumbers.size());
}
/**
* Returns the entities in the given revisions for the entitiy with the given id.
*
*
* @param revisionNumbers
* @param id
* @param reader
@@ -167,6 +171,25 @@ public class EnversRevisionRepositoryImpl<T, ID extends Serializable, N extends
return new Revisions<N, T>(toRevisions(revisions, revisionEntities));
}
/**
* Returns an entity in the given revision for the given entity-id.
*
* @param revisionNumber
* @param id
* @param reader
* @return
*/
private Revision<N, T> getEntityForRevision(N revisionNumber, ID id, AuditReader reader) {
Class<?> revisionEntityClass = revisionEntityInformation.getRevisionEntityClass();
T revision = (T) reader.findRevision(revisionEntityClass, revisionNumber);
RevisionMetadata<N> metadata = (RevisionMetadata<N>) getRevisionMetadata(revision);
return new Revision<N, T>(metadata, revision);
}
@SuppressWarnings("unchecked")
private List<Revision<N, T>> toRevisions(Map<N, T> source, Map<Number, Object> revisionEntities) {
@@ -186,7 +209,7 @@ public class EnversRevisionRepositoryImpl<T, ID extends Serializable, N extends
/**
* Returns the {@link RevisionMetadata} wrapper depending on the type of the given object.
*
*
* @param object
* @return
*/

15
src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTest.java
View File

@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
@@ -49,6 +50,8 @@ public class RepositoryIntegrationTest {
@Autowired LicenseRepository licenseRepository;
@Autowired CountryRepository countryRepository;
@Autowired EnversRevisionRepository enversRevisionRepository;
@Before
public void setUp() {
licenseRepository.deleteAll();
@@ -90,6 +93,18 @@ public class RepositoryIntegrationTest {
Page<Revision<Integer, License>> revisions = licenseRepository.findRevisions(license.id, new PageRequest(0, 10));
Revisions<Integer, License> wrapper = new Revisions<Integer, License>(revisions.getContent());
assertThat(wrapper.getLatestRevision(), is(revision));
List<Revision<Integer, Country>> revisionsDe = countryRepository.findRevisions(de.id).getContent();
for (Revision<Integer, Country> revisionDe: revisionsDe) {
System.out.println("revisionDe.getRevisionNumber(): " + revisionDe.getRevisionNumber());
System.out.println("revisionDe.getEntity().name: " + revisionDe.getEntity().name);
}
Revision<Integer, Country> originalCountryRevision = enversRevisionRepository.findRevision(de.id, 2);
Country originalCountry = originalCountryRevision.getEntity();
assertThat(originalCountry.name, is("Deutschland"));
}
@Test

3
src/test/java/org/springframework/data/envers/sample/CountryRepository.java
View File

@@ -15,6 +15,7 @@
*/
package org.springframework.data.envers.sample;
import org.springframework.data.envers.repository.support.EnversRevisionRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.history.RevisionRepository;
@@ -23,6 +24,6 @@ import org.springframework.data.repository.history.RevisionRepository;
*
* @author Oliver Gierke
*/
public interface CountryRepository extends RevisionRepository<Country, Long, Integer>, JpaRepository<Country, Long> {
public interface CountryRepository extends EnversRevisionRepository<Country, Long, Integer>, JpaRepository<Country, Long> {
}