Extract module sonar-db

microbenchmark-template/pom.xml

@@ -28,7 +28,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-core</artifactId>
+      <artifactId>sonar-db</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

pom.xml

@@ -20,6 +20,7 @@
     <module>sonar-check-api</module>
     <module>sonar-colorizer</module>
     <module>sonar-core</module>
+    <module>sonar-db</module>
     <module>sonar-duplications</module>
     <module>sonar-home</module>
     <module>sonar-markdown</module>
@@ -606,6 +607,11 @@
         <artifactId>sonar-core</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.sonar</groupId>
+        <artifactId>sonar-db</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-batch-protocol</artifactId>

server/sonar-server-benchmarks/pom.xml

@@ -18,7 +18,7 @@
   <dependencies>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-core</artifactId>
+      <artifactId>sonar-db</artifactId>
       <type>test-jar</type>
       <version>${project.version}</version>
       <scope>test</scope>

server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java

@@ -35,7 +35,7 @@ import org.sonar.api.utils.internal.Uuids;
 import org.sonar.batch.protocol.Constants;
 import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.protocol.output.BatchReportWriter;
-import org.sonar.core.persistence.DbTester;
+import org.sonar.db.DbTester;
 import org.sonar.server.computation.batch.BatchReportDirectoryHolderImpl;
 import org.sonar.server.computation.batch.BatchReportReaderImpl;
 import org.sonar.server.computation.batch.TreeRootHolderRule;

server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java

@@ -26,8 +26,8 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.utils.internal.Uuids;
-import org.sonar.core.persistence.DbTester;
-import org.sonar.core.source.db.FileSourceDto;
+import org.sonar.db.DbTester;
+import org.sonar.db.source.FileSourceDto;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.source.db.FileSourceDao;
 import org.sonar.server.source.db.FileSourceDb;

server/sonar-server/pom.xml

@@ -72,6 +72,10 @@
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.sonar</groupId>
+      <artifactId>sonar-db</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-batch-protocol</artifactId>
@@ -181,7 +185,7 @@
     <!-- unit tests -->
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-core</artifactId>
+      <artifactId>sonar-db</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>

server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/IndexPurgeListener.java

@@ -21,7 +21,7 @@
 package org.sonar.core.computation.dbcleaner;
 
 import org.sonar.api.server.ServerSide;
-import org.sonar.core.purge.PurgeListener;
+import org.sonar.db.purge.PurgeListener;
 import org.sonar.server.source.index.SourceLineIndexer;
 import org.sonar.server.test.index.TestIndexer;
 

server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java

@@ -28,16 +28,16 @@ import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.TimeUtils;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.purge.IdUuidPair;
-import org.sonar.core.purge.PurgeConfiguration;
-import org.sonar.core.purge.PurgeDao;
-import org.sonar.core.purge.PurgeListener;
-import org.sonar.core.purge.PurgeProfiler;
+import org.sonar.db.purge.period.DefaultPeriodCleaner;
+import org.sonar.db.DbSession;
+import org.sonar.db.purge.IdUuidPair;
+import org.sonar.db.purge.PurgeConfiguration;
+import org.sonar.db.purge.PurgeDao;
+import org.sonar.db.purge.PurgeListener;
+import org.sonar.db.purge.PurgeProfiler;
 import org.sonar.server.issue.index.IssueIndex;
 
-import static org.sonar.core.purge.PurgeConfiguration.newDefaultPurgeConfiguration;
+import static org.sonar.db.purge.PurgeConfiguration.newDefaultPurgeConfiguration;
 
 @ServerSide
 public class ProjectCleaner {

server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java

@@ -22,7 +22,7 @@ package org.sonar.server.activity;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.KeyValueFormat;
 import org.sonar.api.utils.internal.Uuids;
-import org.sonar.core.activity.db.ActivityDto;
+import org.sonar.db.activity.ActivityDto;
 import org.sonar.server.activity.index.ActivityIndexer;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.user.UserSession;

server/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java

@@ -21,16 +21,16 @@ package org.sonar.server.activity.db;
 
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.System2;
-import org.sonar.core.activity.db.ActivityDto;
-import org.sonar.core.activity.db.ActivityMapper;
-import org.sonar.core.persistence.DaoComponent;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.activity.ActivityDto;
+import org.sonar.db.activity.ActivityMapper;
+import org.sonar.db.Dao;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 
 import java.util.Date;
 
 @ServerSide
-public class ActivityDao implements DaoComponent {
+public class ActivityDao implements Dao {
 
   private final MyBatis mybatis;
   private final System2 system;

server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndexer.java

@@ -19,7 +19,7 @@
  */
 package org.sonar.server.activity.index;
 
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.DbSession;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.es.BaseIndexer;
 import org.sonar.server.es.BulkIndexer;

server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java

@@ -19,7 +19,7 @@
  */
 package org.sonar.server.batch;
 
-import org.sonar.core.component.Module;
+import org.sonar.core.platform.Module;
 import org.sonar.server.computation.ws.SubmitReportAction;
 
 public class BatchWsModule extends Module {

server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java

@@ -25,12 +25,12 @@ import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.batch.protocol.input.GlobalRepositories;
-import org.sonar.core.metric.db.MetricDto;
+import org.sonar.db.metric.MetricDto;
 import org.sonar.core.permission.GlobalPermissions;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
-import org.sonar.core.properties.PropertiesDao;
-import org.sonar.core.properties.PropertyDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
+import org.sonar.db.property.PropertiesDao;
+import org.sonar.db.property.PropertyDto;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.plugins.MimeTypes;

server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java

@@ -25,10 +25,10 @@ import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.batch.protocol.input.BatchInput;
-import org.sonar.core.component.ComponentDto;
+import org.sonar.db.component.ComponentDto;
 import org.sonar.core.permission.GlobalPermissions;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.issue.index.IssueDoc;
 import org.sonar.server.issue.index.IssueIndex;

server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java

@@ -39,14 +39,14 @@ import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.web.UserRole;
 import org.sonar.batch.protocol.input.FileData;
 import org.sonar.batch.protocol.input.ProjectRepositories;
-import org.sonar.core.UtcDateUtils;
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.component.FilePathWithHashDto;
+import org.sonar.core.util.UtcDateUtils;
+import org.sonar.db.component.ComponentDto;
+import org.sonar.db.component.FilePathWithHashDto;
 import org.sonar.core.permission.GlobalPermissions;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
-import org.sonar.core.properties.PropertyDto;
-import org.sonar.core.qualityprofile.db.QualityProfileDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
+import org.sonar.db.property.PropertyDto;
+import org.sonar.db.qualityprofile.QualityProfileDto;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.qualityprofile.ActiveRule;

server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java

@@ -24,10 +24,10 @@ import org.sonar.api.server.ServerSide;
 import org.sonar.api.resources.ResourceType;
 import org.sonar.api.resources.ResourceTypes;
 import org.sonar.api.resources.Scopes;
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
-import org.sonar.core.purge.IdUuidPair;
+import org.sonar.db.component.ComponentDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
+import org.sonar.db.purge.IdUuidPair;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.issue.index.IssueAuthorizationIndexer;
 import org.sonar.server.issue.index.IssueIndexer;

server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java

@@ -38,12 +38,12 @@ import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.internal.Uuids;
 import org.sonar.api.web.UserRole;
-import org.sonar.core.component.ComponentDto;
+import org.sonar.db.component.ComponentDto;
 import org.sonar.core.component.ComponentKeys;
 import org.sonar.core.permission.GlobalPermissions;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.resource.ResourceIndexerDao;
-import org.sonar.core.resource.ResourceKeyUpdaterDao;
+import org.sonar.db.DbSession;
+import org.sonar.db.component.ResourceIndexerDao;
+import org.sonar.db.component.ResourceKeyUpdaterDao;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.exceptions.NotFoundException;

server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java

@@ -27,9 +27,9 @@ import javax.annotation.Nullable;
 import org.sonar.api.component.Component;
 import org.sonar.api.component.RubyComponentService;
 import org.sonar.api.resources.Qualifiers;
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.resource.ResourceDao;
-import org.sonar.core.resource.ResourceDto;
+import org.sonar.db.component.ComponentDto;
+import org.sonar.db.component.ResourceDao;
+import org.sonar.db.component.ResourceDto;
 import org.sonar.server.exceptions.BadRequestException;
 import org.sonar.server.permission.InternalPermissionService;
 import org.sonar.server.util.RubyUtils;

server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java

@@ -32,13 +32,13 @@ import org.apache.ibatis.session.RowBounds;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.Scopes;
 import org.sonar.api.server.ServerSide;
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.component.FilePathWithHashDto;
-import org.sonar.core.component.UuidWithProjectUuidDto;
-import org.sonar.core.component.db.ComponentMapper;
-import org.sonar.core.persistence.DaoComponent;
-import org.sonar.core.persistence.DaoUtils;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.component.ComponentDto;
+import org.sonar.db.component.FilePathWithHashDto;
+import org.sonar.db.component.UuidWithProjectUuidDto;
+import org.sonar.db.component.ComponentMapper;
+import org.sonar.db.Dao;
+import org.sonar.db.DaoUtils;
+import org.sonar.db.DbSession;
 import org.sonar.server.es.SearchOptions;
 import org.sonar.server.exceptions.NotFoundException;
 
@@ -48,7 +48,7 @@ import static com.google.common.collect.Maps.newHashMapWithExpectedSize;
  * @since 4.3
  */
 @ServerSide
-public class ComponentDao implements DaoComponent {
+public class ComponentDao implements Dao {
 
   public ComponentDto selectById(Long id, DbSession session) {
     ComponentDto componentDto = selectNullableById(id, session);

server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentIndexDao.java

@@ -21,14 +21,14 @@
 package org.sonar.server.component.db;
 
 import org.sonar.api.server.ServerSide;
-import org.sonar.core.component.db.ComponentIndexMapper;
-import org.sonar.core.persistence.DaoComponent;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.component.ComponentIndexMapper;
+import org.sonar.db.Dao;
+import org.sonar.db.DbSession;
 
 import java.util.List;
 
 @ServerSide
-public class ComponentIndexDao implements DaoComponent {
+public class ComponentIndexDao implements Dao {
 
   public List<Long> selectProjectIdsFromQueryAndViewOrSubViewUuid(DbSession session, String query, String viewOrSubViewUuid) {
     return session.getMapper(ComponentIndexMapper.class).selectProjectIdsFromQueryAndViewOrSubViewUuid(query + "%", "%." + viewOrSubViewUuid + ".%");

server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentLinkDao.java

@@ -21,15 +21,15 @@
 package org.sonar.server.component.db;
 
 import org.sonar.api.server.ServerSide;
-import org.sonar.core.component.ComponentLinkDto;
-import org.sonar.core.component.db.ComponentLinkMapper;
-import org.sonar.core.persistence.DaoComponent;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.component.ComponentLinkDto;
+import org.sonar.db.component.ComponentLinkMapper;
+import org.sonar.db.Dao;
+import org.sonar.db.DbSession;
 
 import java.util.List;
 
 @ServerSide
-public class ComponentLinkDao implements DaoComponent {
+public class ComponentLinkDao implements Dao {
 
   public List<ComponentLinkDto> selectByComponentUuid(DbSession session, String componentUuid) {
     return session.getMapper(ComponentLinkMapper.class).selectByComponentUuid(componentUuid);

server/sonar-server/src/main/java/org/sonar/server/component/db/SnapshotDao.java

@@ -27,14 +27,14 @@ import java.util.List;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import org.sonar.api.resources.Scopes;
-import org.sonar.core.component.SnapshotDto;
-import org.sonar.core.component.db.SnapshotMapper;
-import org.sonar.core.component.db.SnapshotQuery;
-import org.sonar.core.persistence.DaoComponent;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.component.SnapshotDto;
+import org.sonar.db.component.SnapshotMapper;
+import org.sonar.db.component.SnapshotQuery;
+import org.sonar.db.Dao;
+import org.sonar.db.DbSession;
 import org.sonar.server.exceptions.NotFoundException;
 
-public class SnapshotDao implements DaoComponent {
+public class SnapshotDao implements Dao {
 
   @CheckForNull
   public SnapshotDto selectNullableById(DbSession session, Long id) {

server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java

@@ -35,12 +35,12 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.api.utils.Durations;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.api.web.UserRole;
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.measure.db.MeasureDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
-import org.sonar.core.properties.PropertyDto;
-import org.sonar.core.properties.PropertyQuery;
+import org.sonar.db.component.ComponentDto;
+import org.sonar.db.measure.MeasureDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
+import org.sonar.db.property.PropertyDto;
+import org.sonar.db.property.PropertyQuery;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.user.UserSession;

server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentJsonWriter.java

@@ -20,7 +20,7 @@
 package org.sonar.server.component.ws;
 
 import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.core.component.ComponentDto;
+import org.sonar.db.component.ComponentDto;
 
 public class ComponentJsonWriter {
 

server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java

@@ -31,9 +31,9 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.api.server.ws.WebService.Param;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.api.web.UserRole;
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.component.ComponentDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.es.SearchOptions;
 import org.sonar.server.user.UserSession;

server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java

@@ -29,8 +29,8 @@ import org.sonar.server.computation.activity.ActivityManager;
 import org.sonar.server.computation.step.ComputationStep;
 import org.sonar.server.computation.step.ComputationSteps;
 
-import static org.sonar.core.computation.db.AnalysisReportDto.Status.FAILED;
-import static org.sonar.core.computation.db.AnalysisReportDto.Status.SUCCESS;
+import static org.sonar.db.compute.AnalysisReportDto.Status.FAILED;
+import static org.sonar.db.compute.AnalysisReportDto.Status.SUCCESS;
 
 @ServerSide
 public class ComputationService {

server/sonar-server/src/main/java/org/sonar/server/computation/ReportQueue.java

@@ -30,14 +30,14 @@ import org.sonar.api.config.Settings;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.internal.Uuids;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.core.computation.db.AnalysisReportDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.compute.AnalysisReportDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.process.ProcessProperties;
 import org.sonar.server.computation.db.AnalysisReportDao;
 import org.sonar.server.db.DbClient;
 
-import static org.sonar.core.computation.db.AnalysisReportDto.Status.PENDING;
+import static org.sonar.db.compute.AnalysisReportDto.Status.PENDING;
 
 @ServerSide
 public class ReportQueue {

server/sonar-server/src/main/java/org/sonar/server/computation/activity/ActivityManager.java

@@ -20,10 +20,10 @@
 package org.sonar.server.computation.activity;
 
 import javax.annotation.CheckForNull;
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.computation.db.AnalysisReportDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.component.ComponentDto;
+import org.sonar.db.compute.AnalysisReportDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.activity.Activity;
 import org.sonar.server.activity.ActivityService;
 import org.sonar.server.db.DbClient;

server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java

@@ -29,8 +29,8 @@ import org.picocontainer.lifecycle.ReflectionLifecycleStrategy;
 import org.picocontainer.monitors.NullComponentMonitor;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
-import org.sonar.core.component.Module;
-import org.sonar.core.issue.db.UpdateConflictResolver;
+import org.sonar.core.platform.Module;
+import org.sonar.server.computation.issue.UpdateConflictResolver;
 import org.sonar.core.issue.tracking.Tracker;
 import org.sonar.core.platform.ComponentContainer;
 import org.sonar.server.computation.ComputationService;

server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java

@@ -22,19 +22,19 @@ package org.sonar.server.computation.db;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.sonar.api.utils.System2;
-import org.sonar.core.computation.db.AnalysisReportDto;
-import org.sonar.core.computation.db.AnalysisReportMapper;
-import org.sonar.core.persistence.DaoComponent;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.compute.AnalysisReportDto;
+import org.sonar.db.compute.AnalysisReportMapper;
+import org.sonar.db.Dao;
+import org.sonar.db.DbSession;
 
 import javax.annotation.CheckForNull;
 
 import java.util.List;
 
-import static org.sonar.core.computation.db.AnalysisReportDto.Status.PENDING;
-import static org.sonar.core.computation.db.AnalysisReportDto.Status.WORKING;
+import static org.sonar.db.compute.AnalysisReportDto.Status.PENDING;
+import static org.sonar.db.compute.AnalysisReportDto.Status.WORKING;
 
-public class AnalysisReportDao implements DaoComponent {
+public class AnalysisReportDao implements Dao {
 
   private System2 system2;
 

server/sonar-server/src/main/java/org/sonar/server/computation/issue/BaseIssuesLoader.java

@@ -29,10 +29,10 @@ import org.apache.ibatis.session.ResultHandler;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.RuleStatus;
 import org.sonar.core.issue.DefaultIssue;
-import org.sonar.core.issue.db.IssueDto;
-import org.sonar.core.issue.db.IssueMapper;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.issue.IssueDto;
+import org.sonar.db.issue.IssueMapper;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.TreeRootHolder;
 import org.sonar.server.db.DbClient;

server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtAggregator.java

@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Map;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.core.issue.DefaultIssue;
-import org.sonar.core.issue.db.IssueChangeDto;
+import org.sonar.db.issue.IssueChangeDto;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.measure.Measure;
 import org.sonar.server.computation.measure.MeasureRepository;

server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtCalculator.java

@@ -37,7 +37,7 @@ import org.apache.commons.lang.time.DateUtils;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.FieldDiffs;
 import org.sonar.core.issue.IssueUpdater;
-import org.sonar.core.issue.db.IssueChangeDto;
+import org.sonar.db.issue.IssueChangeDto;
 import org.sonar.server.computation.period.Period;
 
 import static com.google.common.collect.FluentIterable.from;

server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleCacheLoader.java

@@ -23,9 +23,9 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import org.sonar.api.rule.RuleKey;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
-import org.sonar.core.rule.RuleDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
+import org.sonar.db.rule.RuleDto;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.util.cache.CacheLoader;

server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleImpl.java

@@ -28,7 +28,7 @@ import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.server.debt.DebtRemediationFunction;
 import org.sonar.api.server.debt.internal.DefaultDebtRemediationFunction;
-import org.sonar.core.rule.RuleDto;
+import org.sonar.db.rule.RuleDto;
 
 import static com.google.common.collect.Sets.union;
 

server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerBaseInputFactory.java

@@ -26,8 +26,8 @@ import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.tracking.Input;
 import org.sonar.core.issue.tracking.LazyInput;
 import org.sonar.core.issue.tracking.LineHashSequence;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.db.DbClient;
 

sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java → server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java

@@ -17,18 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.core.issue.db;
+package org.sonar.server.computation.issue;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.core.issue.DefaultIssue;
+import org.sonar.db.issue.IssueDto;
+import org.sonar.db.issue.IssueMapper;
 
 /**
  * Support concurrent modifications on issues made by analysis and users at the same time
  * See https://jira.sonarsource.com/browse/SONAR-4309
- *
- * TODO move to compute engine
  */
 public class UpdateConflictResolver {
 

server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java

@@ -21,7 +21,7 @@ package org.sonar.server.computation.measure;
 
 import com.google.common.base.Optional;
 import javax.annotation.Nullable;
-import org.sonar.core.measure.db.MeasureDto;
+import org.sonar.db.measure.MeasureDto;
 import org.sonar.server.computation.metric.Metric;
 
 import static com.google.common.base.Optional.of;

server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureKey.java

@@ -23,7 +23,7 @@ package org.sonar.server.computation.measure;
 import java.util.Objects;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
-import org.sonar.core.rule.RuleDto;
+import org.sonar.db.rule.RuleDto;
 import org.sonar.server.computation.debt.Characteristic;
 
 import static com.google.common.base.Preconditions.checkArgument;

server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepository.java

@@ -21,7 +21,7 @@ package org.sonar.server.computation.measure;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.SetMultimap;
-import org.sonar.core.rule.RuleDto;
+import org.sonar.db.rule.RuleDto;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.debt.Characteristic;
 import org.sonar.server.computation.metric.Metric;

server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java

@@ -28,9 +28,9 @@ import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.core.measure.db.MeasureDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.rule.RuleDto;
+import org.sonar.db.measure.MeasureDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.rule.RuleDto;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.debt.Characteristic;

server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureToMeasureDto.java

@@ -21,7 +21,7 @@ package org.sonar.server.computation.measure;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
-import org.sonar.core.measure.db.MeasureDto;
+import org.sonar.db.measure.MeasureDto;
 import org.sonar.server.computation.metric.Metric;
 
 public enum MeasureToMeasureDto {

server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java

@@ -19,7 +19,7 @@
  */
 package org.sonar.server.computation.measure.newcoverage;
 
-import org.sonar.core.component.Module;
+import org.sonar.core.platform.Module;
 
 public class NewCoverageMetricKeysModule extends Module {
   @Override

server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java

@@ -21,7 +21,7 @@ package org.sonar.server.computation.metric;
 
 import com.google.common.base.Function;
 import javax.annotation.Nonnull;
-import org.sonar.core.metric.db.MetricDto;
+import org.sonar.db.metric.MetricDto;
 
 enum MetricDtoToMetric implements Function<MetricDto, Metric> {
   INSTANCE;

server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java

@@ -26,8 +26,8 @@ import java.util.Map;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import org.picocontainer.Startable;
-import org.sonar.core.metric.db.MetricDto;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.metric.MetricDto;
+import org.sonar.db.DbSession;
 import org.sonar.server.db.DbClient;
 
 import static com.google.common.collect.FluentIterable.from;

server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateServiceImpl.java

@@ -22,10 +22,10 @@ package org.sonar.server.computation.qualitygate;
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import javax.annotation.Nonnull;
-import org.sonar.core.qualitygate.db.QualityGateConditionDao;
-import org.sonar.core.qualitygate.db.QualityGateConditionDto;
-import org.sonar.core.qualitygate.db.QualityGateDao;
-import org.sonar.core.qualitygate.db.QualityGateDto;
+import org.sonar.db.qualitygate.QualityGateConditionDao;
+import org.sonar.db.qualitygate.QualityGateConditionDto;
+import org.sonar.db.qualitygate.QualityGateDao;
+import org.sonar.db.qualitygate.QualityGateDto;
 import org.sonar.server.computation.metric.Metric;
 import org.sonar.server.computation.metric.MetricRepository;
 

server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QPMeasureData.java

@@ -33,7 +33,7 @@ import java.util.SortedSet;
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.Immutable;
 import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.core.UtcDateUtils;
+import org.sonar.core.util.UtcDateUtils;
 
 /**
  * Represents the array of JSON objects stored in the value of the

server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java

@@ -21,9 +21,9 @@
 package org.sonar.server.computation.step;
 
 import org.sonar.api.resources.Qualifiers;
-import org.sonar.core.permission.PermissionFacade;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.permission.PermissionFacade;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.computation.component.DbIdsRepository;
 import org.sonar.server.computation.component.TreeRootHolder;
 import org.sonar.server.db.DbClient;

server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java

@@ -22,9 +22,9 @@ package org.sonar.server.computation.step;
 import com.google.common.annotations.VisibleForTesting;
 import java.util.List;
 import org.apache.commons.lang.math.NumberUtils;
-import org.sonar.core.measure.custom.db.CustomMeasureDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.measure.CustomMeasureDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor;
 import org.sonar.server.computation.component.TreeRootHolder;

server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedDebtModelStep.java

@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.technicaldebt.db.CharacteristicDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.debt.CharacteristicDto;
 import org.sonar.server.computation.debt.Characteristic;
 import org.sonar.server.computation.debt.MutableDebtModelHolder;
 import org.sonar.server.db.DbClient;

server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedPeriodsStep.java

@@ -35,10 +35,10 @@ import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.component.SnapshotDto;
-import org.sonar.core.component.db.SnapshotQuery;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.component.ComponentDto;
+import org.sonar.db.component.SnapshotDto;
+import org.sonar.db.component.SnapshotQuery;
+import org.sonar.db.DbSession;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.TreeRootHolder;
@@ -46,9 +46,9 @@ import org.sonar.server.computation.period.Period;
 import org.sonar.server.computation.period.PeriodsHolderImpl;
 import org.sonar.server.db.DbClient;
 
-import static org.sonar.core.component.db.SnapshotQuery.SORT_FIELD.BY_DATE;
-import static org.sonar.core.component.db.SnapshotQuery.SORT_ORDER.ASC;
-import static org.sonar.core.component.db.SnapshotQuery.SORT_ORDER.DESC;
+import static org.sonar.db.component.SnapshotQuery.SORT_FIELD.BY_DATE;
+import static org.sonar.db.component.SnapshotQuery.SORT_ORDER.ASC;
+import static org.sonar.db.component.SnapshotQuery.SORT_ORDER.DESC;
 
 /**
  * Populates the {@link org.sonar.server.computation.period.PeriodsHolder}

server/sonar-server/src/main/java/org/sonar/server/computation/step/FillComponentsStep.java

@@ -25,9 +25,9 @@ import java.util.List;
 import java.util.Map;
 import org.sonar.api.utils.internal.Uuids;
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.core.component.ComponentDto;
+import org.sonar.db.component.ComponentDto;
 import org.sonar.core.component.ComponentKeys;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.DbSession;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.ComponentImpl;

server/sonar-server/src/main/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStep.java

@@ -31,8 +31,8 @@ import java.util.Set;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.sonar.core.measure.db.PastMeasureDto;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.measure.PastMeasureDto;
+import org.sonar.db.DbSession;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor;
 import org.sonar.server.computation.component.TreeRootHolder;

server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java

@@ -20,7 +20,7 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.core.resource.ResourceIndexerDao;
+import org.sonar.db.component.ResourceIndexerDao;
 import org.sonar.server.computation.component.DbIdsRepository;
 import org.sonar.server.computation.component.TreeRootHolder;
 

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java

@@ -34,8 +34,8 @@ import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.Scopes;
 import org.sonar.api.utils.System2;
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.component.ComponentDto;
+import org.sonar.db.DbSession;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepository;

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java

@@ -25,10 +25,10 @@ import org.apache.commons.lang.StringEscapeUtils;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.protocol.output.BatchReport.Range;
-import org.sonar.core.measure.db.MeasureDto;
-import org.sonar.core.metric.db.MetricDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.measure.MeasureDto;
+import org.sonar.db.metric.MetricDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepository;

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java

@@ -23,9 +23,9 @@ package org.sonar.server.computation.step;
 import com.google.common.base.Function;
 import javax.annotation.Nonnull;
 import org.sonar.api.utils.System2;
-import org.sonar.core.event.EventDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.event.EventDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepository;

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java

@@ -30,10 +30,10 @@ import org.apache.ibatis.session.ResultContext;
 import org.apache.ibatis.session.ResultHandler;
 import org.sonar.api.utils.System2;
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
-import org.sonar.core.source.db.FileSourceDto;
-import org.sonar.core.source.db.FileSourceDto.Type;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
+import org.sonar.db.source.FileSourceDto;
+import org.sonar.db.source.FileSourceDto.Type;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor;
@@ -91,7 +91,7 @@ public class PersistFileSourcesStep implements ComputationStep {
     @Override
     public void visitProject(Component project) {
       this.projectUuid = project.getUuid();
-      session.select("org.sonar.core.source.db.FileSourceMapper.selectHashesForProject", ImmutableMap.of("projectUuid", projectUuid, "dataType", Type.SOURCE),
+      session.select("org.sonar.db.source.FileSourceMapper.selectHashesForProject", ImmutableMap.of("projectUuid", projectUuid, "dataType", Type.SOURCE),
         new ResultHandler() {
           @Override
           public void handleResult(ResultContext context) {

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java

@@ -24,13 +24,13 @@ import org.sonar.api.utils.System2;
 import org.sonar.core.issue.DefaultIssue;
 import org.sonar.core.issue.DefaultIssueComment;
 import org.sonar.core.issue.FieldDiffs;
-import org.sonar.core.issue.db.IssueChangeDto;
-import org.sonar.core.issue.db.IssueChangeMapper;
-import org.sonar.core.issue.db.IssueDto;
-import org.sonar.core.issue.db.IssueMapper;
-import org.sonar.core.issue.db.UpdateConflictResolver;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.issue.IssueChangeDto;
+import org.sonar.db.issue.IssueChangeMapper;
+import org.sonar.db.issue.IssueDto;
+import org.sonar.db.issue.IssueMapper;
+import org.sonar.server.computation.issue.UpdateConflictResolver;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.computation.issue.IssueCache;
 import org.sonar.server.computation.issue.RuleRepository;
 import org.sonar.server.db.DbClient;

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java

@@ -29,8 +29,8 @@ import java.util.List;
 import java.util.Map;
 import javax.annotation.Nonnull;
 import org.sonar.api.measures.CoreMetrics;
-import org.sonar.core.measure.db.MeasureDto;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.measure.MeasureDto;
+import org.sonar.db.DbSession;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepository;
 import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor;

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java

@@ -26,9 +26,9 @@ import javax.annotation.Nullable;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.utils.System2;
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.core.measure.db.MeasureDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.measure.MeasureDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepository;

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java

@@ -31,9 +31,9 @@ import javax.annotation.Nullable;
 import org.sonar.api.i18n.I18n;
 import org.sonar.batch.protocol.Constants;
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.core.component.ComponentLinkDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.component.ComponentLinkDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor;

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java

@@ -24,8 +24,8 @@ import javax.annotation.Nullable;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.Scopes;
 import org.sonar.api.utils.System2;
-import org.sonar.core.component.SnapshotDto;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.component.SnapshotDto;
+import org.sonar.db.DbSession;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepository;

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java

@@ -40,10 +40,10 @@ import org.sonar.api.utils.internal.Uuids;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
-import org.sonar.core.source.db.FileSourceDto;
-import org.sonar.core.source.db.FileSourceDto.Type;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
+import org.sonar.db.source.FileSourceDto;
+import org.sonar.db.source.FileSourceDto.Type;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor;
@@ -102,7 +102,7 @@ public class PersistTestsStep implements ComputationStep {
       this.existingFileSourcesByUuid = new HashMap<>();
       this.projectUuid = treeRootHolder.getRoot().getUuid();
       this.projectKey = treeRootHolder.getRoot().getKey();
-      session.select("org.sonar.core.source.db.FileSourceMapper.selectHashesForProject",
+      session.select("org.sonar.db.source.FileSourceMapper.selectHashesForProject",
         ImmutableMap.of("projectUuid", treeRootHolder.getRoot().getUuid(), "dataType", Type.TEST),
         new ResultHandler() {
           @Override

server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java

@@ -21,9 +21,9 @@
 package org.sonar.server.computation.step;
 
 import org.sonar.core.computation.dbcleaner.ProjectCleaner;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
-import org.sonar.core.purge.IdUuidPair;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
+import org.sonar.db.purge.IdUuidPair;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepository;
 import org.sonar.server.computation.component.ProjectSettingsRepository;

server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java

@@ -29,7 +29,7 @@ import org.apache.commons.lang.time.DateUtils;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.resources.Language;
 import org.sonar.api.utils.KeyValueFormat;
-import org.sonar.core.UtcDateUtils;
+import org.sonar.core.util.UtcDateUtils;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor;
 import org.sonar.server.computation.component.TreeRootHolder;

server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java

@@ -21,9 +21,9 @@
 package org.sonar.server.computation.step;
 
 import java.util.List;
-import org.sonar.core.component.SnapshotDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.component.SnapshotDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 import org.sonar.server.component.db.SnapshotDao;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepository;

server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java

@@ -34,10 +34,10 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.config.Settings;
 import org.sonar.api.utils.MessageException;
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.core.component.ComponentDto;
+import org.sonar.db.component.ComponentDto;
 import org.sonar.core.component.ComponentKeys;
-import org.sonar.core.component.SnapshotDto;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.component.SnapshotDto;
+import org.sonar.db.DbSession;
 import org.sonar.server.component.db.ComponentDao;
 import org.sonar.server.computation.batch.BatchReportReader;
 import org.sonar.server.computation.component.Component;

server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java

@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.RequestHandler;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
-import org.sonar.core.computation.db.AnalysisReportDto;
+import org.sonar.db.compute.AnalysisReportDto;
 import org.sonar.server.computation.ReportQueue;
 
 import java.util.List;

server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueAction.java

@@ -24,7 +24,7 @@ import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.core.computation.db.AnalysisReportDto;
+import org.sonar.db.compute.AnalysisReportDto;
 import org.sonar.server.computation.ReportQueue;
 
 import java.util.List;

server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java

@@ -21,12 +21,12 @@ package org.sonar.server.dashboard.db;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.sonar.core.dashboard.DashboardDto;
-import org.sonar.core.dashboard.DashboardMapper;
-import org.sonar.core.persistence.DaoComponent;
-import org.sonar.core.persistence.DbSession;
+import org.sonar.db.dashboard.DashboardDto;
+import org.sonar.db.dashboard.DashboardMapper;
+import org.sonar.db.Dao;
+import org.sonar.db.DbSession;
 
-public class DashboardDao implements DaoComponent {
+public class DashboardDao implements Dao {
 
   @CheckForNull
   public DashboardDto getNullableByKey(DbSession session, Long key) {

server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java

@@ -20,13 +20,13 @@
 package org.sonar.server.dashboard.db;
 
 import java.util.Collection;
-import org.sonar.core.dashboard.WidgetDto;
-import org.sonar.core.dashboard.WidgetMapper;
-import org.sonar.core.persistence.DaoComponent;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.dashboard.WidgetDto;
+import org.sonar.db.dashboard.WidgetMapper;
+import org.sonar.db.Dao;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 
-public class WidgetDao implements DaoComponent {
+public class WidgetDao implements Dao {
 
   private MyBatis myBatis;
 

server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java

@@ -23,14 +23,14 @@ import com.google.common.base.Function;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import org.sonar.core.dashboard.WidgetPropertyDto;
-import org.sonar.core.dashboard.WidgetPropertyMapper;
-import org.sonar.core.persistence.DaoComponent;
-import org.sonar.core.persistence.DaoUtils;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
+import org.sonar.db.dashboard.WidgetPropertyDto;
+import org.sonar.db.dashboard.WidgetPropertyMapper;
+import org.sonar.db.Dao;
+import org.sonar.db.DaoUtils;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
 
-public class WidgetPropertyDao implements DaoComponent {
+public class WidgetPropertyDao implements Dao {
 
   private final MyBatis myBatis;
 

server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java

@@ -22,8 +22,8 @@ package org.sonar.server.dashboard.template;
 import org.sonar.api.web.Dashboard;
 import org.sonar.api.web.DashboardLayout;
 import org.sonar.api.web.DashboardTemplate;
-import org.sonar.core.measure.db.MeasureFilterDao;
-import org.sonar.core.measure.db.MeasureFilterDto;
+import org.sonar.db.measure.MeasureFilterDao;
+import org.sonar.db.measure.MeasureFilterDto;
 import org.sonar.server.dashboard.widget.MeasureFilterAsTreemapWidget;
 import org.sonar.server.dashboard.widget.MeasureFilterListWidget;
 import org.sonar.server.dashboard.widget.WelcomeWidget;

server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectIssuesDashboard.java

@@ -23,8 +23,8 @@ import com.google.common.base.Preconditions;
 import org.sonar.api.web.Dashboard;
 import org.sonar.api.web.DashboardLayout;
 import org.sonar.api.web.DashboardTemplate;
-import org.sonar.core.issue.db.IssueFilterDao;
-import org.sonar.core.issue.db.IssueFilterDto;
+import org.sonar.db.issue.IssueFilterDao;
+import org.sonar.db.issue.IssueFilterDto;
 import org.sonar.server.dashboard.widget.ProjectIssueFilterWidget;
 
 /**

server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java

@@ -25,11 +25,11 @@ import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.core.dashboard.DashboardDto;
-import org.sonar.core.dashboard.WidgetDto;
-import org.sonar.core.dashboard.WidgetPropertyDto;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.user.UserDto;
+import org.sonar.db.dashboard.DashboardDto;
+import org.sonar.db.dashboard.WidgetDto;
+import org.sonar.db.dashboard.WidgetPropertyDto;
+import org.sonar.db.DbSession;
+import org.sonar.db.user.UserDto;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.user.UserSession;

server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java

@@ -23,13 +23,22 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
 import org.apache.ibatis.session.ResultContext;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.core.persistence.DaoComponent;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.Dto;
+import org.sonar.db.Dao;
+import org.sonar.db.DbSession;
+import org.sonar.db.Dto;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.search.DbSynchronizationHandler;
 import org.sonar.server.search.IndexDefinition;
@@ -40,17 +49,6 @@ import org.sonar.server.search.action.RefreshIndex;
 import org.sonar.server.search.action.UpsertDto;
 import org.sonar.server.search.action.UpsertNestedItem;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Maps.newHashMap;
 
@@ -122,7 +120,7 @@ import static com.google.common.collect.Maps.newHashMap;
  * @param <DTO> Produced DTO class from this dao
  * @param <KEY> DTO Key class
  */
-public abstract class BaseDao<MAPPER, DTO extends Dto<KEY>, KEY extends Serializable> implements Dao<DTO, KEY>, DaoComponent {
+public abstract class BaseDao<MAPPER, DTO extends Dto<KEY>, KEY extends Serializable> implements DeprecatedDao<DTO,KEY>, Dao {
 
   private static final Logger LOGGER = Loggers.get(BaseDao.class);
 

server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java

@@ -26,9 +26,9 @@ import org.picocontainer.Startable;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.core.persistence.Database;
-import org.sonar.core.persistence.dialect.H2;
-import org.sonar.core.persistence.dialect.Oracle;
+import org.sonar.db.Database;
+import org.sonar.db.dialect.H2;
+import org.sonar.db.dialect.Oracle;
 
 import java.sql.Connection;
 import java.sql.SQLException;

server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java

@@ -26,25 +26,25 @@ import java.sql.SQLException;
 import java.util.IdentityHashMap;
 import java.util.Map;
 import org.sonar.api.server.ServerSide;
-import org.sonar.core.issue.db.ActionPlanDao;
-import org.sonar.core.issue.db.IssueChangeDao;
-import org.sonar.core.issue.db.IssueFilterDao;
-import org.sonar.core.permission.PermissionTemplateDao;
-import org.sonar.core.persistence.DaoComponent;
-import org.sonar.core.persistence.Database;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
-import org.sonar.core.properties.PropertiesDao;
-import org.sonar.core.purge.PurgeDao;
-import org.sonar.core.qualitygate.db.QualityGateConditionDao;
-import org.sonar.core.qualityprofile.db.QualityProfileDao;
-import org.sonar.core.resource.ResourceDao;
-import org.sonar.core.technicaldebt.db.CharacteristicDao;
-import org.sonar.core.template.LoadedTemplateDao;
-import org.sonar.core.user.AuthorDao;
-import org.sonar.core.user.AuthorizationDao;
-import org.sonar.core.user.GroupMembershipDao;
-import org.sonar.core.user.RoleDao;
+import org.sonar.db.issue.ActionPlanDao;
+import org.sonar.db.issue.IssueChangeDao;
+import org.sonar.db.issue.IssueFilterDao;
+import org.sonar.db.permission.PermissionTemplateDao;
+import org.sonar.db.Dao;
+import org.sonar.db.Database;
+import org.sonar.db.DbSession;
+import org.sonar.db.MyBatis;
+import org.sonar.db.property.PropertiesDao;
+import org.sonar.db.purge.PurgeDao;
+import org.sonar.db.qualitygate.QualityGateConditionDao;
+import org.sonar.db.qualityprofile.QualityProfileDao;
+import org.sonar.db.component.ResourceDao;
+import org.sonar.db.debt.CharacteristicDao;
+import org.sonar.db.loadedtemplate.LoadedTemplateDao;
+import org.sonar.db.user.AuthorDao;
+import org.sonar.db.user.AuthorizationDao;
+import org.sonar.db.user.GroupMembershipDao;
+import org.sonar.db.user.RoleDao;
 import org.sonar.server.activity.db.ActivityDao;
 import org.sonar.server.component.db.ComponentDao;
 import org.sonar.server.component.db.ComponentIndexDao;
@@ -110,13 +110,13 @@ public class DbClient {
   private final CustomMeasureDao customMeasureDao;
   private final QualityGateConditionDao gateConditionDao;
 
-  public DbClient(Database db, MyBatis myBatis, DaoComponent... daoComponents) {
+  public DbClient(Database db, MyBatis myBatis, Dao... daos) {
     this.db = db;
     this.myBatis = myBatis;
 
-    Map<Class, DaoComponent> map = new IdentityHashMap<>();
-    for (DaoComponent daoComponent : daoComponents) {
-      map.put(daoComponent.getClass(), daoComponent);
+    Map<Class, Dao> map = new IdentityHashMap<>();
+    for (Dao dao : daos) {
+      map.put(dao.getClass(), dao);
     }
     ruleDao = getDao(map, RuleDao.class);
     activeRuleDao = getDao(map, ActiveRuleDao.class);
@@ -303,7 +303,7 @@ public class DbClient {
     return gateConditionDao;
   }
 
-  private <K> K getDao(Map<Class, DaoComponent> map, Class<K> clazz) {
+  private <K> K getDao(Map<Class, Dao> map, Class<K> clazz) {
     return (K) map.get(clazz);
   }
 

server/sonar-server/src/main/java/org/sonar/server/db/Dao.java → server/sonar-server/src/main/java/org/sonar/server/db/DeprecatedDao.java

@@ -19,20 +19,16 @@
  */
 package org.sonar.server.db;
 
-import org.sonar.api.server.ServerSide;
-import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.Dto;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Map;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
+import org.sonar.db.DbSession;
+import org.sonar.db.Dto;
 
-@ServerSide
-public interface Dao<DTO extends Dto<KEY>, KEY extends Serializable> {
+public interface DeprecatedDao<DTO extends Dto<KEY>, KEY extends Serializable> {
 
   /**
    * Get a DTO by its key. Return <code>null</code> if the key does not exist.

server/sonar-server/src/main/java/org/sonar/server/db/migrations/AddColumnsBuilder.java

@@ -26,10 +26,10 @@ import java.util.List;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
-import org.sonar.core.persistence.dialect.Dialect;
-import org.sonar.core.persistence.dialect.MsSql;
-import org.sonar.core.persistence.dialect.Oracle;
-import org.sonar.core.persistence.dialect.PostgreSql;
+import org.sonar.db.dialect.Dialect;
+import org.sonar.db.dialect.MsSql;
+import org.sonar.db.dialect.Oracle;
+import org.sonar.db.dialect.PostgreSql;
 
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Preconditions;

server/sonar-server/src/main/java/org/sonar/server/db/migrations/BaseDataChange.java

@@ -23,7 +23,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 
 import org.apache.commons.dbutils.DbUtils;
-import org.sonar.core.persistence.Database;
+import org.sonar.db.Database;
 
 public abstract class BaseDataChange implements DataChange, MigrationStep {
 

server/sonar-server/src/main/java/org/sonar/server/db/migrations/DataChange.java

@@ -22,7 +22,7 @@ package org.sonar.server.db.migrations;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.sonar.core.persistence.Database;
+import org.sonar.db.Database;
 
 public interface DataChange {
 

server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java

@@ -26,7 +26,7 @@ import org.picocontainer.Startable;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.platform.ServerUpgradeStatus;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.core.persistence.DdlUtils;
+import org.sonar.db.DdlUtils;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.plugins.ServerPluginRepository;
 

server/sonar-server/src/main/java/org/sonar/server/db/migrations/DdlChange.java

@@ -23,7 +23,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 
 import org.apache.commons.dbutils.DbUtils;
-import org.sonar.core.persistence.Database;
+import org.sonar.db.Database;
 
 public abstract class DdlChange implements MigrationStep {
 

server/sonar-server/src/main/java/org/sonar/server/db/migrations/DropColumnsBuilder.java

@@ -19,11 +19,11 @@
  */
 package org.sonar.server.db.migrations;
 
-import org.sonar.core.persistence.dialect.Dialect;
-import org.sonar.core.persistence.dialect.MsSql;
-import org.sonar.core.persistence.dialect.MySql;
-import org.sonar.core.persistence.dialect.Oracle;
-import org.sonar.core.persistence.dialect.PostgreSql;
+import org.sonar.db.dialect.Dialect;
+import org.sonar.db.dialect.MsSql;
+import org.sonar.db.dialect.MySql;
+import org.sonar.db.dialect.Oracle;
+import org.sonar.db.dialect.PostgreSql;
 
 public class DropColumnsBuilder {
 

server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java

@@ -22,7 +22,7 @@ package org.sonar.server.db.migrations;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.concurrent.atomic.AtomicLong;
-import org.sonar.core.persistence.Database;
+import org.sonar.db.Database;
 import org.sonar.server.util.ProgressLogger;
 
 public class MassUpdate {

server/sonar-server/src/main/java/org/sonar/server/db/migrations/MigrationStepModule.java

@@ -19,7 +19,7 @@
  */
 package org.sonar.server.db.migrations;
 
-import org.sonar.core.component.Module;
+import org.sonar.core.platform.Module;
 import org.sonar.server.db.migrations.v36.ViolationMigrationStep;
 import org.sonar.server.db.migrations.v42.CompleteIssueMessageMigrationStep;
 import org.sonar.server.db.migrations.v42.PackageKeysMigrationStep;

server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java

@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.dbutils.DbUtils;
-import org.sonar.core.persistence.Database;
+import org.sonar.db.Database;
 
 class SelectImpl extends BaseSqlStatement<Select> implements Select {
 

server/sonar-server/src/main/java/org/sonar/server/db/migrations/UpsertImpl.java

@@ -23,7 +23,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.sonar.core.persistence.BatchSession;
+import org.sonar.db.BatchSession;
 
 public class UpsertImpl extends BaseSqlStatement<Upsert> implements Upsert {
 

server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Referentials.java

@@ -33,7 +33,7 @@ import javax.annotation.Nullable;
 import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.ResultSetHandler;
-import org.sonar.core.persistence.Database;
+import org.sonar.db.Database;
 
 import com.google.common.collect.Maps;
 

server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverter.java

@@ -32,7 +32,7 @@ import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.handlers.AbstractListHandler;
 import org.sonar.api.rule.Severity;
 import org.sonar.api.utils.internal.Uuids;
-import org.sonar.core.persistence.Database;
+import org.sonar.db.Database;
 import org.sonar.server.db.migrations.SqlUtil;
 
 import com.google.common.base.Objects;

server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverters.java

@@ -28,7 +28,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 import org.sonar.api.config.Settings;
-import org.sonar.core.persistence.Database;
+import org.sonar.db.Database;
 
 import com.google.common.collect.Lists;
 

server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationMigrationStep.java

@@ -25,7 +25,7 @@ import org.sonar.api.config.Settings;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.core.persistence.Database;
+import org.sonar.db.Database;
 import org.sonar.server.db.migrations.MigrationStep;
 import org.sonar.server.db.migrations.SqlUtil;
 

server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationStep.java

@@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v42;
 
 import java.sql.SQLException;
 
-import org.sonar.core.persistence.Database;
+import org.sonar.db.Database;
 import org.sonar.server.db.migrations.BaseDataChange;
 import org.sonar.server.db.migrations.MassUpdate;
 import org.sonar.server.db.migrations.Select;

server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationStep.java

@@ -25,7 +25,7 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
 import org.apache.commons.lang.StringUtils;
-import org.sonar.core.persistence.Database;
+import org.sonar.db.Database;
 import org.sonar.server.db.migrations.BaseDataChange;
 import org.sonar.server.db.migrations.MassUpdate;
 import org.sonar.server.db.migrations.Select;

server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStep.java

@@ -24,8 +24,8 @@ import java.sql.SQLException;
 import java.util.Date;
 
 import org.sonar.api.utils.System2;
-import org.sonar.core.persistence.Database;
-import org.sonar.core.properties.PropertiesDao;
+import org.sonar.db.Database;
+import org.sonar.db.property.PropertiesDao;
 import org.sonar.server.db.migrations.BaseDataChange;
 import org.sonar.server.db.migrations.MassUpdate;
 import org.sonar.server.db.migrations.Select;

server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStep.java

@@ -20,8 +20,8 @@
 
 package org.sonar.server.db.migrations.v43;
 
-import org.sonar.core.persistence.Database;
-import org.sonar.core.properties.PropertiesDao;
+import org.sonar.db.Database;
+import org.sonar.db.property.PropertiesDao;
 import org.sonar.server.db.migrations.BaseDataChange;
 import org.sonar.server.db.migrations.MassUpdate;
 import org.sonar.server.db.migrations.Select;

server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStep.java

@@ -29,8 +29,8 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
 import org.sonar.api.utils.System2;
-import org.sonar.core.persistence.Database;
-import org.sonar.core.properties.PropertiesDao;
+import org.sonar.db.Database;
+import org.sonar.db.property.PropertiesDao;
 import org.sonar.server.db.migrations.BaseDataChange;
 import org.sonar.server.db.migrations.MassUpdate;
 import org.sonar.server.db.migrations.Select;