From 53dc64ecb42fba025e040f51da7bd9a5fe30a93e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 25 Feb 2021 09:30:13 +0100 Subject: [PATCH] Polishing. Reformat code. Simplify annotation setup. See #603 Original pull request: #604. --- jpa/envers/pom.xml | 20 ++++++++++--------- .../jpa/envers/EnversDemoConfiguration.java | 3 +-- .../example/springdata/jpa/envers/Person.java | 4 ++-- .../jpa/envers/PersonRepository.java | 3 +-- .../jpa/envers/EnversIntegrationTests.java | 18 ++++++++--------- 5 files changed, 23 insertions(+), 25 deletions(-) diff --git a/jpa/envers/pom.xml b/jpa/envers/pom.xml index 01ae1824..63429ee3 100644 --- a/jpa/envers/pom.xml +++ b/jpa/envers/pom.xml @@ -1,15 +1,16 @@ - - - spring-data-jpa-examples - org.springframework.data.examples - 2.0.0.BUILD-gh-603-SNAPSHOT - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.springframework.data.examples + spring-data-jpa-examples + 2.0.0.BUILD-SNAPSHOT + + spring-data-jpa-envers + Spring Data Envers @@ -17,4 +18,5 @@ spring-data-envers - \ No newline at end of file + + diff --git a/jpa/envers/src/main/java/example/springdata/jpa/envers/EnversDemoConfiguration.java b/jpa/envers/src/main/java/example/springdata/jpa/envers/EnversDemoConfiguration.java index d014da30..396fda53 100644 --- a/jpa/envers/src/main/java/example/springdata/jpa/envers/EnversDemoConfiguration.java +++ b/jpa/envers/src/main/java/example/springdata/jpa/envers/EnversDemoConfiguration.java @@ -22,8 +22,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; /** * Configuration for the Envers Demo. *

- * Note that a special {@literal repositoryFactoryBeanClass} is configured for Spring - * Data Envers support. + * Note that a special {@literal repositoryFactoryBeanClass} is configured for Spring Data Envers support. * * @author Jens Schauder */ diff --git a/jpa/envers/src/main/java/example/springdata/jpa/envers/Person.java b/jpa/envers/src/main/java/example/springdata/jpa/envers/Person.java index 27b372ec..8a11ce14 100644 --- a/jpa/envers/src/main/java/example/springdata/jpa/envers/Person.java +++ b/jpa/envers/src/main/java/example/springdata/jpa/envers/Person.java @@ -15,13 +15,13 @@ */ package example.springdata.jpa.envers; -import org.hibernate.envers.Audited; - import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Version; +import org.hibernate.envers.Audited; + /** * An entity with a single non-technical attribute * diff --git a/jpa/envers/src/main/java/example/springdata/jpa/envers/PersonRepository.java b/jpa/envers/src/main/java/example/springdata/jpa/envers/PersonRepository.java index 0f8b237f..edf9224f 100644 --- a/jpa/envers/src/main/java/example/springdata/jpa/envers/PersonRepository.java +++ b/jpa/envers/src/main/java/example/springdata/jpa/envers/PersonRepository.java @@ -23,5 +23,4 @@ import org.springframework.data.repository.history.RevisionRepository; * * @author Jens Schauder */ -public interface PersonRepository extends CrudRepository, RevisionRepository { -} +public interface PersonRepository extends CrudRepository, RevisionRepository {} diff --git a/jpa/envers/src/test/java/example/springdata/jpa/envers/EnversIntegrationTests.java b/jpa/envers/src/test/java/example/springdata/jpa/envers/EnversIntegrationTests.java index 5ac13268..b75c27d4 100644 --- a/jpa/envers/src/test/java/example/springdata/jpa/envers/EnversIntegrationTests.java +++ b/jpa/envers/src/test/java/example/springdata/jpa/envers/EnversIntegrationTests.java @@ -17,24 +17,22 @@ package example.springdata.jpa.envers; import static org.assertj.core.api.Assertions.*; +import java.util.Iterator; + import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.history.Revision; import org.springframework.data.history.RevisionMetadata.RevisionType; import org.springframework.data.history.Revisions; -import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.support.TransactionTemplate; -import java.util.Iterator; - /** * Demonstrating the usage of Spring Data Envers - * + * * @author Jens Schauder */ -@ExtendWith(SpringExtension.class) @SpringBootTest public class EnversIntegrationTests { @@ -48,7 +46,6 @@ public class EnversIntegrationTests { Revisions revisions = repository.findRevisions(updated.id); - Iterator> revisionIterator = revisions.iterator(); checkNextRevision(revisionIterator, "John", RevisionType.INSERT); @@ -58,7 +55,8 @@ public class EnversIntegrationTests { } - private void checkNextRevision(Iterator> revisionIterator, String name, RevisionType revisionType) { + private void checkNextRevision(Iterator> revisionIterator, String name, + RevisionType revisionType) { assertThat(revisionIterator.hasNext()).isTrue(); Revision revision = revisionIterator.next(); @@ -71,7 +69,7 @@ public class EnversIntegrationTests { Person john = new Person(); john.setName("John"); - //create + // create Person saved = tx.execute(__ -> repository.save(john)); assertThat(saved).isNotNull(); @@ -82,7 +80,7 @@ public class EnversIntegrationTests { assertThat(updated).isNotNull(); // delete - tx.executeWithoutResult(__->repository.delete(updated)); + tx.executeWithoutResult(__ -> repository.delete(updated)); return updated; } }