Merge pull request #10 from seedstack/dev-3.x

Business 4.0 implementation

Author: adrienlauer

.travis.yml

@@ -12,9 +12,9 @@ cache:
 
 install:
   - echo "<settings><servers><server><id>bintray</id><username>\${env.BINTRAY_USER}</username><password>\${env.BINTRAY_KEY}</password></server></servers></settings>" > ~/.m2/settings.xml
-  - if [[ $TRAVIS_PULL_REQUEST = false ]] && [[ $TRAVIS_BRANCH = master ]] || [[ $TRAVIS_TAG = v* ]]; then GOAL=deploy; else GOAL=install; fi
+  - if [[ $TRAVIS_PULL_REQUEST = false ]] && [[ $TRAVIS_BRANCH = master || $TRAVIS_BRANCH = dev-* ]] || [[ $TRAVIS_TAG = v* ]]; then GOAL=deploy; else GOAL=install; fi
   - if [[ $TRAVIS_TAG = v* ]]; then ADDITIONAL_PROFILES=release; mvn -q -U org.seedstack:seedstack-maven-plugin:release; else ADDITIONAL_PROFILES=snapshots; fi
 
-script: mvn -q -U -T 2 -Pbuild-number,compatibility,bintray,javadoc,$ADDITIONAL_PROFILES $GOAL jacoco:report
+script: mvn -q -U -Pbuild-number,compatibility,bintray,quality,javadoc,$ADDITIONAL_PROFILES $GOAL jacoco:report
 
 after_success: mvn -q coveralls:report -DrepoToken=$COVERALLS_TOKEN

core/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.addons.mongodb</groupId>
         <artifactId>mongodb</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
 	<artifactId>mongodb-core</artifactId>

core/src/main/java/org/seedstack/mongodb/internal/AsyncMongoDbManager.java

@@ -21,8 +21,8 @@
 import org.bson.codecs.configuration.CodecRegistry;
 import org.seedstack.coffig.BuilderSupplier;
 import org.seedstack.coffig.Coffig;
-import org.seedstack.coffig.util.Utils;
 import org.seedstack.mongodb.MongoDbConfig;
+import org.seedstack.shed.reflect.Classes;
 
 import java.util.List;
 import java.util.Optional;
@@ -63,7 +63,7 @@ private MongoClientSettings buildMongoClientSettings(MongoDbConfig.ClientConfig
         // Apply global settings
         Optional.ofNullable(allSettings.readPreference).ifPresent(settingsBuilder::readPreference);
         Optional.ofNullable(allSettings.writeConcern).ifPresent(settingsBuilder::writeConcern);
-        Optional.ofNullable(allSettings.codecRegistry).map(Utils::instantiateDefault).ifPresent(settingsBuilder::codecRegistry);
+        Optional.ofNullable(allSettings.codecRegistry).map(Classes::instantiateDefault).ifPresent(settingsBuilder::codecRegistry);
 
         // Apply sub-settings
         settingsBuilder.clusterSettings(allSettings.cluster.get().build());

morphia/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.addons.mongodb</groupId>
         <artifactId>mongodb</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>mongodb-morphia</artifactId>
@@ -40,6 +40,12 @@
             <groupId>org.mongodb.morphia</groupId>
             <artifactId>morphia-logging-slf4j</artifactId>
             <version>${morphia.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

morphia/src/it/java/org/seedstack/mongodb/morphia/MorphiaIT.java

@@ -8,34 +8,114 @@
 package org.seedstack.mongodb.morphia;
 
 import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.ProvisionException;
+import com.google.inject.TypeLiteral;
+import com.google.inject.util.Types;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.mongodb.morphia.Datastore;
 import org.mongodb.morphia.Key;
+import org.seedstack.business.domain.Repository;
+import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy1;
+import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy2;
+import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy3;
+import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy4;
+import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy5;
+import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy6;
 import org.seedstack.mongodb.morphia.fixtures.user.Address;
 import org.seedstack.mongodb.morphia.fixtures.user.User;
+import org.seedstack.mongodb.morphia.internal.MorphiaErrorCode;
+import org.seedstack.seed.SeedException;
 import org.seedstack.seed.it.AbstractSeedIT;
 
 import javax.validation.ConstraintViolationException;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
 public class MorphiaIT extends AbstractSeedIT {
     @Inject
     @MorphiaDatastore(clientName = "client1", dbName = "db")
     private Datastore datastore;
+    @Inject
+    private Injector injector;
 
     @Test
-    public void datastore_test() {
+    public void datastoreAccess() {
         User user = new User(1L, "Gerard", "menvuça", new Address("France", "78300", "Poissy", "avenue de l'europe", 1));
         Key<User> keyUser = datastore.save(user);
         Assertions.assertThat(keyUser).isNotNull();
     }
 
     @Test(expected = ConstraintViolationException.class)
-    public void validation_is_working() {
+    public void validationIsWorking() {
         User user = new User(1L, null, "menvuça", new Address("France", "78300", "Poissy", "avenue de l'europe", 1));
         datastore.save(user);
         fail("should not have saved");
     }
+
+    @Test
+    public void repositoryInjectionTestNoClientForAggregate() {
+        try {
+            injector.getInstance(getMorphiaRepositoryOf(Dummy1.class));
+        } catch (ProvisionException e) {
+            assertThat(e.getCause().getMessage())
+                    .isEqualTo(SeedException.createNew(MorphiaErrorCode.CLIENT_NAME_NOT_CONFIGURED).getMessage());
+        }
+    }
+
+    private com.google.inject.Key<?> getMorphiaRepositoryOf(Class entity) {
+        return com.google.inject.Key.get(TypeLiteral.get(Types.newParameterizedType(Repository.class, entity, Long.class)), Morphia.class);
+    }
+
+    @Test
+    public void repositoryInjectionTestNoDbNameForAggregate() {
+        try {
+            injector.getInstance(getMorphiaRepositoryOf(Dummy2.class));
+        } catch (ProvisionException e) {
+            assertThat(e.getCause().getMessage())
+                    .isEqualTo(SeedException.createNew(MorphiaErrorCode.UNKNOWN_DATABASE).getMessage());
+        }
+    }
+
+    @Test
+    public void repositoryInjectionTestNoMongoDbClient() {
+        try {
+            injector.getInstance(getMorphiaRepositoryOf(Dummy3.class));
+        } catch (ProvisionException e) {
+            assertThat(e.getCause().getMessage())
+                    .isEqualTo(SeedException.createNew(MorphiaErrorCode.UNKNOWN_CLIENT).getMessage());
+        }
+    }
+
+    @Test
+    public void repositoryInjectionTestNoMongoDbDatabase() {
+        try {
+            injector.getInstance(getMorphiaRepositoryOf(Dummy4.class));
+        } catch (ProvisionException e) {
+            assertThat(e.getCause().getMessage())
+                    .isEqualTo(SeedException.createNew(MorphiaErrorCode.UNKNOWN_DATABASE).getMessage());
+        }
+    }
+
+    @Test
+    public void repositoryInjectionTestNoMongodbForAggregate() {
+        try {
+            injector.getInstance(getMorphiaRepositoryOf(Dummy5.class));
+        } catch (ProvisionException e) {
+            assertThat(e.getCause().getMessage())
+                    .isEqualTo(SeedException.createNew(MorphiaErrorCode.PERSISTED_CLASS_NOT_CONFIGURED).getMessage());
+        }
+    }
+
+    @Test
+    public void repositoryInjectionAsyncClient() {
+        try {
+            injector.getInstance(getMorphiaRepositoryOf(Dummy6.class));
+        } catch (ProvisionException e) {
+            assertThat(e.getCause().getMessage())
+                    .isEqualTo(SeedException.createNew(MorphiaErrorCode.ASYNC_CLIENT_NOT_SUPPORTED).getMessage());
+        }
+    }
 }