Merge pull request #90 from abraxas-labs/#79

#79

README.md

@@ -10,7 +10,7 @@ in Maven `provided` scope to cut transitive dependencies.
 
 ## Core Features
 
-- [Spring Data extensions] [Spring Data extensions (1.4+)]
+- Spring Data extensions
 - Useful AOP aspects
 - Common exception classes
 - Web & MVC extensions

pom.xml

@@ -226,12 +226,6 @@
             <artifactId>el-impl</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.github.fakemongo</groupId>
-            <artifactId>fongo</artifactId>
-            <version>2.0.7</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>

src/main/java/org/ameba/app/BaseConfiguration.java

@@ -17,20 +17,16 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
-import org.springframework.data.mongodb.config.EnableMongoAuditing;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
 /**
- * A BaseConfiguration enables auto configuration of Spring Data JPA and MongoDB Auditing and instantiates a JSR-303 ValidatorFactory.
+ * A BaseConfiguration enables instantiates a JSR-303 ValidatorFactory.
  *
  * @author <a href="mailto:[email protected]">Heiko Scherrer</a>
  * @version 1.1
  * @since 1.0
  */
 @Configuration
-@EnableJpaAuditing
-@EnableMongoAuditing
 public class BaseConfiguration {
 
     /**

src/main/java/org/ameba/integration/mongodb/BaseEntity.java

@@ -15,7 +15,7 @@
  */
 package org.ameba.integration.mongodb;
 
-import java.time.ZonedDateTime;
+import java.util.Date;
 
 import org.ameba.integration.TypedEntity;
 import org.springframework.data.annotation.CreatedDate;
@@ -26,7 +26,9 @@
 import org.springframework.data.mongodb.core.mapping.Field;
 
 /**
- * A BaseEntity is a base superclass for MongoDB document entities.
+ * A BaseEntity is a base superclass for MongoDB document entities that defined useful fields for optimistic locking, unique persisted key,
+ * and timestamps for last change or insertion date. To active the latter feature the Spring application context need to enable Spring Data
+ * MongoDB MongoAuditingRegistrar. One approach to do this is to add {@code @EnableMongoAuditing} on a Spring configuration class.
  *
  * @author <a href="mailto:[email protected]">Heiko Scherrer</a>
  * @version 1.0
@@ -52,14 +54,14 @@ public class BaseEntity implements TypedEntity<String> {
     /** Timestamp when the document was inserted. */
     @Field(FIELD_CREATED)
     @CreatedDate
-    private ZonedDateTime createDt;
+    private Date createDt;
     /** Field name of the timestamp when the document was inserted. */
     public static final String FIELD_CREATED = "_created";
 
     /** Timestamp when the document was updated the last time. */
     @Field(FIELD_UPDATED)
     @LastModifiedDate
-    private ZonedDateTime lastModifiedDt;
+    private Date lastModifiedDt;
     /** Field name of the timestamp when the document was updated the last time. */
     public static final String FIELD_UPDATED = "_updated";
 
@@ -95,7 +97,7 @@ void setPk(String pk) {
      *
      * @return Creation date
      */
-    public ZonedDateTime getCreateDt() {
+    public Date getCreateDt() {
         return createDt;
     }
 
@@ -104,7 +106,7 @@ public ZonedDateTime getCreateDt() {
      *
      * @return Last modified date
      */
-    public ZonedDateTime getLastModifiedDt() {
+    public Date getLastModifiedDt() {
         return lastModifiedDt;
     }
 }

src/test/java/org/ameba/integration/jpa/IntegrationTestConfig.java

@@ -16,6 +16,7 @@
 package org.ameba.integration.jpa;
 
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 /**
@@ -26,6 +27,7 @@
  * @since 1.6
  */
 @Configuration
+@EnableJpaAuditing
 @EnableJpaRepositories(basePackageClasses = IntegrationTestConfig.class)
 public class IntegrationTestConfig {
 

src/test/java/org/ameba/integration/mongodb/AbstractMongoDBIntegrationTests.java

@@ -17,15 +17,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.github.fakemongo.Fongo;
 import com.mongodb.BasicDBObject;
 import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
+import org.ameba.app.BaseConfiguration;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
+import org.springframework.data.mongodb.config.EnableMongoAuditing;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 import org.springframework.test.context.ContextConfiguration;
@@ -39,10 +41,10 @@
  * @since 1.0
  */
 @RunWith(SpringRunner.class)
-//@EnableMongoAuditing
-@ContextConfiguration(/*classes = AbstractMongoDBIntegrationTests.TestConfig.class, */locations = "classpath:infrastructure.xml")
+@ContextConfiguration(classes = {AbstractMongoDBIntegrationTests.TestConfig.class, BaseConfiguration.class})
 public abstract class AbstractMongoDBIntegrationTests {
 
+        @EnableMongoAuditing
         @Configuration
         @EnableMongoRepositories(basePackageClasses = AbstractMongoDBIntegrationTests.class, considerNestedRepositories = true)
         static class TestConfig extends AbstractMongoConfiguration {
@@ -54,7 +56,7 @@ protected String getDatabaseName() {
 
             @Override
             public Mongo mongo() throws Exception {
-                return new Fongo(getDatabaseName()).getMongo();
+                return new MongoClient();
             }
         }
 

src/test/java/org/ameba/integration/mongodb/BaseEntityTest.java

@@ -47,8 +47,8 @@ public void testPk() {
         assertThat(all).hasSize(1);
         assertThat(all.get(0).isNew()).isFalse();
         assertThat(all.get(0).getPk()).isNotNull();
-//        assertThat(all.get(0).getCreateDt()).isNotNull();
-//        assertThat(all.get(0).getLastModifiedDt()).isNotNull();
+        assertThat(all.get(0).getCreateDt()).isNotNull();
+        assertThat(all.get(0).getLastModifiedDt()).isNotNull();
         assertThat(all.get(0)).extracting("ol").contains(0L);
     }
 }