Sonar Persistence API refactoring

- Class mapped to tables should now be named "MyTableDto"
- DTOs, DAOs and Mappers of a same concern should be packed in a
  single package, allowing to use package visibility amongst them.

=> org.sonar.persistence has been reorganized following those rules.

6 files changed, 41 insertions, 41 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ManualViolationInjector.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ManualViolationInjector.java
index e85c0bae1e9..15fb8f8b4dd 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ManualViolationInjector.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ManualViolationInjector.java
@@ -28,9 +28,9 @@ import org.sonar.api.resources.Resource;
 import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.rules.RulePriority;
 import org.sonar.api.rules.Violation;
-import org.sonar.persistence.dao.ReviewDao;
-import org.sonar.persistence.model.Review;
-import org.sonar.persistence.model.ReviewQuery;
+import org.sonar.persistence.review.ReviewDao;
+import org.sonar.persistence.review.ReviewDto;
+import org.sonar.persistence.review.ReviewQuery;
 
 import java.util.List;
 
@@ -51,23 +51,23 @@ public class ManualViolationInjector implements Decorator {
 
   public void decorate(Resource resource, DecoratorContext context) {
     if (resource.getId() != null) {
-      ReviewQuery query = ReviewQuery.create().setManualViolation(true).setResourceId(resource.getId()).setStatus(Review.STATUS_OPENED);
-      List<Review> reviews = reviewDao.selectByQuery(query);
-      for (Review review : reviews) {
-        if (review.getRuleId() == null) {
-          LoggerFactory.getLogger(getClass()).warn("No rule is defined on the review with id: " + review.getId());
+      ReviewQuery query = ReviewQuery.create().setManualViolation(true).setResourceId(resource.getId()).setStatus(ReviewDto.STATUS_OPENED);
+      List<ReviewDto> reviewDtos = reviewDao.selectByQuery(query);
+      for (ReviewDto reviewDto : reviewDtos) {
+        if (reviewDto.getRuleId() == null) {
+          LoggerFactory.getLogger(getClass()).warn("No rule is defined on the review with id: " + reviewDto.getId());
         }
-        if (review.getViolationPermanentId() == null) {
-          LoggerFactory.getLogger(getClass()).warn("Permanent id of manual violation is missing on the review with id: " + review.getId());
+        if (reviewDto.getViolationPermanentId() == null) {
+          LoggerFactory.getLogger(getClass()).warn("Permanent id of manual violation is missing on the review with id: " + reviewDto.getId());
         }
-        Violation violation = Violation.create(ruleFinder.findById(review.getRuleId()), resource);
+        Violation violation = Violation.create(ruleFinder.findById(reviewDto.getRuleId()), resource);
         violation.setManual(true);
-        violation.setLineId(review.getLine());
-        violation.setPermanentId(review.getViolationPermanentId());
+        violation.setLineId(reviewDto.getLine());
+        violation.setPermanentId(reviewDto.getViolationPermanentId());
         violation.setSwitchedOff(false);
-        violation.setCreatedAt(review.getCreatedAt());
-        violation.setMessage(review.getTitle());
-        violation.setSeverity(RulePriority.valueOf(review.getSeverity()));
+        violation.setCreatedAt(reviewDto.getCreatedAt());
+        violation.setMessage(reviewDto.getTitle());
+        violation.setSeverity(RulePriority.valueOf(reviewDto.getSeverity()));
         context.saveViolation(violation);
       }
     }
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ViolationSeverityUpdater.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ViolationSeverityUpdater.java
index f5c63aa9fe7..882ddebc4b8 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ViolationSeverityUpdater.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ViolationSeverityUpdater.java
@@ -27,9 +27,9 @@ import org.sonar.api.resources.Resource;
 import org.sonar.api.resources.ResourceUtils;
 import org.sonar.api.rules.RulePriority;
 import org.sonar.api.rules.Violation;
-import org.sonar.persistence.dao.ReviewDao;
-import org.sonar.persistence.model.Review;
-import org.sonar.persistence.model.ReviewQuery;
+import org.sonar.persistence.review.ReviewDao;
+import org.sonar.persistence.review.ReviewDto;
+import org.sonar.persistence.review.ReviewQuery;
 import org.sonar.plugins.core.timemachine.ViolationTrackingDecorator;
 
 import java.util.List;
@@ -69,17 +69,17 @@ public class ViolationSeverityUpdater implements Decorator {
     Map<Integer, Violation> violationMap = filterViolationsPerPermanent(context.getViolations());
     if (!violationMap.isEmpty()) {
       Set<Integer> permanentIds = violationMap.keySet();
-      List<Review> reviews = selectReviewsWithManualSeverity(permanentIds);
-      for (Review review : reviews) {
-        Violation violation = violationMap.get(review.getViolationPermanentId());
+      List<ReviewDto> reviewDtos = selectReviewsWithManualSeverity(permanentIds);
+      for (ReviewDto reviewDto : reviewDtos) {
+        Violation violation = violationMap.get(reviewDto.getViolationPermanentId());
         if (violation != null) {
-          violation.setSeverity(RulePriority.valueOf(review.getSeverity()));
+          violation.setSeverity(RulePriority.valueOf(reviewDto.getSeverity()));
         }
       }
     }
   }
 
-  private List<Review> selectReviewsWithManualSeverity(Set<Integer> permanentIds) {
+  private List<ReviewDto> selectReviewsWithManualSeverity(Set<Integer> permanentIds) {
     ReviewQuery query = ReviewQuery.create()
       .setManualSeverity(Boolean.TRUE)
       .setViolationPermanentIds(Lists.newArrayList(permanentIds));
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ManualViolationInjectorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ManualViolationInjectorTest.java
index bb7c3e8b483..ed62cc0c53b 100644
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ManualViolationInjectorTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ManualViolationInjectorTest.java
@@ -30,9 +30,9 @@ import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.rules.RulePriority;
 import org.sonar.api.rules.Violation;
 import org.sonar.api.utils.DateUtils;
-import org.sonar.persistence.dao.ReviewDao;
-import org.sonar.persistence.model.Review;
-import org.sonar.persistence.model.ReviewQuery;
+import org.sonar.persistence.review.ReviewDao;
+import org.sonar.persistence.review.ReviewDto;
+import org.sonar.persistence.review.ReviewQuery;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -45,8 +45,8 @@ public class ManualViolationInjectorTest {
   public void shouldInjectManualViolationsDefinedByReviews() {
     ReviewDao reviewDao = mock(ReviewDao.class);
     final Date reviewCreatedAt = DateUtils.parseDate("2011-12-25");
-    Review review = new Review().setRuleId(3).setViolationPermanentId(100).setCreatedAt(reviewCreatedAt).setSeverity("BLOCKER");
-    when(reviewDao.selectByQuery(Matchers.<ReviewQuery>anyObject())).thenReturn(Arrays.<Review>asList(review));
+    ReviewDto reviewDto = new ReviewDto().setRuleId(3).setViolationPermanentId(100).setCreatedAt(reviewCreatedAt).setSeverity("BLOCKER");
+    when(reviewDao.selectByQuery(Matchers.<ReviewQuery>anyObject())).thenReturn(Arrays.<ReviewDto>asList(reviewDto));
     RuleFinder ruleFinder = mock(RuleFinder.class);
     when(ruleFinder.findById(3)).thenReturn(new Rule());
     DecoratorContext context = mock(DecoratorContext.class);
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationSeverityUpdaterTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationSeverityUpdaterTest.java
index 3b8a49aed2b..a9803001c34 100644
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationSeverityUpdaterTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationSeverityUpdaterTest.java
@@ -30,9 +30,9 @@ import org.sonar.api.resources.Resource;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RulePriority;
 import org.sonar.api.rules.Violation;
-import org.sonar.persistence.dao.ReviewDao;
-import org.sonar.persistence.model.Review;
-import org.sonar.persistence.model.ReviewQuery;
+import org.sonar.persistence.review.ReviewDao;
+import org.sonar.persistence.review.ReviewDto;
+import org.sonar.persistence.review.ReviewQuery;
 
 import java.util.Arrays;
 
@@ -52,8 +52,8 @@ public class ViolationSeverityUpdaterTest {
   @Test
   public void shouldUpdateSeverityFixedByEndUsers() {
     ReviewDao reviewDao = mock(ReviewDao.class);
-    when(reviewDao.selectByQuery(argThat(newReviewQueryMatcher(380)))).thenReturn(Arrays.<Review>asList(
-      new Review().setManualSeverity(true).setSeverity(RulePriority.BLOCKER.toString()).setViolationPermanentId(380)));
+    when(reviewDao.selectByQuery(argThat(newReviewQueryMatcher(380)))).thenReturn(Arrays.<ReviewDto>asList(
+      new ReviewDto().setManualSeverity(true).setSeverity(RulePriority.BLOCKER.toString()).setViolationPermanentId(380)));
     DecoratorContext context = mock(DecoratorContext.class);
     Violation newViolation = Violation.create(new Rule(), project).setSeverity(RulePriority.MINOR);
     Violation unchangedViolation = Violation.create(new Rule(), project).setPermanentId(120).setSeverity(RulePriority.MINOR);
diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java
index 14056dd47c3..06e74995a4e 100644
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java
+++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java
@@ -42,7 +42,7 @@ import org.sonar.duplications.java.JavaTokenProducer;
 import org.sonar.duplications.statement.Statement;
 import org.sonar.duplications.statement.StatementChunker;
 import org.sonar.duplications.token.TokenChunker;
-import org.sonar.persistence.dao.DuplicationDao;
+import org.sonar.persistence.duplication.DuplicationDao;
 import org.sonar.plugins.cpd.index.DbDuplicationsIndex;
 import org.sonar.plugins.cpd.index.SonarDuplicationsIndex;
 
diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/index/DbDuplicationsIndex.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/index/DbDuplicationsIndex.java
index 831464be4e8..755b8e3766a 100644
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/index/DbDuplicationsIndex.java
+++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/index/DbDuplicationsIndex.java
@@ -30,8 +30,8 @@ import org.sonar.api.resources.Resource;
 import org.sonar.batch.index.ResourcePersister;
 import org.sonar.duplications.block.Block;
 import org.sonar.duplications.block.ByteArray;
-import org.sonar.persistence.dao.DuplicationDao;
-import org.sonar.persistence.model.DuplicationUnit;
+import org.sonar.persistence.duplication.DuplicationDao;
+import org.sonar.persistence.duplication.DuplicationUnitDto;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -71,10 +71,10 @@ public class DbDuplicationsIndex {
 
   public void prepareCache(Resource resource) {
     int resourceSnapshotId = getSnapshotIdFor(resource);
-    List<DuplicationUnit> units = dao.selectCandidates(resourceSnapshotId, lastSnapshotId);
+    List<DuplicationUnitDto> units = dao.selectCandidates(resourceSnapshotId, lastSnapshotId);
     cache.clear();
     // TODO Godin: maybe remove conversion of units to blocks?
-    for (DuplicationUnit unit : units) {
+    for (DuplicationUnitDto unit : units) {
       String hash = unit.getHash();
       String resourceKey = unit.getResourceKey();
       int indexInFile = unit.getIndexInFile();
@@ -107,9 +107,9 @@ public class DbDuplicationsIndex {
     int resourceSnapshotId = getSnapshotIdFor(resource);
 
     // TODO Godin: maybe remove conversion of blocks to units?
-    List<DuplicationUnit> units = Lists.newArrayList();
+    List<DuplicationUnitDto> units = Lists.newArrayList();
     for (Block block : blocks) {
-      DuplicationUnit unit = new DuplicationUnit(
+      DuplicationUnitDto unit = new DuplicationUnitDto(
           currentProjectSnapshotId,
           resourceSnapshotId,
           block.getBlockHash().toString(),