https://github.com/javers/javers/issues/417

javers · Sep 4, 2016 · ed2c978 · ed2c978
1 parent 0c93d36
commit ed2c978
Show file tree

Hide file tree

Showing 13 changed files with 125 additions and 67 deletions.
diff --git a/...tarter-mongo/src/main/java/org/javers/spring/boot/mongo/JaversMongoAutoConfiguration.java b/...tarter-mongo/src/main/java/org/javers/spring/boot/mongo/JaversMongoAutoConfiguration.java
@@ -9,7 +9,8 @@
 import org.javers.repository.api.JaversRepository;
 import org.javers.repository.mongo.MongoRepository;
 import org.javers.spring.auditable.*;
-import org.javers.spring.auditable.aspect.JaversAuditableRepositoryAspect;
+import org.javers.spring.auditable.aspect.JaversAuditableAspect;
+import org.javers.spring.auditable.aspect.springdata.JaversSpringDataAuditableRepositoryAspect;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,7 +82,12 @@ public CommitPropertiesProvider commitPropertiesProvider() {
     }
 
     @Bean
-    public JaversAuditableRepositoryAspect javersAuditableRepositoryAspect(Javers javers, AuthorProvider authorProvider, CommitPropertiesProvider commitPropertiesProvider) {
-        return new JaversAuditableRepositoryAspect(javers, authorProvider, commitPropertiesProvider());
+    public JaversAuditableAspect javersAuditableAspect(Javers javers, AuthorProvider authorProvider) {
+        return new JaversAuditableAspect(javers, authorProvider, commitPropertiesProvider());
+    }
+
+    @Bean
+    public JaversSpringDataAuditableRepositoryAspect javersSpringDataAuditableAspect(Javers javers, AuthorProvider authorProvider) {
+        return new JaversSpringDataAuditableRepositoryAspect(javers, authorProvider, commitPropertiesProvider());
     }
 }
diff --git a/...boot-starter-sql/src/main/java/org/javers/spring/boot/sql/JaversSqlAutoConfiguration.java b/...boot-starter-sql/src/main/java/org/javers/spring/boot/sql/JaversSqlAutoConfiguration.java
@@ -12,7 +12,8 @@
 import org.javers.repository.sql.JaversSqlRepository;
 import org.javers.repository.sql.SqlRepositoryBuilder;
 import org.javers.spring.auditable.*;
-import org.javers.spring.auditable.aspect.JaversAuditableRepositoryAspect;
+import org.javers.spring.auditable.aspect.JaversAuditableAspect;
+import org.javers.spring.auditable.aspect.springdata.JaversSpringDataAuditableRepositoryAspect;
 import org.javers.spring.jpa.JpaHibernateConnectionProvider;
 import org.javers.spring.jpa.TransactionalJaversBuilder;
 import org.slf4j.Logger;
@@ -110,7 +111,12 @@ public ConnectionProvider jpaConnectionProvider() {
     }
 
     @Bean
-    public JaversAuditableRepositoryAspect javersAuditableRepositoryAspect(Javers javers, AuthorProvider authorProvider, CommitPropertiesProvider commitPropertiesProvider) {
-        return new JaversAuditableRepositoryAspect(javers, authorProvider, commitPropertiesProvider);
+    public JaversAuditableAspect javersAuditableAspect(Javers javers, AuthorProvider authorProvider, CommitPropertiesProvider commitPropertiesProvider) {
+        return new JaversAuditableAspect(javers, authorProvider, commitPropertiesProvider());
+    }
+
+    @Bean
+    public JaversSpringDataAuditableRepositoryAspect javersSpringDataAuditableAspect(Javers javers, AuthorProvider authorProvider, CommitPropertiesProvider commitPropertiesProvider) {
+        return new JaversSpringDataAuditableRepositoryAspect(javers, authorProvider, commitPropertiesProvider());
     }
 }
diff --git a/javers-spring/src/main/java/org/javers/spring/auditable/aspect/JaversAuditableAspect.java b/javers-spring/src/main/java/org/javers/spring/auditable/aspect/JaversAuditableAspect.java
@@ -0,0 +1,45 @@
+package org.javers.spring.auditable.aspect;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.javers.core.Javers;
+import org.javers.spring.auditable.AuthorProvider;
+import org.javers.spring.auditable.CommitPropertiesProvider;
+import org.javers.spring.auditable.EmptyPropertiesProvider;
+
+/**
+ * Commits all arguments passed to advised methods
+ * (only if the method exits normally, i.e. no Exception has been thrown).
+ *
+ * Spring @Transactional attributes (like noRollbackFor or noRollbackForClassName)
+ * have no effects on this aspect.
+ * <br/><br/>
+ *
+ * Creates the following @AfterReturning pointcuts:
+ * <ul>
+ *    <li/>any method annotated with @JaversAuditable
+ *    <li/>all save() and delete() methods of CrudRepositories with (class-level) @JaversSpringDataAuditable
+ * </ul>
+ */
+@Aspect
+public class JaversAuditableAspect {
+    private final JaversCommitAdvice javersCommitAdvice;
+
+    public JaversAuditableAspect(Javers javers, AuthorProvider authorProvider, CommitPropertiesProvider commitPropertiesProvider) {
+        this(new JaversCommitAdvice(javers, authorProvider, commitPropertiesProvider) );
+    }
+
+    public JaversAuditableAspect(Javers javers, AuthorProvider authorProvider) {
+        this(javers, authorProvider, new EmptyPropertiesProvider());
+    }
+
+    JaversAuditableAspect(JaversCommitAdvice javersCommitAdvice) {
+        this.javersCommitAdvice = javersCommitAdvice;
+    }
+
+    @AfterReturning("@annotation(org.javers.spring.annotation.JaversAuditable)")
+    public void commitAdvice(JoinPoint pjp) {
+        javersCommitAdvice.commitMethodArguments(pjp);
+    }
+}
diff --git a/...le/aspect/AbstractAuditChangeHandler.java → ...pringdata/AbstractAuditChangeHandler.java b/...le/aspect/AbstractAuditChangeHandler.java → ...pringdata/AbstractAuditChangeHandler.java
@@ -1,4 +1,4 @@
-package org.javers.spring.auditable.aspect;
+package org.javers.spring.auditable.aspect.springdata;
 
 import org.javers.core.Javers;
 import org.javers.spring.auditable.AuthorProvider;

diff --git a/.../auditable/aspect/AuditChangeHandler.java → ...aspect/springdata/AuditChangeHandler.java b/.../auditable/aspect/AuditChangeHandler.java → ...aspect/springdata/AuditChangeHandler.java
@@ -1,4 +1,4 @@
-package org.javers.spring.auditable.aspect;
+package org.javers.spring.auditable.aspect.springdata;
 
 import org.springframework.data.repository.core.RepositoryMetadata;
 

diff --git a/...pect/JaversAuditableRepositoryAspect.java → ...sSpringDataAuditableRepositoryAspect.java b/...pect/JaversAuditableRepositoryAspect.java → ...sSpringDataAuditableRepositoryAspect.java
@@ -1,4 +1,4 @@
-package org.javers.spring.auditable.aspect;
+package org.javers.spring.auditable.aspect.springdata;
 
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -14,45 +14,23 @@
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 
-/**
- * Commits all arguments passed to advised methods
- * (only if the method exits normally, i.e. no Exception has been thrown).
- *
- * Spring @Transactional attributes (like noRollbackFor or noRollbackForClassName)
- * have no effects on this aspect.
- * <br/><br/>
- *
- * Creates the following @AfterReturning pointcuts:
- * <ul>
- *    <li/>any method annotated with @JaversAuditable
- *    <li/>all save() and delete() methods of CrudRepositories with (class-level) @JaversSpringDataAuditable
- * </ul>
- */
 @Aspect
-public class JaversAuditableRepositoryAspect {
+public class JaversSpringDataAuditableRepositoryAspect {
     private final AuditChangeHandler saveHandler;
     private final AuditChangeHandler deleteHandler;
-    private final JaversCommitAdvice javersCommitAdvice;
 
-    public JaversAuditableRepositoryAspect(Javers javers, AuthorProvider authorProvider, CommitPropertiesProvider commitPropertiesProvider) {
+    public JaversSpringDataAuditableRepositoryAspect(Javers javers, AuthorProvider authorProvider, CommitPropertiesProvider commitPropertiesProvider) {
         this(new OnSaveAuditChangeHandler(javers, authorProvider, commitPropertiesProvider),
-             new OnDeleteAuditChangeHandler(javers, authorProvider, commitPropertiesProvider),
-             new JaversCommitAdvice(javers, authorProvider, commitPropertiesProvider) );
+                new OnDeleteAuditChangeHandler(javers, authorProvider, commitPropertiesProvider));
     }
 
-    public JaversAuditableRepositoryAspect(Javers javers, AuthorProvider authorProvider) {
+    public JaversSpringDataAuditableRepositoryAspect(Javers javers, AuthorProvider authorProvider) {
         this(javers, authorProvider, new EmptyPropertiesProvider());
     }
 
-    JaversAuditableRepositoryAspect(AuditChangeHandler saveHandler, AuditChangeHandler deleteHandler, JaversCommitAdvice javersCommitAdvice) {
+    JaversSpringDataAuditableRepositoryAspect(AuditChangeHandler saveHandler, AuditChangeHandler deleteHandler) {
         this.saveHandler = saveHandler;
         this.deleteHandler = deleteHandler;
-        this.javersCommitAdvice = javersCommitAdvice;
-    }
-
-    @AfterReturning("@annotation(org.javers.spring.annotation.JaversAuditable)")
-    public void commitAdvice(JoinPoint pjp) {
-        javersCommitAdvice.commitMethodArguments(pjp);
     }
 
     @AfterReturning("execution(public * delete(..)) && this(org.springframework.data.repository.CrudRepository)")

diff --git a/...le/aspect/OnDeleteAuditChangeHandler.java → ...pringdata/OnDeleteAuditChangeHandler.java b/...le/aspect/OnDeleteAuditChangeHandler.java → ...pringdata/OnDeleteAuditChangeHandler.java
@@ -1,4 +1,4 @@
-package org.javers.spring.auditable.aspect;
+package org.javers.spring.auditable.aspect.springdata;
 
 import org.javers.core.Javers;
 import org.javers.spring.auditable.AuthorProvider;
@@ -13,7 +13,7 @@
  * Created by gessnerfl on 22.02.15.
  */
 class OnDeleteAuditChangeHandler extends AbstractAuditChangeHandler {
-    public OnDeleteAuditChangeHandler(Javers javers, AuthorProvider authorProvider, CommitPropertiesProvider commitPropertiesProvider) {
+    OnDeleteAuditChangeHandler(Javers javers, AuthorProvider authorProvider, CommitPropertiesProvider commitPropertiesProvider) {
         super(javers, authorProvider, commitPropertiesProvider);
     }
 

diff --git a/...able/aspect/OnSaveAuditChangeHandler.java → .../springdata/OnSaveAuditChangeHandler.java b/...able/aspect/OnSaveAuditChangeHandler.java → .../springdata/OnSaveAuditChangeHandler.java
@@ -1,4 +1,4 @@
-package org.javers.spring.auditable.aspect;
+package org.javers.spring.auditable.aspect.springdata;
 
 import org.javers.core.Javers;
 import org.javers.spring.auditable.AuthorProvider;

diff --git a/...oovy/org/javers/spring/auditable/integration/JaversSpringDataAspectIntegrationTest.groovy b/...oovy/org/javers/spring/auditable/integration/JaversSpringDataAspectIntegrationTest.groovy
@@ -65,7 +65,6 @@ class JaversSpringDataAspectIntegrationTest extends Specification {
         }
     }
 
-
     def "should create a new version on update via audited repository"() {
         setup:
         def o = new DummyObject("foo")

diff --git a/javers-spring/src/test/java/org/javers/hibernate/integration/config/HibernateConfig.java b/javers-spring/src/test/java/org/javers/hibernate/integration/config/HibernateConfig.java
@@ -2,14 +2,14 @@
 
 import com.google.common.collect.ImmutableMap;
 import org.javers.core.Javers;
-import org.javers.core.commit.Commit;
 import org.javers.repository.sql.ConnectionProvider;
 import org.javers.repository.sql.JaversSqlRepository;
 import org.javers.spring.annotation.JaversAuditable;
 import org.javers.spring.annotation.JaversSpringDataAuditable;
 import org.javers.spring.auditable.AuthorProvider;
 import org.javers.spring.auditable.CommitPropertiesProvider;
-import org.javers.spring.auditable.aspect.JaversAuditableRepositoryAspect;
+import org.javers.spring.auditable.aspect.JaversAuditableAspect;
+import org.javers.spring.auditable.aspect.springdata.JaversSpringDataAuditableRepositoryAspect;
 import org.javers.spring.jpa.JpaHibernateConnectionProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
@@ -68,17 +68,14 @@ public DataSource dataSource() {
         return dataSource;
     }
 
+    @Bean
+    public JaversAuditableAspect javersAuditableAspect(Javers javers) {
+        return new JaversAuditableAspect(javers, authorProvider(), commitPropertiesProvider());
+    }
 
-    /**
-     * Enables Repository auto-audit aspect. <br/>
-     * <p>
-     * Use {@link JaversSpringDataAuditable}
-     * to annotate Spring Data Repositories
-     * or {@link JaversAuditable} for ordinary Repositories.
-     */
     @Bean
-    public JaversAuditableRepositoryAspect javersAuditableRepositoryAspect(Javers javers) {
-        return new JaversAuditableRepositoryAspect(javers, authorProvider(), commitPropertiesProvider());
+    public JaversSpringDataAuditableRepositoryAspect javersSpringDataAuditableAspect(Javers javers) {
+        return new JaversSpringDataAuditableRepositoryAspect(javers, authorProvider(), commitPropertiesProvider());
     }
 
     /**

diff --git a/javers-spring/src/test/java/org/javers/spring/boot/JaversSpringBootConfig.java b/javers-spring/src/test/java/org/javers/spring/boot/JaversSpringBootConfig.java
@@ -6,7 +6,8 @@
 import org.javers.repository.sql.JaversSqlRepository;
 import org.javers.repository.sql.SqlRepositoryBuilder;
 import org.javers.spring.auditable.AuthorProvider;
-import org.javers.spring.auditable.aspect.JaversAuditableRepositoryAspect;
+import org.javers.spring.auditable.aspect.JaversAuditableAspect;
+import org.javers.spring.auditable.aspect.springdata.JaversSpringDataAuditableRepositoryAspect;
 import org.javers.spring.jpa.JpaHibernateConnectionProvider;
 import org.javers.spring.jpa.TransactionalJaversBuilder;
 import org.springframework.context.annotation.Bean;
@@ -33,8 +34,13 @@ public Javers javers() {
     }
 
     @Bean
-    public JaversAuditableRepositoryAspect javersAuditableRepositoryAspect() {
-        return new JaversAuditableRepositoryAspect(javers(), authorProvider());
+    public JaversAuditableAspect javersAuditableAspect() {
+        return new JaversAuditableAspect(javers(), authorProvider());
+    }
+
+    @Bean
+    public JaversSpringDataAuditableRepositoryAspect javersSpringDataAuditableAspect() {
+        return new JaversSpringDataAuditableRepositoryAspect(javers(), authorProvider());
     }
 
     @Bean

diff --git a/javers-spring/src/test/java/org/javers/spring/example/JaversSpringJpaApplicationConfig.java b/javers-spring/src/test/java/org/javers/spring/example/JaversSpringJpaApplicationConfig.java
@@ -9,9 +9,9 @@
 import org.javers.repository.sql.SqlRepositoryBuilder;
 import org.javers.spring.auditable.AuthorProvider;
 import org.javers.spring.auditable.CommitPropertiesProvider;
-import org.javers.spring.auditable.EmptyPropertiesProvider;
 import org.javers.spring.auditable.SpringSecurityAuthorProvider;
-import org.javers.spring.auditable.aspect.JaversAuditableRepositoryAspect;
+import org.javers.spring.auditable.aspect.JaversAuditableAspect;
+import org.javers.spring.auditable.aspect.springdata.JaversSpringDataAuditableRepositoryAspect;
 import org.javers.spring.jpa.JpaHibernateConnectionProvider;
 import org.javers.spring.jpa.TransactionalJaversBuilder;
 import org.springframework.context.annotation.Bean;
@@ -64,15 +64,25 @@ public Javers javers() {
     }
 
     /**
-     * Enables Repository auto-audit aspect. <br/>
+     * Enables auto-audit aspect for ordinary repositories.<br/>
+     *
+     * Use {@link org.javers.spring.annotation.JaversAuditable}
+     * to mark data writing methods that you want to audit.
+     */
+    @Bean
+    public JaversAuditableAspect javersAuditableAspect() {
+        return new JaversAuditableAspect(javers(), authorProvider(), commitPropertiesProvider());
+    }
+
+    /**
+     * Enables auto-audit aspect for Spring Data repositories. <br/>
      *
      * Use {@link org.javers.spring.annotation.JaversSpringDataAuditable}
-     * to annotate Spring Data Repositories
-     * or {@link org.javers.spring.annotation.JaversAuditable} for ordinary Repositories.
+     * to annotate CrudRepositories you want to audit.
      */
     @Bean
-    public JaversAuditableRepositoryAspect javersAuditableRepositoryAspect() {
-        return new JaversAuditableRepositoryAspect(javers(), authorProvider(), commitPropertiesProvider());
+    public JaversSpringDataAuditableRepositoryAspect javersSpringDataAuditableAspect() {
+        return new JaversSpringDataAuditableRepositoryAspect(javers(), authorProvider(), commitPropertiesProvider());
     }
 
     /**

diff --git a/...rs-spring/src/test/java/org/javers/spring/example/JaversSpringMongoApplicationConfig.java b/...rs-spring/src/test/java/org/javers/spring/example/JaversSpringMongoApplicationConfig.java
@@ -9,7 +9,8 @@
 import org.javers.spring.auditable.AuthorProvider;
 import org.javers.spring.auditable.CommitPropertiesProvider;
 import org.javers.spring.auditable.SpringSecurityAuthorProvider;
-import org.javers.spring.auditable.aspect.JaversAuditableRepositoryAspect;
+import org.javers.spring.auditable.aspect.JaversAuditableAspect;
+import org.javers.spring.auditable.aspect.springdata.JaversSpringDataAuditableRepositoryAspect;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -48,15 +49,25 @@ public MongoDatabase mongoDB() {
     }
 
     /**
-     * Enables Repository auto-audit aspect. <br/>
+     * Enables auto-audit aspect for ordinary repositories.<br/>
+     *
+     * Use {@link org.javers.spring.annotation.JaversAuditable}
+     * to mark data writing methods that you want to audit.
+     */
+    @Bean
+    public JaversAuditableAspect javersAuditableAspect() {
+        return new JaversAuditableAspect(javers(), authorProvider(), commitPropertiesProvider());
+    }
+
+    /**
+     * Enables auto-audit aspect for Spring Data repositories. <br/>
      *
      * Use {@link org.javers.spring.annotation.JaversSpringDataAuditable}
-     * to annotate Spring Data Repositories
-     * or {@link org.javers.spring.annotation.JaversAuditable} for ordinary Repositories.
+     * to annotate CrudRepositories you want to audit.
      */
     @Bean
-    public JaversAuditableRepositoryAspect javersAuditableRepositoryAspect() {
-        return new JaversAuditableRepositoryAspect(javers(), authorProvider(), commitPropertiesProvider());
+    public JaversSpringDataAuditableRepositoryAspect javersSpringDataAuditableAspect() {
+        return new JaversSpringDataAuditableRepositoryAspect(javers(), authorProvider(), commitPropertiesProvider());
     }
 
     /**