SONAR-2642 add DAOs to picocontainer + improve unit tests

1 files changed, 4 insertions, 0 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java
index f6e60a928ca..a883995f26d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java
@@ -32,6 +32,7 @@ import org.sonar.jpa.session.DefaultDatabaseConnector;
 import org.sonar.jpa.session.ThreadLocalDatabaseSessionFactory;
 import org.sonar.persistence.DefaultDatabase;
 import org.sonar.persistence.MyBatis;
+import org.sonar.persistence.dao.DaoUtils;
 
 import java.net.URLClassLoader;
 
@@ -68,6 +69,9 @@ public class BootstrapModule extends Module {
     addCoreSingleton(MyBatis.class);
     addCoreSingleton(DefaultDatabaseConnector.class);
     addCoreSingleton(ThreadLocalDatabaseSessionFactory.class);
+    for (Class daoClass : DaoUtils.getDaoClasses()) {
+      addCoreSingleton(daoClass);
+    }
     addAdapter(new DatabaseSessionProvider());
     for (Object component : boostrapperComponents) {
       addCoreSingleton(component);