Remove coupling with mybatis SqlSession by using internal DbSession.

3 files changed, 7 insertions, 5 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/ComponentDataPersister.java b/sonar-batch/src/main/java/org/sonar/batch/index/ComponentDataPersister.java
index 076f1eead68..39b0327fee5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/ComponentDataPersister.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/ComponentDataPersister.java
@@ -21,6 +21,7 @@ package org.sonar.batch.index;
 
 import org.sonar.api.database.model.Snapshot;
 import org.sonar.core.persistence.BatchSession;
+import org.sonar.core.persistence.DbSession;
 import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.source.db.SnapshotDataDao;
 import org.sonar.core.source.db.SnapshotDataDto;
@@ -43,7 +44,7 @@ public class ComponentDataPersister implements ScanPersister {
 
   @Override
   public void persist() {
-    BatchSession session = mybatis.openBatchSession();
+    DbSession session = mybatis.openSession(true);
     for (Map.Entry<String, Snapshot> componentEntry : snapshots.snapshots()) {
       String componentKey = componentEntry.getKey();
       Snapshot snapshot = componentEntry.getValue();
diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java b/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java
index 2e1c8995bac..e394f3199ee 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/MeasurePersister.java
@@ -175,7 +175,7 @@ public final class MeasurePersister {
   }
 
   private void insert(Iterable<MeasureModelAndDetails> values) {
-    SqlSession session = mybatis.openSession();
+    SqlSession session = mybatis.openSession(false);
     try {
       MeasureMapper mapper = session.getMapper(MeasureMapper.class);
 
@@ -198,7 +198,7 @@ public final class MeasurePersister {
     MeasureModel value = model(measure);
     value.setSnapshotId(snapshot.getId());
 
-    SqlSession session = mybatis.openSession();
+    SqlSession session = mybatis.openSession(false);
     try {
       MeasureMapper mapper = session.getMapper(MeasureMapper.class);
 
@@ -217,7 +217,7 @@ public final class MeasurePersister {
     value.setId(measure.getId());
     value.setSnapshotId(snapshot.getId());
 
-    SqlSession session = mybatis.openSession();
+    SqlSession session = mybatis.openSession(false);
     try {
       MeasureMapper mapper = session.getMapper(MeasureMapper.class);
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/GraphPersister.java b/sonar-batch/src/main/java/org/sonar/batch/phases/GraphPersister.java
index bf1c7f0a932..3fc0f17db9a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/phases/GraphPersister.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/phases/GraphPersister.java
@@ -33,6 +33,7 @@ import org.sonar.core.graph.graphson.GraphsonWriter;
 import org.sonar.core.graph.jdbc.GraphDto;
 import org.sonar.core.graph.jdbc.GraphDtoMapper;
 import org.sonar.core.persistence.BatchSession;
+import org.sonar.core.persistence.DbSession;
 import org.sonar.core.persistence.MyBatis;
 
 import java.io.StringWriter;
@@ -49,7 +50,7 @@ public class GraphPersister implements ScanPersister {
   }
 
   public void persist() {
-    BatchSession session = myBatis.openBatchSession();
+    DbSession session = myBatis.openSession(true);
     GraphDtoMapper mapper = session.getMapper(GraphDtoMapper.class);
     try {
       for (ComponentVertex component : projectGraph.getComponents()) {