From b6ae82155b1a0103e8c225720a444dcd46b443bf Mon Sep 17 00:00:00 2001 From: Heiko Scherrer Date: Wed, 8 Jun 2016 18:35:56 +0200 Subject: [PATCH] #79 removed Fongo, fixed tests, implementation done --- src/main/java/org/ameba/app/BaseConfiguration.java | 6 +----- .../java/org/ameba/integration/mongodb/BaseEntity.java | 10 +++++----- .../ameba/integration/jpa/IntegrationTestConfig.java | 2 ++ .../mongodb/AbstractMongoDBIntegrationTests.java | 5 ++++- .../org/ameba/integration/mongodb/BaseEntityTest.java | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/ameba/app/BaseConfiguration.java b/src/main/java/org/ameba/app/BaseConfiguration.java index 46e3384..cee2b4b 100644 --- a/src/main/java/org/ameba/app/BaseConfiguration.java +++ b/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 Heiko Scherrer * @version 1.1 * @since 1.0 */ @Configuration -@EnableJpaAuditing -@EnableMongoAuditing public class BaseConfiguration { /** diff --git a/src/main/java/org/ameba/integration/mongodb/BaseEntity.java b/src/main/java/org/ameba/integration/mongodb/BaseEntity.java index b1a89e6..b3f9669 100644 --- a/src/main/java/org/ameba/integration/mongodb/BaseEntity.java +++ b/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; @@ -54,14 +54,14 @@ public class BaseEntity implements TypedEntity { /** 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"; @@ -97,7 +97,7 @@ void setPk(String pk) { * * @return Creation date */ - public ZonedDateTime getCreateDt() { + public Date getCreateDt() { return createDt; } @@ -106,7 +106,7 @@ public ZonedDateTime getCreateDt() { * * @return Last modified date */ - public ZonedDateTime getLastModifiedDt() { + public Date getLastModifiedDt() { return lastModifiedDt; } } diff --git a/src/test/java/org/ameba/integration/jpa/IntegrationTestConfig.java b/src/test/java/org/ameba/integration/jpa/IntegrationTestConfig.java index 4490c48..464e0c6 100644 --- a/src/test/java/org/ameba/integration/jpa/IntegrationTestConfig.java +++ b/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 { diff --git a/src/test/java/org/ameba/integration/mongodb/AbstractMongoDBIntegrationTests.java b/src/test/java/org/ameba/integration/mongodb/AbstractMongoDBIntegrationTests.java index b7a96c9..be53970 100644 --- a/src/test/java/org/ameba/integration/mongodb/AbstractMongoDBIntegrationTests.java +++ b/src/test/java/org/ameba/integration/mongodb/AbstractMongoDBIntegrationTests.java @@ -20,12 +20,14 @@ 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,9 +41,10 @@ * @since 1.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(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 { diff --git a/src/test/java/org/ameba/integration/mongodb/BaseEntityTest.java b/src/test/java/org/ameba/integration/mongodb/BaseEntityTest.java index 91293a5..5e4e58a 100644 --- a/src/test/java/org/ameba/integration/mongodb/BaseEntityTest.java +++ b/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); } }