Revert base repo change

Author: adrienlauer

morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java

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

morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DefaultMorphiaRepository.java

@@ -7,10 +7,7 @@
  */
 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;
@@ -42,16 +39,10 @@ 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, 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])))
-        );
+    public DefaultMorphiaRepository(@Assisted Object[] genericClasses) {
+        super((Class) genericClasses.clone()[0], (Class) genericClasses.clone()[1]);
     }
 }