Fix aliases when injecting morphia datastores

Author: adrienlauer

CHANGELOG.md

@@ -1,9 +1,10 @@
 # Version 1.1.0 (?)
 
-* [new] Add Bean Validation support to Morphia (at pre-persist)
-* [new] Add `exists()` and `count()` in `BaseMorphiaRepository`
-* [chg] Update for SeedStack 16.4
-* [brk] remove `do*()` methods in `BaseMorphiaRepository`
+* [new] Add Bean Validation support to Morphia (at pre-persist).
+* [new] Add `exists()` and `count()` in `BaseMorphiaRepository`.
+* [chg] Update for SeedStack 16.4.
+* [brk] Remove `do*()` methods in `BaseMorphiaRepository`.
+* [fix] Correctly take MongoDb database aliases into account when injecting Morphia data stores.
 
 # Version 1.0.1 (2016-02-09)
 

…/configuration/org.seedstack.mongo.props …ources/META-INF/configuration/seed.propscore/src/it/resources/META-INF/configuration/org.seedstack.mongo.props renamed to core/src/it/resources/META-INF/configuration/seed.props core/src/it/resources/META-INF/configuration/org.seedstack.mongo.props renamed to core/src/it/resources/META-INF/configuration/seed.props

@@ -6,6 +6,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+[org.seedstack.seed.logs]
+level = WARN
+
 [org.seedstack.mongodb]
 clients = client1, client2, client3
 

core/src/it/resources/logback-test.xml

@@ -22,7 +22,7 @@
 
 public class MorphiaIT extends AbstractSeedIT {
     @Inject
-    @MorphiaDatastore(clientName = "client1", dbName = "db1")
+    @MorphiaDatastore(clientName = "client1", dbName = "db")
     private Datastore datastore;
 
     @Test

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

@@ -6,30 +6,26 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+[org.seedstack.seed.logs]
+level = WARN
+
 [org.seedstack.mongodb]
-clients = client1, client2, client3
+clients = client1, client2
 
 [org.seedstack.mongodb.client.client1]
 hosts = localhost
 option.connectionsPerHost = 50
 databases = db1
+alias.db1 = db
 
 [org.seedstack.mongodb.client.client2]
-async = true
 hosts = localhost
-setting.connectionPool.maxSize = 50
-databases = db2
-
-[org.seedstack.mongodb.client.client3]
 async = true
-hosts = localhost
 databases = db2
-alias.db2 = db3
-
 
 [org.seedstack.mongodb.morphia.fixtures.user.*]
 morphia.clientName = client1
-morphia.dbName = db1
+morphia.dbName = db
 
 [org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy1]
 morphia.dbName = db4

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

@@ -7,14 +7,9 @@
  */
 package org.seedstack.mongodb.morphia;
 
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Key;
 import org.mongodb.morphia.Datastore;
 import org.seedstack.business.domain.AggregateRoot;
 import org.seedstack.business.domain.BaseRepository;
-import org.seedstack.mongodb.morphia.internal.MorphiaUtils;
-import org.seedstack.seed.Application;
 
 /**
  * This class can serve as a base class for Morphia repositories. It provides methods for common CRUD operations as
@@ -25,7 +20,7 @@
  * @author [email protected]
  */
 public abstract class BaseMorphiaRepository<A extends AggregateRoot<K>, K> extends BaseRepository<A, K> {
-    private Datastore datastore;
+    private final Datastore datastore;
 
     /**
      * Provides access to the Morphia data store for implementing custom data access methods.
@@ -36,16 +31,9 @@ protected Datastore getDatastore() {
         return datastore;
     }
 
-    public BaseMorphiaRepository() {
-    }
-
-    public BaseMorphiaRepository(Class<A> aggregateRootClass, Class<K> kClass) {
+    public BaseMorphiaRepository(Class<A> aggregateRootClass, Class<K> kClass, Datastore datastore) {
         super(aggregateRootClass, kClass);
-    }
-
-    @Inject
-    private void initDatastore(Application application, Injector injector) {
-        datastore = injector.getInstance(Key.get(Datastore.class, MorphiaUtils.getMongoDatastore(application, getAggregateRootClass())));
+        this.datastore = datastore;
     }
 
     @Override

…/configuration/org.seedstack.mongo.props …ources/META-INF/configuration/seed.propsmorphia/src/it/resources/META-INF/configuration/org.seedstack.mongo.props renamed to morphia/src/it/resources/META-INF/configuration/seed.props morphia/src/it/resources/META-INF/configuration/org.seedstack.mongo.props renamed to morphia/src/it/resources/META-INF/configuration/seed.props

@@ -7,7 +7,6 @@
  */
 package org.seedstack.mongodb.morphia.internal;
 
-import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Provider;
@@ -18,34 +17,35 @@
 import org.seedstack.mongodb.morphia.MorphiaDatastore;
 import org.seedstack.seed.Application;
 
+import javax.inject.Inject;
+
 /**
  * @author [email protected]
  */
 class DatastoreProvider implements Provider<Datastore> {
-
+    private final MorphiaDatastore morphiaDatastore;
+    private final Morphia morphia;
     @Inject
     private Injector injector;
-
     @Inject
     private Application application;
 
-    private Class<?> mappedclass;
-
-    private MorphiaDatastore morphiaDatastore;
-
-    private final Morphia morphia;
-
-    @Override
-    public Datastore get() {
-        MongoClient mongoClient = injector
-                .getInstance(Key.get(MongoClient.class, Names.named(morphiaDatastore.clientName())));
-        return morphia.createDatastore(mongoClient, morphiaDatastore.dbName());
-    }
-
-    public DatastoreProvider(MorphiaDatastore morphiaDatastore, Morphia morphia) {
+    DatastoreProvider(MorphiaDatastore morphiaDatastore, Morphia morphia) {
         super();
         this.morphiaDatastore = morphiaDatastore;
         this.morphia = morphia;
     }
 
+    @Override
+    public Datastore get() {
+        String resolvedDbName = MorphiaUtils.resolveDatabaseAlias(
+                MorphiaUtils.getMongoClientConfiguration(application.getConfiguration(), morphiaDatastore.clientName()),
+                morphiaDatastore.dbName()
+        );
+
+        return morphia.createDatastore(
+                injector.getInstance(Key.get(MongoClient.class, Names.named(morphiaDatastore.clientName()))),
+                resolvedDbName
+        );
+    }
 }

morphia/src/it/resources/logback-test.xml

@@ -7,12 +7,15 @@
  */
 package org.seedstack.mongodb.morphia.internal;
 
+import com.google.inject.Injector;
+import com.google.inject.Key;
 import com.google.inject.assistedinject.Assisted;
+import org.mongodb.morphia.Datastore;
 import org.seedstack.business.domain.AggregateRoot;
 import org.seedstack.business.spi.GenericImplementation;
 import org.seedstack.mongodb.morphia.BaseMorphiaRepository;
 import org.seedstack.mongodb.morphia.Morphia;
-import org.seedstack.seed.core.utils.SeedCheckUtils;
+import org.seedstack.seed.Application;
 
 import javax.inject.Inject;
 
@@ -39,10 +42,16 @@ public class DefaultMorphiaRepository<AGGREGATE extends AggregateRoot<KEY>, KEY>
      * Constructs a DefaultMongodbRepository.
      *
      * @param genericClasses the resolved generics for the aggregate root class and the key class
+     * @param application    injected implementation of {@link Application}
+     * @param injector       injector Guice injector.
      */
     @SuppressWarnings("unchecked")
     @Inject
-    public DefaultMorphiaRepository(@Assisted Object[] genericClasses) {
-        super((Class) genericClasses.clone()[0], (Class) genericClasses.clone()[0]);
+    public DefaultMorphiaRepository(@Assisted Object[] genericClasses, Application application, Injector injector) {
+        super(
+                (Class) genericClasses.clone()[0],
+                (Class) genericClasses.clone()[0],
+                injector.getInstance(Key.get(Datastore.class, MorphiaUtils.getMongoDatastore(application, (Class) genericClasses.clone()[0])))
+        );
     }
 }