diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-07-04 00:34:24 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-07-04 17:00:08 +0200 |
| commit | 1df148803610cd54f182b8636f01c0e6ece92b19 (patch) | |
| tree | 8b6d2919ebe3575556b8796fd95a2b89996933ff | |
| parent | 1018747567d50056a49aa7c8421d596f18f25344 (diff) | |
| download | sonarqube-1df148803610cd54f182b8636f01c0e6ece92b19.tar.gz sonarqube-1df148803610cd54f182b8636f01c0e6ece92b19.zip | |
Extract module sonar-db
1639 files changed, 7442 insertions, 8356 deletions
diff --git a/microbenchmark-template/pom.xml b/microbenchmark-template/pom.xml index 261b3d4a58d..3a23a5b48a4 100644 --- a/microbenchmark-template/pom.xml +++ b/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> @@ -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> @@ -608,6 +609,11 @@ </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> <version>${project.version}</version> </dependency> diff --git a/server/sonar-server-benchmarks/pom.xml b/server/sonar-server-benchmarks/pom.xml index a12a517dcf8..2a93d45402c 100644 --- a/server/sonar-server-benchmarks/pom.xml +++ b/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> diff --git a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java index e0f65824a4a..d520fba19e0 100644 --- a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java +++ b/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; diff --git a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java index e6e8885e010..1bef6b936d8 100644 --- a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java +++ b/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; diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml index 880cded9f14..b672cb37739 100644 --- a/server/sonar-server/pom.xml +++ b/server/sonar-server/pom.xml @@ -74,6 +74,10 @@ </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> + <artifactId>sonar-db</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-batch-protocol</artifactId> </dependency> <dependency> @@ -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> diff --git a/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/IndexPurgeListener.java b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/IndexPurgeListener.java index 959e55c0b72..31752ec2d05 100644 --- a/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/IndexPurgeListener.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java index 06045818a17..b8dc2920284 100644 --- a/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java b/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java index 950a6e16140..0aa9be22946 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/activity/ActivityService.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java b/server/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java index 35c7548df61..c2043ce16ba 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/activity/db/ActivityDao.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndexer.java index 81f9d3b85bc..d2b791292ec 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityIndexer.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java index ebc0445137c..8357272f318 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java index c87da9be3a7..4b6915e7e7d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java index 9290df18a26..05e9f0482a7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java index 96df12e00e1..933414d025b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java index 5fae0d7fadd..b318762647f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java b/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java index b381c7f8e9f..6e51c44b994 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java b/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java index 210c7eb9d3f..31a9266c07f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/DefaultRubyComponentService.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java index 1bcabb07020..85d7feccbc1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java +++ b/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); diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentIndexDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentIndexDao.java index f091ee7775a..0ec4e5f9703 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentIndexDao.java +++ b/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 + ".%"); diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentLinkDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentLinkDao.java index d4039410d35..18662e8d9c2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentLinkDao.java +++ b/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); diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/SnapshotDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/SnapshotDao.java index 0b3247128e7..4be141c5a03 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/db/SnapshotDao.java +++ b/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) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java index 95d920b3a04..c038041f521 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentJsonWriter.java index 04ca8b22699..01bf01a4e0e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentJsonWriter.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java index 3b398223e33..9610ad35a30 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java index 174e8886312..9daf008e58f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ReportQueue.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ReportQueue.java index ceb6f615457..cb08dcf7b24 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ReportQueue.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/activity/ActivityManager.java b/server/sonar-server/src/main/java/org/sonar/server/computation/activity/ActivityManager.java index d3aa9de201e..3b73ce07bab 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/activity/ActivityManager.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java index 00b8cab25a9..bf03be56377 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java b/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java index 115364cb4f4..6bb723732c6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/BaseIssuesLoader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/BaseIssuesLoader.java index 8ebfb64479e..3aea9995878 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/BaseIssuesLoader.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtAggregator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtAggregator.java index c1d48f631b7..6f0fef0c988 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtAggregator.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtCalculator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtCalculator.java index ed7502e7b22..d67bc99e04e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/NewDebtCalculator.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleCacheLoader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleCacheLoader.java index f655769e55d..2bdf37e462b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleCacheLoader.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleImpl.java index 07548d5148f..a0f230ad7db 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/RuleImpl.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerBaseInputFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerBaseInputFactory.java index cf7da885f81..d9b7438b240 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/TrackerBaseInputFactory.java +++ b/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; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/UpdateConflictResolver.java index ccc84139154..15e71c8c01d 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java index 5e031e7961c..b09d14430b4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureKey.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureKey.java index 2d2e32bc0f5..cba31316bfa 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureKey.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepository.java index f20322aea01..d9c3b32a15e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepository.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java index 23ef25f129b..6bc789371e6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureRepositoryImpl.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureToMeasureDto.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureToMeasureDto.java index c758805e7da..f3b17a86c73 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureToMeasureDto.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java index 35014bb71ce..7861952c45a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java +++ b/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 diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java index 44a24fe208f..cfce85a4047 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricDtoToMetric.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java index f7cc13e88e8..a4dea6f9afb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateServiceImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateServiceImpl.java index 98e8cf3d6cb..eb98f4ec04f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualitygate/QualityGateServiceImpl.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QPMeasureData.java b/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QPMeasureData.java index 791e6f67272..2d01421fb5c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/qualityprofile/QPMeasureData.java +++ b/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 diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java index 0b30dbf19e5..8e69c81b619 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java index f9a1f02201a..1a530decd6d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedDebtModelStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedDebtModelStep.java index 80e7899eb5e..602e45a1ae8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedDebtModelStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedPeriodsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedPeriodsStep.java index 34a8016022a..545cae5faaf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedPeriodsStep.java +++ b/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} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillComponentsStep.java index ed7bec5ff52..5a94f7317ec 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillComponentsStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStep.java index c41d928ac5d..8b9773b90b5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java index 53285259121..90998d7a063 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java index ae9f889698e..995e37b6fb3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java index 7e069c2dc5f..67e2a0b39e7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java index 21192713691..ce318a5866b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java index 8ab4833ba68..922f19a2a18 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java +++ b/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) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java index 6ffda565d47..ff2688091b7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java index 5478f00a889..3fa2b54ec1b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java index da5a180b7fa..113de32a2a2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java index 64d5eff98b6..c97fcf6a275 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java index 20b3dc193a9..97d18113767 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java index 1dc5187e90c..436e5ac8e38 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java +++ b/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 diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java index 9dddd4cf078..e8cf0019ce5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java index 18447724fab..20982691441 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java index c575dc7a346..659577bb868 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java index ba0fe77f159..0185e35631a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java index ab580c50a98..fb247eac52d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueAction.java index caab5d33bc8..1ea1a4845d6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueAction.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java index 127aeac10ce..760d27657e2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java +++ b/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) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java index 5bc77ce1fe3..b44bb15dd75 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetDao.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java index 9ac498ebc24..5aad93e8aad 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/WidgetPropertyDao.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java index 708b45e6f2c..cd167f79481 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/GlobalDefaultDashboard.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectIssuesDashboard.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectIssuesDashboard.java index 405098f7f72..7474844bb75 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/template/ProjectIssuesDashboard.java +++ b/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; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java index 49ed5a37786..fa9f711e580 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java b/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java index 83b46ae6209..df21adcba65 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java +++ b/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); diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java b/server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java index 209f9f48423..61659ffe74c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java b/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java index 481ca005b96..9ff76871231 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java +++ b/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); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/Dao.java b/server/sonar-server/src/main/java/org/sonar/server/db/DeprecatedDao.java index ceeb48d882b..1a7aeca22ca 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/Dao.java +++ b/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. diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/AddColumnsBuilder.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/AddColumnsBuilder.java index 4010c94067e..6a2127247e1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/AddColumnsBuilder.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/BaseDataChange.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/BaseDataChange.java index 75012719c1e..1988ea4d3dc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/BaseDataChange.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DataChange.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DataChange.java index e87582df33d..fa017afcd6d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DataChange.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java index 7828afce580..f033cc4d55c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrator.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DdlChange.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DdlChange.java index 00320c1a3fe..626b9f6e369 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DdlChange.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DropColumnsBuilder.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DropColumnsBuilder.java index a0a2ee1d2c6..e0274003311 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/DropColumnsBuilder.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java index f437ea5aff5..39793966f9e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MassUpdate.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MigrationStepModule.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MigrationStepModule.java index 48a733082d5..52cb95becf5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/MigrationStepModule.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java index 62ad570ded6..c03ba33c3f3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/UpsertImpl.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/UpsertImpl.java index 456e6d42a0d..2f9a097c152 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/UpsertImpl.java +++ b/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 { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Referentials.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Referentials.java index 1bd842ed732..ecb7928b852 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/Referentials.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverter.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverter.java index 6a973bcb979..92416181edb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverter.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverters.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverters.java index 8b127f323eb..3ba084f7785 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationConverters.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationMigrationStep.java index 2e51fa07006..1c6ee020642 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v36/ViolationMigrationStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationStep.java index 71b4edca569..0f5cca7b561 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationStep.java index cf9c4715a7f..32af9c4becf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStep.java index 182240ed855..34404ed8a14 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStep.java index 6b2142ddc79..6c3b65559f5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStep.java index edeab04db62..b618ffed0e2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStep.java +++ b/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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStep.java index d8e0271564c..c7bf7d85150 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStep.java @@ -25,7 +25,7 @@ import java.util.Date; import org.sonar.api.issue.Issue; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStep.java index 5474d9785f2..3ca45b425de 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStep.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations.v43; 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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStep.java index b892e4667d0..1ca04d2898c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStep.java @@ -27,8 +27,8 @@ import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/WorkDurationConvertor.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/WorkDurationConvertor.java index fd127cf2170..692d4449e86 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/WorkDurationConvertor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/WorkDurationConvertor.java @@ -20,8 +20,8 @@ package org.sonar.server.db.migrations.v43; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; class WorkDurationConvertor { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationStep.java index 9f52b1ef5f9..8193233b43d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationStep.java @@ -27,11 +27,11 @@ import org.apache.commons.lang.StringUtils; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.KeyValueFormat; import org.sonar.api.utils.internal.Uuids; -import org.sonar.core.activity.db.ActivityDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.migration.v44.ChangeLog; -import org.sonar.core.persistence.migration.v44.Migration44Mapper; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; +import org.sonar.db.activity.ActivityDto; +import org.sonar.db.DbSession; +import org.sonar.db.version.v44.ChangeLog; +import org.sonar.db.version.v44.Migration44Mapper; +import org.sonar.db.qualityprofile.ActiveRuleKey; import org.sonar.core.rule.SeverityUtil; import org.sonar.server.activity.Activity; import org.sonar.server.activity.db.ActivityDao; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationStep.java index 228c834a0c7..75a8f2ace7f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationStep.java @@ -25,11 +25,11 @@ import java.util.Date; import org.apache.commons.lang.ObjectUtils; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.UtcDateUtils; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.migration.v44.Migration44Mapper; -import org.sonar.core.persistence.migration.v44.ProfileMeasure; -import org.sonar.core.persistence.migration.v44.QProfileDto44; +import org.sonar.core.util.UtcDateUtils; +import org.sonar.db.DbSession; +import org.sonar.db.version.v44.Migration44Mapper; +import org.sonar.db.version.v44.ProfileMeasure; +import org.sonar.db.version.v44.QProfileDto44; import org.sonar.server.db.DbClient; import org.sonar.server.db.migrations.MigrationStep; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationStep.java index 7ca01fac3f8..fd379ea8dc6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationStep.java @@ -24,10 +24,10 @@ import java.util.Date; import org.apache.commons.lang.ObjectUtils; import org.sonar.api.utils.System2; -import org.sonar.core.UtcDateUtils; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.migration.v44.Migration44Mapper; -import org.sonar.core.persistence.migration.v44.QProfileDto44; +import org.sonar.core.util.UtcDateUtils; +import org.sonar.db.DbSession; +import org.sonar.db.version.v44.Migration44Mapper; +import org.sonar.db.version.v44.QProfileDto44; import org.sonar.server.db.DbClient; import org.sonar.server.db.migrations.MigrationStep; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationStep.java index 7e981341588..b9dc3245c7f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationStep.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v44; import java.sql.SQLException; import org.apache.commons.lang.RandomStringUtils; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationStep.java index 408301595e5..fb712740740 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationStep.java @@ -24,7 +24,7 @@ import java.sql.SQLException; import java.util.Date; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationStep.java index b48870d4eb5..736152f2e05 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationStep.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations.v44; 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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationStep.java index 020382d0c21..eb383f38286 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationStep.java @@ -26,7 +26,7 @@ import java.util.List; import javax.annotation.Nullable; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; import org.sonar.server.db.migrations.BaseDataChange; import org.sonar.server.db.migrations.Select; import org.sonar.server.db.migrations.Upsert; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationStep.java index 22b51826422..d32d51cee62 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationStep.java @@ -20,8 +20,8 @@ package org.sonar.server.db.migrations.v45; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.migration.v44.Migration44Mapper; +import org.sonar.db.DbSession; +import org.sonar.db.version.v44.Migration44Mapper; import org.sonar.server.db.DbClient; import org.sonar.server.db.migrations.MigrationStep; import org.sonar.server.db.migrations.v44.ConvertProfileMeasuresMigrationStep; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationStep.java index 1f46fadf422..046a8d8d761 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationStep.java @@ -30,10 +30,10 @@ import java.util.List; import java.util.concurrent.atomic.AtomicLong; import javax.annotation.Nullable; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.migration.v45.Migration45Mapper; -import org.sonar.core.persistence.migration.v45.Rule; -import org.sonar.core.persistence.migration.v45.RuleParameter; +import org.sonar.db.DbSession; +import org.sonar.db.version.v45.Migration45Mapper; +import org.sonar.db.version.v45.Rule; +import org.sonar.db.version.v45.RuleParameter; import org.sonar.server.db.DbClient; import org.sonar.server.db.migrations.MigrationStep; import org.sonar.server.util.ProgressLogger; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivities.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivities.java index ead377abd52..f352ba58ab4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivities.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivities.java @@ -24,7 +24,7 @@ import java.sql.SQLException; 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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedFileSources.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedFileSources.java index d37850b3394..9f2130401a1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedFileSources.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedFileSources.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v50; import org.apache.commons.lang.StringUtils; import org.sonar.api.utils.System2; -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.Row; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedIssueLongDates.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedIssueLongDates.java index 7bbfde25d5c..6e9f40b027c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedIssueLongDates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedIssueLongDates.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.util.Date; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedSnapshotSourcesUpdatedAt.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedSnapshotSourcesUpdatedAt.java index f0a6e89393f..0909244e399 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedSnapshotSourcesUpdatedAt.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FeedSnapshotSourcesUpdatedAt.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations.v50; 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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationStep.java index 828778ae1fe..86ee9322c65 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationStep.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations.v50; import java.sql.SQLException; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationStep.java index 6cd5337d7db..441f370a544 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationStep.java @@ -28,9 +28,9 @@ import org.sonar.api.resources.Scopes; import org.sonar.api.utils.internal.Uuids; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.migration.v50.Component; -import org.sonar.core.persistence.migration.v50.Migration50Mapper; +import org.sonar.db.DbSession; +import org.sonar.db.version.v50.Component; +import org.sonar.db.version.v50.Migration50Mapper; import org.sonar.server.db.DbClient; import org.sonar.server.db.migrations.MigrationStep; import org.sonar.server.util.ProgressLogger; @@ -66,7 +66,7 @@ public class PopulateProjectsUuidColumnsMigrationStep implements MigrationStep { final DbSession readSession = db.openSession(false); final DbSession writeSession = db.openSession(true); try { - readSession.select("org.sonar.core.persistence.migration.v50.Migration50Mapper.selectRootProjects", new ResultHandler() { + readSession.select("org.sonar.db.version.v50.Migration50Mapper.selectRootProjects", new ResultHandler() { @Override public void handleResult(ResultContext context) { Component project = (Component) context.getResultObject(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationStep.java index 874d1cca2e8..3e266bdbb9d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationStep.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.commons.lang.StringUtils; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuid.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuid.java index 849447578a6..0a1e2003d7b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuid.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuid.java @@ -28,7 +28,7 @@ import java.util.Date; import javax.annotation.Nullable; import org.apache.commons.dbutils.DbUtils; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddIssuesColumns.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddIssuesColumns.java index 083c0d0f756..82f77053738 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddIssuesColumns.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddIssuesColumns.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations.v51; import java.sql.SQLException; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; import org.sonar.server.db.migrations.AddColumnsBuilder; import org.sonar.server.db.migrations.DdlChange; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddNewCharacteristics.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddNewCharacteristics.java index 73e34ff61d5..2bd5e53439b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddNewCharacteristics.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddNewCharacteristics.java @@ -30,7 +30,7 @@ import org.sonar.api.utils.MessageException; 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.Database; +import org.sonar.db.Database; import org.sonar.server.db.migrations.BaseDataChange; import org.sonar.server.db.migrations.Select; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsers.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsers.java index 93bafa407ec..f5679a9eef3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsers.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsers.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicLong; import javax.annotation.CheckForNull; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; import org.sonar.server.db.migrations.BaseDataChange; import org.sonar.server.db.migrations.Select; import org.sonar.server.db.migrations.Upsert; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/DropIssuesColumns.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/DropIssuesColumns.java index 08296e63c5d..929dac7e746 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/DropIssuesColumns.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/DropIssuesColumns.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations.v51; import java.sql.SQLException; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; import org.sonar.server.db.migrations.DdlChange; import org.sonar.server.db.migrations.DropColumnsBuilder; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDates.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDates.java index 5bebc272448..394093affe9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDates.java @@ -24,7 +24,7 @@ import java.sql.SQLException; import java.util.Date; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedEventsLongDates.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedEventsLongDates.java index afb9e237fa0..453483828ce 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedEventsLongDates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedEventsLongDates.java @@ -24,7 +24,7 @@ import java.sql.SQLException; import java.util.Date; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryData.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryData.java index 88b1b255f53..38fc957f6d8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryData.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryData.java @@ -31,8 +31,8 @@ import org.apache.commons.csv.CSVRecord; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.sonar.api.utils.DateUtils; -import org.sonar.core.persistence.Database; -import org.sonar.core.source.db.FileSourceDto; +import org.sonar.db.Database; +import org.sonar.db.source.FileSourceDto; import org.sonar.server.db.migrations.BaseDataChange; import org.sonar.server.db.migrations.MassUpdate; import org.sonar.server.db.migrations.Select; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDates.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDates.java index dda923f6246..cace6b275f4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDates.java @@ -24,7 +24,7 @@ import java.sql.SQLException; import java.util.Date; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuids.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuids.java index cdb99e8091a..ea8a16d65f2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuids.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuids.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v51; 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.MassUpdate.Handler; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueTags.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueTags.java index fc5ec5e44db..9b688617792 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueTags.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssueTags.java @@ -24,7 +24,7 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; import org.sonar.api.utils.System2; -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.MassUpdate.Handler; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDates.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDates.java index 26721ee78a5..c106d3fbd9a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDates.java @@ -24,7 +24,7 @@ import java.sql.SQLException; import java.util.Date; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDates.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDates.java index 4cf0d75c6b7..0ea665bcb3c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDates.java @@ -24,7 +24,7 @@ import java.sql.SQLException; import java.util.Date; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDates.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDates.java index 85da73d60d3..3a3e5afebef 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDates.java @@ -24,7 +24,7 @@ import java.sql.SQLException; import java.util.Date; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDates.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDates.java index 71104ba2924..718a1398a1e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDates.java @@ -24,7 +24,7 @@ import java.sql.SQLException; import java.util.Date; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedUsersLongDates.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedUsersLongDates.java index 7b85f4d65f6..dc71ff5f92a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedUsersLongDates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/FeedUsersLongDates.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.util.Date; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationStep.java index 897aa361b0c..56f7507a191 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationStep.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v51; 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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFilters.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFilters.java index 3afe9701525..2327fead4fd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFilters.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFilters.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.commons.lang.StringUtils; import org.sonar.api.utils.System2; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPath.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPath.java index e00604c500f..e19491a9f10 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPath.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPath.java @@ -25,7 +25,7 @@ import java.sql.SQLException; 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.MassUpdate.Handler; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumn.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumn.java index df5b945a175..36f3e45609a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumn.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumn.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v52; import java.sql.SQLException; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; import org.sonar.server.db.migrations.AddColumnsBuilder; import org.sonar.server.db.migrations.DdlChange; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuid.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuid.java index 56307579e92..a8fa8071d5f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuid.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuid.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v52; 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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataType.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataType.java index 44ca514dd93..6b5d0ebdcfd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataType.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataType.java @@ -20,7 +20,7 @@ package org.sonar.server.db.migrations.v52; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; import org.sonar.server.db.migrations.BaseDataChange; import java.sql.SQLException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuid.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuid.java index 54ee5ed3bf8..6a7d73b99e8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuid.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuid.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v52; 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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleans.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleans.java index bb97aa65a94..3ee8edf05d9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleans.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleans.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v52; import java.sql.SQLException; -import org.sonar.core.persistence.Database; +import org.sonar.db.Database; import org.sonar.server.db.migrations.BaseDataChange; public class FeedMetricsBooleans extends BaseDataChange { diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuid.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuid.java index b8eadd61afd..880d7a9b0b8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuid.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuid.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v52; 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.Row; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociation.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociation.java index 53c38deacf1..ced52132436 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociation.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociation.java @@ -23,7 +23,7 @@ import java.sql.SQLException; 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.BaseDataChange; import org.sonar.server.db.migrations.MassUpdate; import org.sonar.server.db.migrations.MassUpdate.Handler; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/RemoveComponentLibraries.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/RemoveComponentLibraries.java index e56f068275f..ee18d266113 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/RemoveComponentLibraries.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/RemoveComponentLibraries.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v52; 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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibraries.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibraries.java index 22a8bdc2f57..5ed747ff313 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibraries.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibraries.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v52; 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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java index 9c50832ddf3..32c3a44580d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java +++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java @@ -41,10 +41,10 @@ import org.sonar.api.utils.ValidationMessages; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.debt.DebtModelXMLExporter.DebtModel; import org.sonar.server.debt.DebtModelXMLExporter.RuleDebt; diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelLookup.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelLookup.java index 1554fb0e550..410557f2ff1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelLookup.java +++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelLookup.java @@ -26,8 +26,8 @@ import java.util.List; import javax.annotation.CheckForNull; import org.sonar.api.server.ServerSide; import org.sonar.api.server.debt.DebtCharacteristic; -import org.sonar.core.technicaldebt.db.CharacteristicDao; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.debt.CharacteristicDao; +import org.sonar.db.debt.CharacteristicDto; import static com.google.common.collect.Lists.newArrayList; import static org.sonar.server.debt.DebtPredicates.ToDebtCharacteristic.INSTANCE; diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java index 16fc699137e..77513d7c15e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java +++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java @@ -31,10 +31,10 @@ import org.sonar.api.server.debt.DebtCharacteristic; import org.sonar.api.server.debt.internal.DefaultDebtCharacteristic; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.debt.DebtPredicates.CharacteristicDtoMatchKey; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtPredicates.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtPredicates.java index 268213f11e5..c6a14754299 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtPredicates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtPredicates.java @@ -25,7 +25,7 @@ import com.google.common.base.Predicate; import javax.annotation.Nonnull; import org.sonar.api.server.debt.DebtCharacteristic; import org.sonar.api.server.debt.internal.DefaultDebtCharacteristic; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.debt.CharacteristicDto; public class DebtPredicates { diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java index cd2c21efced..066e20f21ef 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java @@ -26,8 +26,8 @@ import java.util.Map; import javax.annotation.Nullable; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.text.JsonWriter; -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.component.db.ComponentDao; import static com.google.common.collect.Maps.newHashMap; diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java index 1adc45687bc..993aff0e692 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java @@ -26,8 +26,8 @@ import org.codehaus.staxmate.SMInputFactory; import org.codehaus.staxmate.in.SMHierarchicCursor; import org.codehaus.staxmate.in.SMInputCursor; import org.sonar.api.server.ServerSide; -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.component.db.ComponentDao; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java index 41f0d5a550a..87b696a98b4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/ShowAction.java @@ -29,10 +29,10 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; 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.db.component.ComponentDto; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/event/db/EventDao.java b/server/sonar-server/src/main/java/org/sonar/server/event/db/EventDao.java index e3987e83b95..ede3edb2483 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/event/db/EventDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/event/db/EventDao.java @@ -21,15 +21,15 @@ package org.sonar.server.event.db; import org.sonar.api.server.ServerSide; -import org.sonar.core.event.EventDto; -import org.sonar.core.event.db.EventMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.event.EventDto; +import org.sonar.db.event.EventMapper; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; import java.util.List; @ServerSide -public class EventDao implements DaoComponent { +public class EventDao implements Dao { public List<EventDto> selectByComponentUuid(DbSession session, String componentUuid) { return session.getMapper(EventMapper.class).selectByComponentUuid(componentUuid); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java index 99292a03da1..f7014d8cd0a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java @@ -39,10 +39,9 @@ import org.sonar.api.server.ServerSide; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; import org.sonar.core.issue.IssueUpdater; -import org.sonar.core.issue.db.IssueStorage; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.DbSession; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import org.sonar.server.db.DbClient; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java index 5eb8a153073..2833bec5d9e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java @@ -55,16 +55,16 @@ import org.sonar.api.user.User; import org.sonar.api.utils.SonarException; import org.sonar.api.utils.text.JsonWriter; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.issue.ActionPlanStats; import org.sonar.core.issue.DefaultActionPlan; -import org.sonar.core.issue.db.IssueFilterDto; +import org.sonar.db.issue.IssueFilterDto; import org.sonar.core.issue.workflow.Transition; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; -import org.sonar.core.resource.ResourceQuery; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; +import org.sonar.db.component.ResourceQuery; import org.sonar.server.component.ws.ComponentJsonWriter; import org.sonar.server.db.DbClient; import org.sonar.server.es.SearchOptions; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java index c540a36852e..767ac301b9e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java @@ -42,11 +42,10 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.Rule; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.issue.db.IssueStorage; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.issue.IssueDto; +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.exceptions.BadRequestException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java index 2009dfb10b8..1a482ea61d2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangelogService.java @@ -26,7 +26,7 @@ import org.sonar.api.issue.Issue; import org.sonar.core.issue.FieldDiffs; import org.sonar.api.user.User; import org.sonar.api.user.UserFinder; -import org.sonar.core.issue.db.IssueChangeDao; +import org.sonar.db.issue.IssueChangeDao; import org.sonar.server.user.UserSession; import static com.google.common.collect.Lists.newArrayList; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java index 8b1da808880..faccdb814ed 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java @@ -29,8 +29,8 @@ import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.IssueChangeContext; import org.sonar.api.utils.System2; import org.sonar.core.issue.IssueUpdater; -import org.sonar.core.issue.db.IssueChangeDto; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.issue.IssueChangeDto; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java index 15c65e354cd..dfdfaa020c1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java @@ -48,8 +48,8 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; -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.core.rule.RuleKeyFunctions; import org.sonar.server.component.ComponentService; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java index 35e97cf20da..b67192d4e84 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java @@ -35,14 +35,13 @@ import org.sonar.api.server.ServerSide; import org.sonar.api.user.User; import org.sonar.api.user.UserFinder; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.issue.DefaultIssueBuilder; import org.sonar.core.issue.IssueUpdater; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.issue.db.IssueStorage; +import org.sonar.db.issue.IssueDto; import org.sonar.core.issue.workflow.IssueWorkflow; import org.sonar.core.issue.workflow.Transition; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.es.SearchOptions; import org.sonar.server.es.SearchResult; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueStorage.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueStorage.java index fb443d7cc9e..b80bedf8f35 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueStorage.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueStorage.java @@ -17,20 +17,21 @@ * 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.issue; +import java.util.List; import org.sonar.api.issue.Issue; import org.sonar.api.issue.IssueComment; +import org.sonar.api.rules.Rule; +import org.sonar.api.rules.RuleFinder; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.FieldDiffs; -import org.sonar.api.rules.Rule; -import org.sonar.api.rules.RuleFinder; -import org.sonar.core.persistence.BatchSession; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; - -import java.util.List; +import org.sonar.db.BatchSession; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.issue.IssueChangeDto; +import org.sonar.db.issue.IssueChangeMapper; import static com.google.common.collect.Lists.newArrayList; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java index 5b4bede711c..ab8044ff92f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java @@ -26,7 +26,7 @@ import java.util.Date; import java.util.List; import javax.annotation.Nonnull; import org.sonar.api.rule.Severity; -import org.sonar.core.issue.db.IssueDto; +import org.sonar.db.issue.IssueDto; /** * @since 3.6 diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/RulesAggregation.java b/server/sonar-server/src/main/java/org/sonar/server/issue/RulesAggregation.java index 920b84c60dc..08d1c0b1b07 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/RulesAggregation.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/RulesAggregation.java @@ -23,7 +23,7 @@ package org.sonar.server.issue; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; import org.sonar.api.rule.RuleKey; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.rule.RuleDto; import java.util.Collection; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java index 74c9aedce06..44d03667462 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java @@ -22,11 +22,10 @@ package org.sonar.server.issue; import org.sonar.api.server.ServerSide; import org.sonar.core.issue.DefaultIssue; import org.sonar.api.rules.RuleFinder; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.issue.db.IssueStorage; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import org.sonar.server.issue.index.IssueIndexer; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanDeadlineComparator.java b/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanDeadlineComparator.java index ee26736e237..2024556626f 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanDeadlineComparator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanDeadlineComparator.java @@ -17,13 +17,12 @@ * 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; - -import org.sonar.api.issue.ActionPlan; +package org.sonar.server.issue.actionplan; import java.io.Serializable; import java.util.Comparator; import java.util.Date; +import org.sonar.api.issue.ActionPlan; /** * Sort action plans by chronological deadlines. Plans without deadline are diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java index a3023696b6e..81ad2decc9b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java @@ -33,20 +33,19 @@ import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; import org.sonar.api.server.ServerSide; import org.sonar.api.web.UserRole; -import org.sonar.core.issue.ActionPlanDeadlineComparator; import org.sonar.core.issue.ActionPlanStats; import org.sonar.core.issue.DefaultActionPlan; import org.sonar.core.issue.IssueUpdater; -import org.sonar.core.issue.db.ActionPlanDao; -import org.sonar.core.issue.db.ActionPlanDto; -import org.sonar.core.issue.db.ActionPlanStatsDao; -import org.sonar.core.issue.db.ActionPlanStatsDto; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.issue.db.IssueStorage; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; -import org.sonar.core.resource.ResourceQuery; +import org.sonar.db.issue.ActionPlanDao; +import org.sonar.db.issue.ActionPlanDto; +import org.sonar.db.issue.ActionPlanStatsDao; +import org.sonar.db.issue.ActionPlanStatsDto; +import org.sonar.db.issue.IssueDto; +import org.sonar.server.issue.IssueStorage; +import org.sonar.db.DbSession; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; +import org.sonar.db.component.ResourceQuery; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueDao.java b/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueDao.java index 348e9464d6a..3033fc3de39 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueDao.java @@ -22,14 +22,14 @@ package org.sonar.server.issue.db; import java.util.List; import java.util.Set; import javax.annotation.CheckForNull; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.issue.db.IssueMapper; -import org.sonar.core.persistence.DaoComponent; -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.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.exceptions.NotFoundException; -public class IssueDao extends org.sonar.core.issue.db.IssueDao implements DaoComponent { +public class IssueDao extends org.sonar.db.issue.IssueDao implements Dao { public IssueDao(MyBatis mybatis) { super(mybatis); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java index 3b445c29c00..d79b0e74a7f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/AppAction.java @@ -27,7 +27,7 @@ import org.sonar.api.server.ws.RequestHandler; 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.issue.db.IssueFilterDto; +import org.sonar.db.issue.IssueFilterDto; import org.sonar.server.user.UserSession; public class AppAction implements RequestHandler { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/FavoritesAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/FavoritesAction.java index 5abdcd7b470..c542fc41aed 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/FavoritesAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/FavoritesAction.java @@ -25,7 +25,7 @@ import org.sonar.api.server.ws.RequestHandler; 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.issue.db.IssueFilterDto; +import org.sonar.db.issue.IssueFilterDto; import org.sonar.server.user.UserSession; public class FavoritesAction implements RequestHandler { diff --git a/sonar-core/src/main/java/org/sonar/core/issue/IssueFilterSerializer.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterSerializer.java index 74d65c9a2ec..e745cc8bd9d 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/IssueFilterSerializer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterSerializer.java @@ -18,16 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue; +package org.sonar.server.issue.filter; import com.google.common.base.Splitter; import com.google.common.collect.Lists; -import org.apache.commons.lang.StringUtils; -import org.sonar.api.server.ServerSide; - import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; +import org.sonar.api.server.ServerSide; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java index 9b1480e2528..d3094403e31 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterService.java @@ -30,13 +30,12 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.Paging; -import org.sonar.core.issue.IssueFilterSerializer; -import org.sonar.core.issue.db.IssueFilterDao; -import org.sonar.core.issue.db.IssueFilterDto; -import org.sonar.core.issue.db.IssueFilterFavouriteDao; -import org.sonar.core.issue.db.IssueFilterFavouriteDto; +import org.sonar.db.issue.IssueFilterDao; +import org.sonar.db.issue.IssueFilterDto; +import org.sonar.db.issue.IssueFilterFavouriteDao; +import org.sonar.db.issue.IssueFilterFavouriteDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.user.AuthorizationDao; +import org.sonar.db.user.AuthorizationDao; import org.sonar.server.es.SearchOptions; import org.sonar.server.es.SearchResult; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java index 02df75f6fcf..a27cc6cc789 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterWriter.java @@ -23,7 +23,7 @@ package org.sonar.server.issue.filter; import org.apache.commons.lang.StringUtils; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.issue.db.IssueFilterDto; +import org.sonar.db.issue.IssueFilterDto; import org.sonar.core.permission.GlobalPermissions; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/RegisterIssueFilters.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/RegisterIssueFilters.java index f03fdae47ff..0a6a8585060 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/RegisterIssueFilters.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/RegisterIssueFilters.java @@ -21,10 +21,10 @@ package org.sonar.server.issue.filter; import org.picocontainer.Startable; import org.sonar.api.utils.System2; -import org.sonar.core.issue.db.IssueFilterDao; -import org.sonar.core.issue.db.IssueFilterDto; -import org.sonar.core.template.LoadedTemplateDao; -import org.sonar.core.template.LoadedTemplateDto; +import org.sonar.db.issue.IssueFilterDao; +import org.sonar.db.issue.IssueFilterDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; import java.util.Date; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/ShowAction.java index 16c9b44a33c..4d8c5f4b54c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/ShowAction.java @@ -26,7 +26,7 @@ import org.sonar.api.server.ws.RequestHandler; 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.issue.db.IssueFilterDto; +import org.sonar.db.issue.IssueFilterDto; import org.sonar.server.user.UserSession; public class ShowAction implements RequestHandler { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationIndexer.java index 8d79cbdd4d3..9428e77a6e1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationIndexer.java @@ -24,7 +24,7 @@ import com.google.common.collect.ImmutableMap; import org.apache.commons.dbutils.DbUtils; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.update.UpdateRequest; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java index 98650655de5..f3e16c808b4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java @@ -67,7 +67,7 @@ import org.sonar.api.resources.Scopes; import org.sonar.api.rule.Severity; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.util.NonNullInputFunction; import org.sonar.server.es.BaseIndex; import org.sonar.server.es.EsClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java index d7be429f8e7..e6889c1beb4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexer.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilders; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java index 66fa9b8a5e3..8bd70a9ddf6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/NewIssuesNotification.java @@ -26,8 +26,8 @@ import org.sonar.api.rule.Severity; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.Duration; import org.sonar.api.utils.Durations; -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.notification.NewIssuesStatistics.Metric; import org.sonar.server.rule.Rule; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueComponentHelper.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueComponentHelper.java index fd7e7e22837..67fdd4aaa9f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueComponentHelper.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueComponentHelper.java @@ -23,8 +23,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -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.db.DbClient; import static com.google.common.collect.Maps.newHashMap; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueJsonWriter.java index 11c94a2cce0..1bb99f9e91b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueJsonWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueJsonWriter.java @@ -40,7 +40,7 @@ import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.Duration; import org.sonar.api.utils.Durations; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.markdown.Markdown; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java index fa78cb3f86a..3b1d7533bc1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java @@ -50,9 +50,9 @@ import org.sonar.api.user.User; import org.sonar.api.user.UserFinder; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.issue.DefaultIssueComment; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.component.ws.ComponentJsonWriter; import org.sonar.server.db.DbClient; import org.sonar.server.es.Facets; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ShowAction.java index aa13668a4b6..d499849df2a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ShowAction.java @@ -42,8 +42,8 @@ import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.Duration; import org.sonar.api.utils.Durations; import org.sonar.api.utils.text.JsonWriter; -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.markdown.Markdown; import org.sonar.server.db.DbClient; import org.sonar.server.debt.DebtModelService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterContext.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterContext.java index 4f9cf8cacfe..a92db15f190 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterContext.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterContext.java @@ -21,7 +21,7 @@ package org.sonar.server.measure; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.sonar.core.component.SnapshotDto; +import org.sonar.db.component.SnapshotDto; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterExecutor.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterExecutor.java index beb3e649661..8758c2c2d10 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterExecutor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterExecutor.java @@ -23,9 +23,9 @@ import com.google.common.base.Strings; import org.apache.commons.dbutils.DbUtils; import org.apache.ibatis.session.SqlSession; import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.Database; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.resource.ResourceDao; +import org.sonar.db.Database; +import org.sonar.db.MyBatis; +import org.sonar.db.component.ResourceDao; import java.sql.Connection; import java.sql.SQLException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSql.java b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSql.java index 09ac1a029b0..21ceaea2ca0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSql.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/MeasureFilterSql.java @@ -34,10 +34,10 @@ import javax.annotation.Nullable; import org.apache.commons.dbutils.DbUtils; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.persistence.Database; -import org.sonar.core.persistence.dialect.MsSql; -import org.sonar.core.persistence.dialect.Oracle; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.Database; +import org.sonar.db.dialect.MsSql; +import org.sonar.db.dialect.Oracle; class MeasureFilterSql { diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/persistence/CustomMeasureDao.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/persistence/CustomMeasureDao.java index 7f660ea5e5d..a818880acad 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/persistence/CustomMeasureDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/persistence/CustomMeasureDao.java @@ -26,16 +26,16 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import org.apache.ibatis.session.RowBounds; import org.sonar.api.server.ServerSide; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.measure.custom.db.CustomMeasureMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DaoUtils; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.measure.CustomMeasureMapper; +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; @ServerSide -public class CustomMeasureDao implements DaoComponent { +public class CustomMeasureDao implements Dao { public void insert(DbSession session, CustomMeasureDto customMeasureDto) { mapper(session).insert(customMeasureDto); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java index e005fec722a..ae6dd317d4f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java @@ -27,11 +27,11 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.System2; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ServerException; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java index 5abf7bb598e..a52e5b77577 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureJsonWriter.java @@ -30,9 +30,9 @@ import javax.annotation.Nullable; import org.sonar.api.measures.Metric; import org.sonar.api.user.User; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.metric.MetricDto; import org.sonar.server.metric.ws.MetricJsonWriter; import org.sonar.server.user.ws.UserJsonWriter; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java index 68cb3e5c76c..3b0b6cf22ae 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasureValidator.java @@ -24,9 +24,9 @@ import org.sonar.api.PropertyType; import org.sonar.api.measures.Metric; import org.sonar.api.server.ServerSide; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.metric.MetricDto; import org.sonar.core.permission.GlobalPermissions; import org.sonar.server.user.UserSession; import org.sonar.server.util.TypeValidations; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java index 1b40340d5a5..8ab5c650af0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java @@ -20,7 +20,7 @@ package org.sonar.server.measure.custom.ws; -import org.sonar.core.component.Module; +import org.sonar.core.platform.Module; public class CustomMeasuresWsModule extends Module { @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java index 82fa2fde9e8..23a3f5c6b1e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java @@ -24,11 +24,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.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.measure.custom.db.CustomMeasureDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.measure.CustomMeasureDto; 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.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java index ca379062add..b9b7e9a7446 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/MetricsAction.java @@ -26,10 +26,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.api.utils.text.JsonWriter; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import org.sonar.server.metric.ws.MetricJsonWriter; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/ProjectFinder.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/ProjectFinder.java index 1ea3320d235..951e3912995 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/ProjectFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/ProjectFinder.java @@ -21,8 +21,8 @@ package org.sonar.server.measure.custom.ws; import org.sonar.api.server.ws.Request; -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.db.DbClient; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java index fecf851b57b..936fd831967 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/SearchAction.java @@ -34,12 +34,12 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.user.User; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.metric.MetricDto; +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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java index 2124aad6f01..bde804f692d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java @@ -27,11 +27,11 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.user.User; import org.sonar.api.utils.System2; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import org.sonar.server.user.UserSession; import org.sonar.server.user.index.UserIndex; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/persistence/MeasureDao.java b/server/sonar-server/src/main/java/org/sonar/server/measure/persistence/MeasureDao.java index d4664600f9d..5f0660b7dd5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/persistence/MeasureDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/persistence/MeasureDao.java @@ -27,16 +27,16 @@ import java.util.List; import java.util.Set; import javax.annotation.CheckForNull; import org.sonar.api.server.ServerSide; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.measure.db.MeasureDto; -import org.sonar.core.measure.db.MeasureMapper; -import org.sonar.core.measure.db.PastMeasureDto; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DaoUtils; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.measure.MeasureMapper; +import org.sonar.db.measure.PastMeasureDto; +import org.sonar.db.Dao; +import org.sonar.db.DaoUtils; +import org.sonar.db.DbSession; @ServerSide -public class MeasureDao implements DaoComponent { +public class MeasureDao implements Dao { public boolean existsByKey(DbSession session, String componentKey, String metricKey) { return mapper(session).countByComponentAndMetric(componentKey, metricKey) > 0; diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java b/server/sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java index 91433ef356f..fea0509d71b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java @@ -27,9 +27,9 @@ import java.util.List; import javax.annotation.Nonnull; import org.sonar.api.measures.Metric; import org.sonar.api.measures.MetricFinder; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/persistence/MetricDao.java b/server/sonar-server/src/main/java/org/sonar/server/metric/persistence/MetricDao.java index 1b0b5a4a9e6..01340086029 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/metric/persistence/MetricDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/persistence/MetricDao.java @@ -35,18 +35,18 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.apache.ibatis.session.RowBounds; import org.sonar.api.server.ServerSide; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.metric.db.MetricMapper; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DaoUtils; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.metric.MetricMapper; +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; import static com.google.common.collect.Lists.newArrayList; @ServerSide -public class MetricDao implements DaoComponent { +public class MetricDao implements Dao { @CheckForNull public MetricDto selectNullableByKey(DbSession session, String key) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java index 776f3dd6142..91d9badb2e3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java @@ -28,11 +28,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.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.measure.CustomMeasureDto; +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.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ServerException; import org.sonar.server.ruby.RubyBridge; diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DeleteAction.java index 60ce59d2506..4da369d1e0c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DeleteAction.java @@ -27,10 +27,10 @@ import javax.annotation.Nonnull; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; -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.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import org.sonar.server.ruby.RubyBridge; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DomainsAction.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DomainsAction.java index 5b732da8ded..f2867541b15 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DomainsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/DomainsAction.java @@ -24,8 +24,8 @@ 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.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 java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java index 474a518c3b4..c63ae90a55e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricJsonWriter.java @@ -25,7 +25,7 @@ import com.google.common.collect.Sets; import java.util.List; import java.util.Set; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.metric.MetricDto; import static org.sonar.server.ws.JsonWriterUtils.writeIfNeeded; diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java index 17a5056a597..d42973e2d80 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java @@ -20,7 +20,7 @@ package org.sonar.server.metric.ws; -import org.sonar.core.component.Module; +import org.sonar.core.platform.Module; public class MetricsWsModule extends Module { @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java index 21485fc738a..b5ef6a28e7a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java @@ -28,9 +28,9 @@ import org.sonar.api.server.ws.Response; 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.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import org.sonar.server.es.SearchOptions; diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java index 51e1562b715..8a6fcb65188 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java @@ -28,11 +28,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.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.measure.CustomMeasureDto; +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.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ServerException; import org.sonar.server.ruby.RubyBridge; diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java b/server/sonar-server/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java index 5e6fed9cacb..c30fed67119 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/DefaultNotificationManager.java @@ -35,9 +35,9 @@ import org.sonar.api.notifications.NotificationChannel; import org.sonar.api.utils.SonarException; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.notification.db.NotificationQueueDao; -import org.sonar.core.notification.db.NotificationQueueDto; -import org.sonar.core.properties.PropertiesDao; +import org.sonar.db.notification.NotificationQueueDao; +import org.sonar.db.notification.NotificationQueueDto; +import org.sonar.db.property.PropertiesDao; public class DefaultNotificationManager implements NotificationManager { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java b/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java index bcfcecbddb8..0e834f4b74e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionService.java @@ -27,13 +27,13 @@ import javax.annotation.Nullable; import org.sonar.api.security.DefaultGroups; import org.sonar.api.server.ServerSide; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.permission.PermissionFacade; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.resource.ResourceDto; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDto; +import org.sonar.db.permission.PermissionFacade; +import org.sonar.db.DbSession; +import org.sonar.db.component.ResourceDto; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionTemplateService.java b/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionTemplateService.java index ac1bbb48235..ae89013e22d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionTemplateService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/InternalPermissionTemplateService.java @@ -24,12 +24,12 @@ import com.google.common.collect.Lists; import org.apache.commons.lang.StringUtils; import org.sonar.api.server.ServerSide; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.permission.PermissionTemplateDao; -import org.sonar.core.permission.PermissionTemplateDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDao; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.permission.PermissionTemplateDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDao; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java index c6984f72649..c9f5a22ee1a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java @@ -30,16 +30,16 @@ import org.sonar.api.security.DefaultGroups; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.Paging; import org.sonar.core.permission.GroupWithPermission; -import org.sonar.core.permission.GroupWithPermissionDto; -import org.sonar.core.permission.PermissionDao; -import org.sonar.core.permission.PermissionQuery; -import org.sonar.core.permission.PermissionTemplateDao; -import org.sonar.core.permission.PermissionTemplateDto; +import org.sonar.db.permission.GroupWithPermissionDto; +import org.sonar.db.permission.PermissionDao; +import org.sonar.db.permission.PermissionQuery; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.permission.PermissionTemplateDto; import org.sonar.core.permission.UserWithPermission; -import org.sonar.core.permission.UserWithPermissionDto; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; -import org.sonar.core.resource.ResourceQuery; +import org.sonar.db.permission.UserWithPermissionDto; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; +import org.sonar.db.component.ResourceQuery; import org.sonar.server.exceptions.NotFoundException; import static com.google.common.collect.Lists.newArrayList; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionQueryParser.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionQueryParser.java index 8d16f383bb6..e8a5c67fa88 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionQueryParser.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionQueryParser.java @@ -22,8 +22,8 @@ package org.sonar.server.permission; import org.sonar.api.server.ws.WebService.SelectionMode; -import org.sonar.core.permission.PermissionQuery; -import org.sonar.core.user.GroupMembershipQuery; +import org.sonar.db.permission.PermissionQuery; +import org.sonar.db.user.GroupMembershipQuery; import org.sonar.server.util.RubyUtils; import java.util.Map; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplate.java index e63d24798da..1a3d10852fc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplate.java @@ -23,9 +23,9 @@ package org.sonar.server.permission; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; -import org.sonar.core.permission.PermissionTemplateDto; -import org.sonar.core.permission.PermissionTemplateGroupDto; -import org.sonar.core.permission.PermissionTemplateUserDto; +import org.sonar.db.permission.PermissionTemplateDto; +import org.sonar.db.permission.PermissionTemplateGroupDto; +import org.sonar.db.permission.PermissionTemplateUserDto; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUpdater.java index 7869b35d13a..7f8240a67b7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateUpdater.java @@ -24,11 +24,11 @@ import org.sonar.api.security.DefaultGroups; import org.sonar.api.web.UserRole; import org.sonar.core.permission.ComponentPermissions; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.permission.PermissionTemplateDao; -import org.sonar.core.permission.PermissionTemplateDto; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDao; -import org.sonar.core.user.UserDto; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.permission.PermissionTemplateDto; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDao; +import org.sonar.db.user.UserDto; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java b/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java index efc397e2281..4f7878ed026 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java @@ -25,9 +25,9 @@ import org.apache.commons.dbutils.DbUtils; import org.elasticsearch.index.query.QueryBuilders; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.persistence.DatabaseVersion; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.version.DatabaseVersion; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.es.EsClient; import org.sonar.server.issue.index.IssueIndexDefinition; import org.sonar.server.search.IndexDefinition; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java b/server/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java index 8dcd286c73a..369922a2c4a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java @@ -22,7 +22,7 @@ package org.sonar.server.platform; import org.picocontainer.Startable; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.MessageException; -import org.sonar.core.persistence.DatabaseVersion; +import org.sonar.db.version.DatabaseVersion; public class DatabaseServerCompatibility implements Startable { diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java b/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java index 4d12df6dcf6..d790178090a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java @@ -23,7 +23,7 @@ import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.picocontainer.Startable; import org.sonar.api.platform.ServerUpgradeStatus; -import org.sonar.core.persistence.DatabaseVersion; +import org.sonar.db.version.DatabaseVersion; /** * @since 2.5 diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java b/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java index 4525746ebfc..480cd19f894 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java @@ -22,8 +22,8 @@ package org.sonar.server.platform; import com.google.common.collect.Maps; import org.picocontainer.Startable; import org.sonar.api.config.Settings; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import javax.annotation.Nullable; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java index 5366a8a5da0..95e26ddb6fa 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java @@ -29,7 +29,7 @@ import org.sonar.api.platform.Server; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.log.Profiler; -import org.sonar.core.persistence.DatabaseVersion; +import org.sonar.db.version.DatabaseVersion; import org.sonar.core.platform.ComponentContainer; import org.sonar.server.platform.platformlevel.PlatformLevel; import org.sonar.server.platform.platformlevel.PlatformLevel1; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitor.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitor.java index e2d33e65f8e..f75952fc05f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DatabaseMonitor.java @@ -22,9 +22,9 @@ package org.sonar.server.platform.monitoring; import org.apache.commons.dbcp.BasicDataSource; import org.apache.commons.dbutils.DbUtils; -import org.sonar.core.persistence.DatabaseVersion; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.version.DatabaseVersion; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import java.sql.Connection; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java index 28aad7223cc..975c365ff0f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel.java @@ -24,7 +24,7 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.sonar.core.platform.ComponentContainer; -import org.sonar.core.component.Module; +import org.sonar.core.platform.Module; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java index 9a746002a27..a4f2ab62212 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java @@ -25,14 +25,14 @@ import org.sonar.api.utils.System2; import org.sonar.api.utils.internal.TempFolderCleaner; import org.sonar.core.config.CorePropertyDefinitions; import org.sonar.core.config.Logback; -import org.sonar.core.measure.db.MeasureFilterDao; -import org.sonar.core.persistence.DaoUtils; -import org.sonar.core.persistence.DatabaseVersion; -import org.sonar.core.persistence.DefaultDatabase; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.persistence.SemaphoreUpdater; -import org.sonar.core.persistence.SemaphoresImpl; -import org.sonar.core.purge.PurgeProfiler; +import org.sonar.db.measure.MeasureFilterDao; +import org.sonar.db.DaoUtils; +import org.sonar.db.version.DatabaseVersion; +import org.sonar.db.DefaultDatabase; +import org.sonar.db.MyBatis; +import org.sonar.db.semaphore.SemaphoreUpdater; +import org.sonar.db.semaphore.SemaphoresImpl; +import org.sonar.db.purge.PurgeProfiler; import org.sonar.server.activity.db.ActivityDao; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.component.db.ComponentIndexDao; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index 3a5900964b4..7747601eac1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -32,16 +32,16 @@ import org.sonar.api.rules.XMLRuleParser; import org.sonar.api.server.rule.RulesDefinitionXmlLoader; import org.sonar.core.computation.dbcleaner.IndexPurgeListener; import org.sonar.core.computation.dbcleaner.ProjectCleaner; -import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; -import org.sonar.core.issue.IssueFilterSerializer; +import org.sonar.db.purge.period.DefaultPeriodCleaner; +import org.sonar.server.issue.filter.IssueFilterSerializer; import org.sonar.core.issue.IssueUpdater; import org.sonar.core.issue.workflow.FunctionExecutor; import org.sonar.core.issue.workflow.IssueWorkflow; -import org.sonar.core.permission.PermissionFacade; -import org.sonar.core.qualitygate.db.ProjectQgateAssociationDao; -import org.sonar.core.qualitygate.db.QualityGateConditionDao; -import org.sonar.core.qualitygate.db.QualityGateDao; -import org.sonar.core.resource.DefaultResourceTypes; +import org.sonar.db.permission.PermissionFacade; +import org.sonar.db.qualitygate.ProjectQgateAssociationDao; +import org.sonar.db.qualitygate.QualityGateConditionDao; +import org.sonar.db.qualitygate.QualityGateDao; +import org.sonar.core.component.DefaultResourceTypes; import org.sonar.core.timemachine.Periods; import org.sonar.core.user.DefaultUserFinder; import org.sonar.core.user.DeprecatedUserFinder; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbSystemAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbSystemAction.java index eb50027bea7..4b2a92feda9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbSystemAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbSystemAction.java @@ -24,8 +24,8 @@ 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.persistence.Database; -import org.sonar.core.persistence.DatabaseVersion; +import org.sonar.db.Database; +import org.sonar.db.version.DatabaseVersion; import org.sonar.server.db.migrations.DatabaseMigration; import static org.sonar.server.db.migrations.DatabaseMigration.Status.RUNNING; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java index cbead05cc15..6614dbd65d3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java @@ -26,8 +26,8 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.IsAliveMapper; +import org.sonar.db.DbSession; +import org.sonar.db.IsAliveMapper; import org.sonar.server.db.DbClient; import org.sonar.server.db.migrations.DatabaseMigration; import org.sonar.server.platform.Platform; diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java index 8c36a26c2c7..3cea8fdd0d8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java @@ -24,9 +24,9 @@ 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.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.component.ComponentCleanerService; import org.sonar.server.db.DbClient; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java index 46a8659d781..f271f272c3d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java @@ -26,10 +26,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.api.web.UserRole; -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.component.ComponentCleanerService; import org.sonar.server.db.DbClient; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java index d8d89670d02..a1e96b5e7b9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java @@ -27,9 +27,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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java index 983137cd9db..7e2e57d56bc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsModule.java @@ -20,7 +20,7 @@ package org.sonar.server.project.ws; -import org.sonar.core.component.Module; +import org.sonar.core.platform.Module; public class ProjectsWsModule extends Module { @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java index 3cff3218994..30580edcec8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java @@ -26,10 +26,10 @@ import org.sonar.api.server.ws.Response; 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.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.es.SearchOptions; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/properties/ProjectSettingsFactory.java b/server/sonar-server/src/main/java/org/sonar/server/properties/ProjectSettingsFactory.java index eed0e496cf0..43986c1ea35 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/properties/ProjectSettingsFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/properties/ProjectSettingsFactory.java @@ -24,8 +24,8 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Maps; import org.sonar.api.config.Settings; import org.sonar.api.server.ServerSide; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import java.util.List; import java.util.Map; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java index 53b98ce0b9f..3dc5d153220 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QgateProjectFinder.java @@ -21,12 +21,12 @@ package org.sonar.server.qualitygate; import org.sonar.api.server.ServerSide; -import org.sonar.core.qualitygate.db.ProjectQgateAssociation; -import org.sonar.core.qualitygate.db.ProjectQgateAssociationDao; -import org.sonar.core.qualitygate.db.ProjectQgateAssociationDto; -import org.sonar.core.qualitygate.db.ProjectQgateAssociationQuery; -import org.sonar.core.qualitygate.db.QualityGateDao; -import org.sonar.core.qualitygate.db.QualityGateDto; +import org.sonar.db.qualitygate.ProjectQgateAssociation; +import org.sonar.db.qualitygate.ProjectQgateAssociationDao; +import org.sonar.db.qualitygate.ProjectQgateAssociationDto; +import org.sonar.db.qualitygate.ProjectQgateAssociationQuery; +import org.sonar.db.qualitygate.QualityGateDao; +import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.server.exceptions.NotFoundException; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java index cb5ceff495f..d1f7e3061c4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java @@ -34,16 +34,16 @@ import org.sonar.api.measures.Metric; import org.sonar.api.measures.Metric.ValueType; import org.sonar.api.measures.MetricFinder; import org.sonar.api.web.UserRole; -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.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; -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.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; +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.component.db.ComponentDao; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.Errors; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java index 474d7f42f47..b0794261526 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java @@ -21,10 +21,10 @@ package org.sonar.server.qualitygate; import org.picocontainer.Startable; import org.sonar.api.measures.CoreMetrics; -import org.sonar.core.qualitygate.db.QualityGateConditionDto; -import org.sonar.core.qualitygate.db.QualityGateDto; -import org.sonar.core.template.LoadedTemplateDao; -import org.sonar.core.template.LoadedTemplateDto; +import org.sonar.db.qualitygate.QualityGateConditionDto; +import org.sonar.db.qualitygate.QualityGateDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; public class RegisterQualityGates implements Startable { diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java index 8c930728782..2d3a194e3d4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.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.qualitygate.db.QualityGateDto; +import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.server.qualitygate.QualityGates; public class CopyAction implements QGateWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java index d83aae3fc5f..e70f3a2b7c3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.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.qualitygate.db.QualityGateDto; +import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.server.qualitygate.QualityGates; public class CreateAction implements QGateWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java index a18562154b7..c8d1d7fafd5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java @@ -25,7 +25,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.qualitygate.db.QualityGateDto; +import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.server.qualitygate.QualityGates; public class ListAction implements QGateWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java index 514e8d4a655..6e2a8503efb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java @@ -22,8 +22,8 @@ package org.sonar.server.qualitygate.ws; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.qualitygate.db.QualityGateConditionDto; -import org.sonar.core.qualitygate.db.QualityGateDto; +import org.sonar.db.qualitygate.QualityGateConditionDto; +import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.server.exceptions.BadRequestException; public class QGatesWs implements WebService { diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java index 42901fad207..68a4bbcbdd6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.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.qualitygate.db.QualityGateDto; +import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.server.qualitygate.QualityGates; public class RenameAction implements QGateWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java index 69268b929ec..9cae2607b18 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java @@ -27,8 +27,8 @@ 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.qualitygate.db.ProjectQgateAssociation; -import org.sonar.core.qualitygate.db.ProjectQgateAssociationQuery; +import org.sonar.db.qualitygate.ProjectQgateAssociation; +import org.sonar.db.qualitygate.ProjectQgateAssociationQuery; import org.sonar.server.qualitygate.QgateProjectFinder; public class SearchAction implements QGateWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java index ce575a74b2c..0cea0516dc3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java @@ -27,8 +27,8 @@ 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.qualitygate.db.QualityGateConditionDto; -import org.sonar.core.qualitygate.db.QualityGateDto; +import org.sonar.db.qualitygate.QualityGateConditionDto; +import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.qualitygate.QualityGates; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java index 649ef441a13..2189d04cddd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java @@ -20,7 +20,7 @@ package org.sonar.server.qualityprofile; import com.google.common.collect.ImmutableList; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleKey; import javax.annotation.CheckForNull; import java.util.Date; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java index ba7de0e10e5..be5857a935e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRuleChange.java @@ -22,7 +22,7 @@ package org.sonar.server.qualityprofile; import com.google.common.base.Objects; import com.google.common.collect.Maps; import org.apache.commons.lang.StringUtils; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleKey; import org.sonar.server.activity.Activity; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java index 92bce979185..9e37502709b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java @@ -20,7 +20,7 @@ package org.sonar.server.qualityprofile; import com.google.common.collect.Lists; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.exceptions.Errors; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfile.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfile.java index 0a2b12ac316..c30b024c0e0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfile.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfile.java @@ -22,7 +22,7 @@ package org.sonar.server.qualityprofile; import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java index b46818c688d..6f1a47a091f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java @@ -43,8 +43,8 @@ import org.codehaus.staxmate.in.SMInputCursor; import org.sonar.api.rule.RuleKey; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.text.XmlWriter; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.index.ActiveRuleIndex; import org.sonar.server.search.IndexClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java index c33d8cb93a0..01ec23e3114 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java @@ -25,8 +25,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.sonar.api.server.ServerSide; import org.sonar.api.rule.RuleKey; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.core.util.NonNullInputFunction; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java index 6d53f1ab47a..7e9f1abfb8a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java @@ -24,8 +24,8 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.TempFolder; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import java.io.File; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java index c6eb4c00038..47ba77634fb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java @@ -41,8 +41,8 @@ import org.sonar.api.rules.RuleFinder; import org.sonar.api.rules.RulePriority; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.ValidationMessages; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java index f42d9672b9a..b6664b71e46 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java @@ -23,8 +23,8 @@ import com.google.common.collect.Lists; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.Verifications; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLoader.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLoader.java index 18612747476..84f3e69b812 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLoader.java @@ -24,9 +24,9 @@ import com.google.common.collect.Multimap; import org.sonar.api.server.ServerSide; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.index.ActiveRuleIndex; import org.sonar.server.rule.index.RuleIndex; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java index 93b583eb550..784e88acf5f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileLookup.java @@ -26,8 +26,8 @@ import java.util.List; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import static com.google.common.collect.Lists.newArrayList; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java index a0440eebb75..cea16eeaae1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectLookup.java @@ -29,9 +29,9 @@ import javax.annotation.CheckForNull; import org.sonar.api.server.ServerSide; import org.sonar.api.component.Component; import org.sonar.api.web.UserRole; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectOperations.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectOperations.java index 10b67a6499f..5b0eb81e627 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectOperations.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileProjectOperations.java @@ -22,11 +22,11 @@ package org.sonar.server.qualityprofile; import org.sonar.api.server.ServerSide; import org.sonar.api.web.UserRole; -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.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java index 475c85cf5ad..e3ac5e2fc51 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java @@ -31,11 +31,11 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.ActiveRule; import org.sonar.api.rules.ActiveRuleParam; import org.sonar.api.utils.ValidationMessages; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java index 5873862f58d..130ad0615e1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java @@ -20,7 +20,7 @@ package org.sonar.server.qualityprofile; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java index d9cb64268af..1609e2b3a98 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java @@ -34,11 +34,11 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.SearchHit; import org.sonar.api.server.ServerSide; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.user.UserDto; import org.sonar.server.activity.index.ActivityIndex; import org.sonar.server.db.DbClient; import org.sonar.server.es.SearchOptions; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java index 71af3a73be0..e8ab9bf6b0b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java @@ -20,7 +20,7 @@ package org.sonar.server.qualityprofile; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.exceptions.NotFoundException; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java index 063a5abc6e7..ba6e90145ff 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java @@ -35,9 +35,9 @@ import org.sonar.api.utils.ValidationMessages; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.log.Profiler; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.template.LoadedTemplateDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; import org.sonar.server.db.DbClient; import org.sonar.server.platform.PersistentSettings; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java index 650c5a0e0a5..a5bbb935230 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java @@ -23,13 +23,13 @@ import com.google.common.base.Splitter; import com.google.common.collect.Lists; import org.sonar.api.server.ServerSide; import org.sonar.api.server.rule.RuleParamType; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.activity.ActivityService; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java index bdab3b3ca73..adb4cbc00c3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContext.java @@ -22,12 +22,12 @@ package org.sonar.server.qualityprofile; import com.google.common.collect.Maps; import org.apache.commons.lang.StringUtils; import org.sonar.api.rule.RuleStatus; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.exceptions.BadRequestException; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java index 3b6c56b72cc..8f7bf9df30b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivatorContextFactory.java @@ -21,12 +21,12 @@ package org.sonar.server.qualityprofile; import org.sonar.api.server.ServerSide; import org.sonar.api.rule.RuleKey; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java index 20a0bfeef22..d62aafcbaaf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java @@ -22,14 +22,14 @@ package org.sonar.server.qualityprofile.db; import com.google.common.base.Preconditions; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.ActiveRuleMapper; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleMapper; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.db.BaseDao; import org.sonar.server.rule.db.RuleDao; import org.sonar.server.search.IndexDefinition; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java index 239e0e7b753..dc0892930c7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java @@ -20,7 +20,7 @@ package org.sonar.server.qualityprofile.index; import com.google.common.base.Preconditions; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleKey; import org.sonar.server.qualityprofile.ActiveRule; import org.sonar.server.search.BaseDoc; import org.sonar.server.search.IndexUtils; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java index b2af81656a8..a44ef11bd97 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndex.java @@ -33,8 +33,8 @@ import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleKey; import org.sonar.server.qualityprofile.ActiveRule; import org.sonar.server.rule.index.RuleNormalizer; import org.sonar.server.search.BaseIndex; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java index 93a4f525049..a40c9e09b09 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java @@ -24,11 +24,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import org.elasticsearch.action.support.replication.ReplicationType; import org.elasticsearch.action.update.UpdateRequest; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.process.ProcessProperties; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.ActiveRule; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java index 4202334c288..b7c9a97e464 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java @@ -28,7 +28,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.Response.Stream; import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService.NewAction; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.plugins.MimeTypes; import org.sonar.server.qualityprofile.QProfileBackuper; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java index 002ac94362e..e38514a5aa0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java @@ -26,7 +26,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.server.ws.WebService.NewController; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.QProfileFactory; import org.sonar.server.qualityprofile.RuleActivator; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java index a39b72afcc3..80d1dba461a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java @@ -30,9 +30,9 @@ import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.Paging; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.user.UserDto; import org.sonar.server.activity.index.ActivityIndex; import org.sonar.server.db.DbClient; import org.sonar.server.es.SearchOptions; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java index 6659583cf6a..c47dade3b5b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java @@ -29,7 +29,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.server.ws.WebService.NewController; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.core.util.NonNullInputFunction; import org.sonar.server.qualityprofile.ActiveRule; import org.sonar.server.qualityprofile.QProfileComparison; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java index f02a071c2c0..d1430c772ac 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java @@ -26,7 +26,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.qualityprofile.QProfileCopier; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java index b41ab309535..dea943ce53c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java @@ -27,8 +27,8 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.QProfileExporters; import org.sonar.server.qualityprofile.QProfileFactory; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java index 0af30ba17cb..5577a2eca66 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java @@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.server.ws.WebService.NewController; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.QProfileFactory; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java index 38f97c7e593..3a6516a2ceb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java @@ -29,8 +29,8 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.Response.Stream; import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService.NewAction; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.plugins.MimeTypes; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java index 5cf4062409d..a1dcc3fadf8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java @@ -26,8 +26,8 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.server.ws.WebService.NewController; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.qualityprofile.QProfile; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java index fb6349e77e4..a9de9c71b14 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java @@ -34,8 +34,8 @@ import org.sonar.api.server.ws.WebService.NewController; import org.sonar.api.utils.Paging; import org.sonar.api.utils.text.JsonWriter; import org.sonar.api.web.UserRole; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ProjectQprofileAssociationDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ProjectQprofileAssociationDto; import org.sonar.core.util.NonNullInputFunction; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileIdentificationParamUtils.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileIdentificationParamUtils.java index 29659c1c360..36297c5ece9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileIdentificationParamUtils.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileIdentificationParamUtils.java @@ -23,8 +23,8 @@ import com.google.common.base.Preconditions; import org.sonar.api.resources.Languages; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.WebService.NewAction; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.qualityprofile.QProfileFactory; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java index c94625c0635..175031e6dfa 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java @@ -27,7 +27,7 @@ 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.permission.GlobalPermissions; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.qualityprofile.BulkChangeResult; import org.sonar.server.qualityprofile.QProfileBackuper; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RuleActivationActions.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RuleActivationActions.java index 599365d82d1..b82fa596a58 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RuleActivationActions.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RuleActivationActions.java @@ -27,7 +27,7 @@ import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.KeyValueFormat; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleKey; import org.sonar.server.qualityprofile.QProfileService; import org.sonar.server.qualityprofile.RuleActivation; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java index ecdbbf53efb..f9927daa8d1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java @@ -29,7 +29,7 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.qualityprofile.db.QualityProfileDao; +import org.sonar.db.qualityprofile.QualityProfileDao; import org.sonar.core.util.NonNullInputFunction; import org.sonar.server.qualityprofile.QProfile; import org.sonar.server.qualityprofile.QProfileLoader; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java index ef3a54b65bc..11e6746279b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java @@ -45,14 +45,14 @@ import org.sonar.api.utils.MessageException; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.log.Profiler; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleDto.Format; -import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.technicaldebt.db.CharacteristicDao; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleDto.Format; +import org.sonar.db.rule.RuleParamDto; +import org.sonar.db.debt.CharacteristicDao; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.RuleActivator; import org.sonar.server.startup.RegisterDebtModel; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java index 39fcbe4860d..c76757178d4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java @@ -27,10 +27,10 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.api.server.rule.RuleParamType; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleDto.Format; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleDto.Format; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.Errors; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleDeleter.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleDeleter.java index db7b5c595d5..26aaad5755a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleDeleter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleDeleter.java @@ -23,8 +23,8 @@ package org.sonar.server.rule; import org.sonar.api.server.ServerSide; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.RuleActivator; import org.sonar.server.rule.index.RuleDoc; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java index fa4850d7621..ea89d894af7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleOperations.java @@ -29,10 +29,10 @@ import org.sonar.api.server.ServerSide; import org.sonar.api.server.debt.DebtRemediationFunction; import org.sonar.api.server.debt.internal.DefaultDebtRemediationFunction; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java index c141eeed071..29b131ea50c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java @@ -22,7 +22,7 @@ package org.sonar.server.rule; import com.google.common.base.Predicate; import com.google.common.collect.Sets; import org.sonar.api.server.rule.RuleTagFormat; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.rule.RuleDto; import javax.annotation.Nullable; import java.util.Set; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java index 442d452f1d0..272fa006128 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java @@ -34,12 +34,12 @@ import org.sonar.api.rule.Severity; import org.sonar.api.server.ServerSide; import org.sonar.api.server.debt.DebtRemediationFunction; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java b/server/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java index de1b473f1e1..a3dcba0ef97 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java @@ -22,10 +22,10 @@ package org.sonar.server.rule.db; import com.google.common.base.Preconditions; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleMapper; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleMapper; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.BaseDao; import org.sonar.server.search.IndexDefinition; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java index 482f9363b54..8442208aad1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java @@ -64,7 +64,7 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.api.server.debt.DebtCharacteristic; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.qualityprofile.index.ActiveRuleNormalizer; import org.sonar.server.rule.Rule; import org.sonar.server.search.BaseIndex; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java index 9452b8a62a4..3a486a50562 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java @@ -27,10 +27,10 @@ import org.elasticsearch.action.update.UpdateRequest; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.server.debt.DebtCharacteristic; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.markdown.Markdown; import org.sonar.process.ProcessProperties; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java index f6240163e65..bfb1f8efc99 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java @@ -28,8 +28,8 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.qualityprofile.ActiveRule; import org.sonar.server.qualityprofile.QProfileLoader; import org.sonar.server.rule.Rule; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java index 11037dab47d..42eacf8d337 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java @@ -39,7 +39,7 @@ 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.permission.GlobalPermissions; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.qualityprofile.QProfileLoader; import org.sonar.server.rule.RuleRepositories; import org.sonar.server.rule.RuleRepositories.Repository; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java index 1f1b62e3d34..6306680f162 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java @@ -42,7 +42,7 @@ import org.sonar.api.server.ws.Response; 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.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.qualityprofile.ActiveRule; import org.sonar.server.rule.Rule; import org.sonar.server.rule.RuleService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java index 78dc40c3ac6..f2422bf8126 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java @@ -69,7 +69,7 @@ import org.elasticsearch.search.fetch.source.FetchSourceContext; import org.joda.time.DateTime; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.persistence.Dto; +import org.sonar.db.Dto; import org.sonar.server.exceptions.NotFoundException; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java b/server/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java index 34b412fedcd..7d9c777ca72 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java @@ -20,7 +20,7 @@ package org.sonar.server.search; import org.elasticsearch.action.update.UpdateRequest; -import org.sonar.core.persistence.Dto; +import org.sonar.db.Dto; import org.sonar.server.db.DbClient; import java.io.Serializable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/DbSynchronizationHandler.java b/server/sonar-server/src/main/java/org/sonar/server/search/DbSynchronizationHandler.java index b750a4d0474..521d37b8d50 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/DbSynchronizationHandler.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/DbSynchronizationHandler.java @@ -22,7 +22,7 @@ package org.sonar.server.search; import org.apache.ibatis.session.ResultContext; import org.apache.ibatis.session.ResultHandler; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/EsSearchModule.java b/server/sonar-server/src/main/java/org/sonar/server/search/EsSearchModule.java index f3e1b7fa7d8..846998b01db 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/EsSearchModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/EsSearchModule.java @@ -19,7 +19,7 @@ */ package org.sonar.server.search; -import org.sonar.core.component.Module; +import org.sonar.core.platform.Module; import org.sonar.server.es.EsClient; public class EsSearchModule extends Module { diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/Index.java b/server/sonar-server/src/main/java/org/sonar/server/search/Index.java index d14e5497ee4..28db2a30360 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/Index.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/Index.java @@ -21,7 +21,7 @@ package org.sonar.server.search; import org.picocontainer.Startable; import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.Dto; +import org.sonar.db.Dto; import javax.annotation.CheckForNull; diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java index 40246afafd5..c92c8c8540b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/IndexQueue.java @@ -31,7 +31,7 @@ import org.elasticsearch.action.update.UpdateRequest; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.cluster.WorkQueue; +import org.sonar.db.deprecated.WorkQueue; import org.sonar.core.platform.ComponentContainer; import org.sonar.server.search.action.IndexAction; diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java b/server/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java index 26758b3994e..5e79fcb0318 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/IndexSynchronizer.java @@ -23,9 +23,9 @@ import java.util.Date; import org.sonar.api.config.Settings; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.activity.index.ActivityIndexer; -import org.sonar.server.db.Dao; +import org.sonar.server.db.DeprecatedDao; import org.sonar.server.db.DbClient; import org.sonar.server.issue.index.IssueAuthorizationIndexer; import org.sonar.server.issue.index.IssueIndexer; @@ -105,7 +105,7 @@ public class IndexSynchronizer { } } - void synchronize(DbSession session, Dao dao, Index index) { + void synchronize(DbSession session, DeprecatedDao dao, Index index) { long count = index.getIndexStat().getDocumentCount(); Date lastSynch = index.getLastSynchronization(); LOG.info("Index {}s", index.getIndexType()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/action/IndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/search/action/IndexAction.java index d7fe1040d92..5b6d796bbf5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/action/IndexAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/action/IndexAction.java @@ -20,7 +20,7 @@ package org.sonar.server.search.action; import org.elasticsearch.action.ActionRequest; -import org.sonar.core.cluster.ClusterAction; +import org.sonar.db.deprecated.ClusterAction; import org.sonar.server.search.Index; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/action/InsertDto.java b/server/sonar-server/src/main/java/org/sonar/server/search/action/InsertDto.java index 45576708131..878031eaa44 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/action/InsertDto.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/action/InsertDto.java @@ -21,7 +21,7 @@ package org.sonar.server.search.action; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.update.UpdateRequest; -import org.sonar.core.persistence.Dto; +import org.sonar.db.Dto; import org.sonar.server.search.Index; import java.util.ArrayList; diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/action/UpsertDto.java b/server/sonar-server/src/main/java/org/sonar/server/search/action/UpsertDto.java index 23a625ffcac..f3a6365ea88 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/search/action/UpsertDto.java +++ b/server/sonar-server/src/main/java/org/sonar/server/search/action/UpsertDto.java @@ -20,7 +20,7 @@ package org.sonar.server.search.action; import org.elasticsearch.action.update.UpdateRequest; -import org.sonar.core.persistence.Dto; +import org.sonar.db.Dto; import org.sonar.server.search.Index; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/db/FileSourceDao.java b/server/sonar-server/src/main/java/org/sonar/server/source/db/FileSourceDao.java index c1d8f0e6002..ba1eb205f45 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/db/FileSourceDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/db/FileSourceDao.java @@ -32,15 +32,15 @@ import javax.annotation.CheckForNull; import org.apache.commons.dbutils.DbUtils; import org.apache.commons.io.IOUtils; import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DaoComponent; -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.core.source.db.FileSourceMapper; +import org.sonar.db.Dao; +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.db.source.FileSourceMapper; @ServerSide -public class FileSourceDao implements DaoComponent { +public class FileSourceDao implements Dao { private static final Splitter END_OF_LINE_SPLITTER = Splitter.on('\n'); private final MyBatis mybatis; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineIndexer.java index c22ea01b49f..48dfb9ce7dc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineIndexer.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilders; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java index d23082d857d..cfe8967a8c6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/index/SourceLineResultSetIterator.java @@ -21,7 +21,7 @@ package org.sonar.server.source.index; import org.elasticsearch.action.update.UpdateRequest; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.source.db.FileSourceDto; +import org.sonar.db.source.FileSourceDto; import org.sonar.server.db.DbClient; import org.sonar.server.db.ResultSetIterator; import org.sonar.server.es.EsUtils; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java index 2ffe4c95ee5..5d2973073ae 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java @@ -26,8 +26,8 @@ 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.web.UserRole; -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.db.DbClient; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java index 6f02cbe6f84..e6505cc9b5e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java @@ -26,8 +26,8 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; 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.db.component.ComponentDto; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.source.SourceService; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java index 07dcf6eb811..2c4c3c71c03 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java @@ -27,9 +27,9 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.DateUtils; 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.exceptions.NotFoundException; import org.sonar.server.source.HtmlSourceDecorator; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java index 7d54fe0f8dc..eb6ceb6bd3b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java @@ -26,8 +26,8 @@ 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.web.UserRole; -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.db.DbClient; import org.sonar.server.source.SourceService; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java index 617c7f9f71f..84c2bcc8716 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java @@ -30,8 +30,8 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.DateUtils; 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.db.component.ComponentDto; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.source.index.SourceLineDoc; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java index f0712c6e075..e5cd0a1fd66 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java @@ -26,8 +26,8 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; 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.db.component.ComponentDto; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.source.SourceService; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java b/server/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java index 26a98a69412..eaed0e4384a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java @@ -36,12 +36,12 @@ import org.sonar.api.server.debt.DebtRemediationFunction; import org.sonar.api.utils.Duration; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.technicaldebt.db.CharacteristicMapper; -import org.sonar.core.technicaldebt.db.RequirementMigrationDto; -import org.sonar.core.template.LoadedTemplateDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.debt.CharacteristicMapper; +import org.sonar.db.debt.RequirementMigrationDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; import org.sonar.server.db.DbClient; import org.sonar.server.rule.RegisterRules; diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java b/server/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java index 6fd94ad99bb..cf72c4464b1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java @@ -25,7 +25,7 @@ import org.apache.commons.lang.CharUtils; import org.sonar.api.server.ServerSide; import org.sonar.core.platform.PluginInfo; import org.sonar.core.platform.PluginRepository; -import org.sonar.core.plugins.RemotePlugin; +import org.sonar.core.platform.RemotePlugin; import org.sonar.server.platform.DefaultServerFileSystem; import java.io.File; diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java b/server/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java index 8cbfb2bdbbe..8091866ebce 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java @@ -23,8 +23,8 @@ import com.google.common.annotations.VisibleForTesting; import org.sonar.api.CoreProperties; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; /** * @since 3.5 diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDashboards.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDashboards.java index 4e6cb6c05cc..18c41e5aef2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDashboards.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDashboards.java @@ -31,14 +31,14 @@ import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.log.Profiler; import org.sonar.api.web.Dashboard; import org.sonar.api.web.DashboardTemplate; -import org.sonar.core.dashboard.ActiveDashboardDao; -import org.sonar.core.dashboard.ActiveDashboardDto; -import org.sonar.core.dashboard.DashboardDao; -import org.sonar.core.dashboard.DashboardDto; -import org.sonar.core.dashboard.WidgetDto; -import org.sonar.core.dashboard.WidgetPropertyDto; -import org.sonar.core.template.LoadedTemplateDao; -import org.sonar.core.template.LoadedTemplateDto; +import org.sonar.db.dashboard.ActiveDashboardDao; +import org.sonar.db.dashboard.ActiveDashboardDto; +import org.sonar.db.dashboard.DashboardDao; +import org.sonar.db.dashboard.DashboardDto; +import org.sonar.db.dashboard.WidgetDto; +import org.sonar.db.dashboard.WidgetPropertyDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; import org.sonar.server.issue.filter.RegisterIssueFilters; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java index 219f33d0b60..e2427b54a79 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterDebtModel.java @@ -23,7 +23,7 @@ package org.sonar.server.startup; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.log.Profiler; -import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.db.debt.CharacteristicDao; import org.sonar.server.debt.DebtModelBackup; public class RegisterDebtModel { diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java index da4158ff585..27b31a4d354 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java @@ -32,9 +32,9 @@ import org.sonar.api.measures.Metrics; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.log.Profiler; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import org.sonar.server.db.DbClient; import static com.google.common.collect.FluentIterable.from; diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java index b7c610c8466..2c96d76c5a5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java @@ -31,10 +31,10 @@ import org.sonar.api.web.Criterion; import org.sonar.api.web.Filter; import org.sonar.api.web.FilterColumn; import org.sonar.api.web.FilterTemplate; -import org.sonar.core.measure.db.MeasureFilterDao; -import org.sonar.core.measure.db.MeasureFilterDto; -import org.sonar.core.template.LoadedTemplateDao; -import org.sonar.core.template.LoadedTemplateDto; +import org.sonar.db.measure.MeasureFilterDao; +import org.sonar.db.measure.MeasureFilterDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; import java.util.Date; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java index adb33bf9562..7f44a0a741b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java @@ -25,12 +25,12 @@ import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.log.Profiler; import org.sonar.api.web.UserRole; -import org.sonar.core.permission.PermissionTemplateDao; -import org.sonar.core.permission.PermissionTemplateDto; -import org.sonar.core.template.LoadedTemplateDao; -import org.sonar.core.template.LoadedTemplateDto; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDao; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.permission.PermissionTemplateDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDao; import org.sonar.server.platform.PersistentSettings; public class RegisterPermissionTemplates { diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java index 8111277c509..4185c6b4f3c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java @@ -23,7 +23,7 @@ import com.google.common.base.Strings; import org.sonar.api.utils.log.Loggers; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.config.PropertyDefinitions; -import org.sonar.core.properties.PropertiesDao; +import org.sonar.db.property.PropertiesDao; /** * @since 3.4 diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RenameIssueWidgets.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RenameIssueWidgets.java index 40210751dbb..bce54a6a15e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/RenameIssueWidgets.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RenameIssueWidgets.java @@ -25,13 +25,13 @@ import org.picocontainer.Startable; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.dashboard.DashboardDto; -import org.sonar.core.dashboard.WidgetDto; -import org.sonar.core.dashboard.WidgetPropertyDto; -import org.sonar.core.issue.db.IssueFilterDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.template.LoadedTemplateDto; +import org.sonar.db.dashboard.DashboardDto; +import org.sonar.db.dashboard.WidgetDto; +import org.sonar.db.dashboard.WidgetPropertyDto; +import org.sonar.db.issue.IssueFilterDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; import org.sonar.server.db.DbClient; import org.sonar.server.issue.filter.RegisterIssueFilters; diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/CoverageService.java b/server/sonar-server/src/main/java/org/sonar/server/test/CoverageService.java index c29aa561497..b454c0bcb77 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/test/CoverageService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/test/CoverageService.java @@ -27,9 +27,9 @@ import org.sonar.api.server.ServerSide; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.utils.KeyValueFormat; import org.sonar.api.web.UserRole; -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.measure.persistence.MeasureDao; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java index 676d31b35f9..1d7ce182aef 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilders; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java index d810a316b95..c0117b7526e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestResultSetIterator.java @@ -22,7 +22,7 @@ package org.sonar.server.test.index; import org.elasticsearch.action.update.UpdateRequest; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.source.db.FileSourceDto; +import org.sonar.db.source.FileSourceDto; import org.sonar.server.db.DbClient; import org.sonar.server.db.ResultSetIterator; import org.sonar.server.source.db.FileSourceDb; diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java index f5d2b73235f..4a72889caf1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java @@ -31,9 +31,9 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; 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.test.index.CoveredFileDoc; import org.sonar.server.test.index.TestIndex; diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/ws/ListAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/ListAction.java index 55a2cc6bffc..e91373e9fc8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/test/ws/ListAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/test/ws/ListAction.java @@ -33,9 +33,9 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; 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.es.SearchResult; diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java index 5e08f594cc9..8cacd9ef64b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java @@ -41,12 +41,12 @@ import org.sonar.api.web.Footer; import org.sonar.api.web.Page; import org.sonar.api.web.RubyRailsWebservice; import org.sonar.api.web.Widget; -import org.sonar.core.persistence.Database; -import org.sonar.core.persistence.DatabaseVersion; +import org.sonar.db.Database; +import org.sonar.db.version.DatabaseVersion; import org.sonar.core.platform.ComponentContainer; import org.sonar.core.platform.PluginInfo; import org.sonar.core.platform.PluginRepository; -import org.sonar.core.resource.ResourceIndexerDao; +import org.sonar.db.component.ResourceIndexerDao; import org.sonar.core.timemachine.Periods; import org.sonar.process.ProcessProperties; import org.sonar.server.component.ComponentCleanerService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java index 82dc0a805b9..5673d2a8177 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ViewProxy.java @@ -45,7 +45,7 @@ import org.sonar.api.web.WidgetLayoutType; import org.sonar.api.web.WidgetProperties; import org.sonar.api.web.WidgetProperty; import org.sonar.api.web.WidgetScope; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.server.user.UserSession; @SuppressWarnings("rawtypes") diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java index 8b11e056300..8f61df4c9e1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java @@ -40,14 +40,14 @@ import org.sonar.api.utils.text.JsonWriter; import org.sonar.api.web.NavigationSection; import org.sonar.api.web.Page; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.dashboard.ActiveDashboardDao; -import org.sonar.core.dashboard.DashboardDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.dashboard.ActiveDashboardDao; +import org.sonar.db.dashboard.DashboardDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.properties.PropertyDto; -import org.sonar.core.properties.PropertyQuery; +import org.sonar.db.DbSession; +import org.sonar.db.property.PropertyDto; +import org.sonar.db.property.PropertyQuery; import org.sonar.server.db.DbClient; import org.sonar.server.ui.ViewProxy; import org.sonar.server.ui.Views; diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java index 3e0dc705ce2..748d4bd18d8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java @@ -29,8 +29,8 @@ import org.sonar.api.server.ws.WebService.NewController; import org.sonar.api.utils.text.JsonWriter; import org.sonar.api.web.NavigationSection; import org.sonar.api.web.Page; -import org.sonar.core.dashboard.ActiveDashboardDao; -import org.sonar.core.dashboard.DashboardDto; +import org.sonar.db.dashboard.ActiveDashboardDao; +import org.sonar.db.dashboard.DashboardDto; import org.sonar.server.ui.ViewProxy; import org.sonar.server.ui.Views; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipFinder.java b/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipFinder.java index 4e70fa30931..51bc742c2b7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipFinder.java @@ -23,11 +23,11 @@ package org.sonar.server.user; import java.util.List; import org.sonar.api.server.ServerSide; import org.sonar.core.user.GroupMembership; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.GroupMembershipDto; -import org.sonar.core.user.GroupMembershipQuery; -import org.sonar.core.user.UserDao; -import org.sonar.core.user.UserDto; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.GroupMembershipDto; +import org.sonar.db.user.GroupMembershipQuery; +import org.sonar.db.user.UserDao; +import org.sonar.db.user.UserDto; import org.sonar.server.exceptions.NotFoundException; import static com.google.common.collect.Lists.newArrayList; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java b/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java index e50a71ba1c2..8dce4a03f21 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java @@ -22,7 +22,7 @@ package org.sonar.server.user; import java.util.Map; import org.sonar.api.server.ServerSide; -import org.sonar.core.user.GroupMembershipQuery; +import org.sonar.db.user.GroupMembershipQuery; import org.sonar.server.util.RubyUtils; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/RubyUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/RubyUserSession.java index c58d0dd2c16..99901a1e95b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/RubyUserSession.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/RubyUserSession.java @@ -24,8 +24,8 @@ import java.util.List; import javax.annotation.Nullable; import org.sonar.core.platform.ComponentContainer; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.user.AuthorizationDao; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.user.AuthorizationDao; import org.sonar.server.platform.Platform; import org.sonar.server.ui.JRubyI18n; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java index 74580dc4909..70db3b3ccb2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java @@ -27,9 +27,9 @@ import org.sonar.api.security.DefaultGroups; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; -import org.sonar.core.user.AuthorizationDao; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; +import org.sonar.db.user.AuthorizationDao; import static com.google.common.collect.Maps.newHashMap; import static com.google.common.collect.Sets.newHashSet; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java index 9bf7a247775..93925f562ee 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java @@ -38,10 +38,10 @@ import org.sonar.api.config.Settings; import org.sonar.api.platform.NewUserHandler; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDto; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDto; +import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.Message; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java b/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java index 55c3a25916b..5556381a2bd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java @@ -27,16 +27,16 @@ import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; import org.apache.ibatis.session.RowBounds; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupMapper; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupMapper; import org.sonar.server.exceptions.NotFoundException; /** * @since 3.2 */ -public class GroupDao implements DaoComponent { +public class GroupDao implements Dao { private static final String SQL_WILDCARD = "%"; private System2 system; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/db/UserDao.java b/server/sonar-server/src/main/java/org/sonar/server/user/db/UserDao.java index 34ff843b15c..e11986ab029 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/db/UserDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/db/UserDao.java @@ -23,14 +23,14 @@ package org.sonar.server.user.db; import java.util.List; import javax.annotation.CheckForNull; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.user.UserDto; -import org.sonar.core.user.UserMapper; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.user.UserDto; +import org.sonar.db.user.UserMapper; import org.sonar.server.exceptions.NotFoundException; -public class UserDao extends org.sonar.core.user.UserDao implements DaoComponent { +public class UserDao extends org.sonar.db.user.UserDao implements Dao { public UserDao(MyBatis mybatis, System2 system2) { super(mybatis, system2); diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/db/UserGroupDao.java b/server/sonar-server/src/main/java/org/sonar/server/user/db/UserGroupDao.java index 6fc14f52b40..413378e86b2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/db/UserGroupDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/db/UserGroupDao.java @@ -20,12 +20,12 @@ package org.sonar.server.user.db; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.UserGroupDto; -import org.sonar.core.user.UserGroupMapper; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.user.UserGroupDto; +import org.sonar.db.user.UserGroupMapper; -public class UserGroupDao implements DaoComponent { +public class UserGroupDao implements Dao { public UserGroupDto insert(DbSession session, UserGroupDto dto) { mapper(session).insert(dto); diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java index 473af26e653..8dc99faeff7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java @@ -24,7 +24,7 @@ import java.sql.Connection; import java.util.Iterator; import org.apache.commons.dbutils.DbUtils; import org.elasticsearch.action.update.UpdateRequest; -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserResultSetIterator.java b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserResultSetIterator.java index 15e038159a9..c7e834d0e76 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserResultSetIterator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserResultSetIterator.java @@ -21,7 +21,7 @@ package org.sonar.server.user.index; import com.google.common.collect.Maps; import org.apache.commons.lang.StringUtils; -import org.sonar.core.user.UserDto; +import org.sonar.db.user.UserDto; import org.sonar.server.db.DbClient; import org.sonar.server.db.ResultSetIterator; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java index 93ddfc14296..2f6f5af199b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java @@ -29,8 +29,8 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.utils.text.JsonWriter; 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.exceptions.BadRequestException; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java index df070a60d92..889878cd589 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java @@ -29,10 +29,10 @@ import org.sonar.api.server.ws.WebService.SelectionMode; import org.sonar.api.utils.Paging; import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.GroupMembershipDto; -import org.sonar.core.user.GroupMembershipQuery; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.user.GroupMembershipDto; +import org.sonar.db.user.GroupMembershipQuery; +import org.sonar.db.user.UserDto; import org.sonar.server.db.DbClient; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java index 3639183671b..bfb41852ae8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java @@ -33,8 +33,8 @@ import org.sonar.api.server.ws.Response; 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.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.es.SearchOptions; import org.sonar.server.es.SearchResult; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java index b56eec73f5a..3836b33390a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java @@ -28,8 +28,8 @@ 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.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.user.UpdateUser; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java index 8be62d8cb24..cf1e59772e5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java @@ -25,15 +25,15 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.server.ws.WebService.NewController; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDto; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDto; +import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.user.UserSession; -import static org.sonar.core.persistence.MyBatis.closeQuietly; +import static org.sonar.db.MyBatis.closeQuietly; public class AddUserAction implements UserGroupsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java index 56e1f7d76b3..ceaedac87d3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/CreateAction.java @@ -25,12 +25,12 @@ import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.server.ws.WebService.NewController; import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.GroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.user.GroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.user.UserSession; -import static org.sonar.core.persistence.MyBatis.closeQuietly; +import static org.sonar.db.MyBatis.closeQuietly; import static org.sonar.server.usergroups.ws.GroupUpdater.DESCRIPTION_MAX_LENGTH; import static org.sonar.server.usergroups.ws.GroupUpdater.NAME_MAX_LENGTH; import static org.sonar.server.usergroups.ws.GroupUpdater.PARAM_DESCRIPTION; diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java index 71e6c7e3d79..1faf779a895 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java @@ -26,9 +26,9 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService.NewController; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.user.GroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.user.GroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupUpdater.java index 31175d541b9..56c0a0b1b77 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupUpdater.java @@ -24,8 +24,8 @@ import java.net.HttpURLConnection; import org.sonar.api.security.DefaultGroups; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.GroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.user.GroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ServerException; diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java index ab5a72fd278..a49e68db21a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java @@ -24,15 +24,15 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.server.ws.WebService.NewController; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDto; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDto; +import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.user.UserSession; -import static org.sonar.core.persistence.MyBatis.closeQuietly; +import static org.sonar.db.MyBatis.closeQuietly; public class RemoveUserAction implements UserGroupsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java index bcf1c97ca9d..7788423296b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java @@ -34,9 +34,9 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService.NewController; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.user.GroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.user.GroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.es.SearchOptions; diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java index 3aaae84d1b5..c8ba948b205 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UpdateAction.java @@ -26,12 +26,12 @@ import org.sonar.api.server.ws.WebService.NewAction; import org.sonar.api.server.ws.WebService.NewController; import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.GroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.user.GroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.user.UserSession; -import static org.sonar.core.persistence.MyBatis.closeQuietly; +import static org.sonar.db.MyBatis.closeQuietly; import static org.sonar.server.usergroups.ws.GroupUpdater.DESCRIPTION_MAX_LENGTH; import static org.sonar.server.usergroups.ws.GroupUpdater.NAME_MAX_LENGTH; import static org.sonar.server.usergroups.ws.GroupUpdater.PARAM_DESCRIPTION; diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java index 6824b69aad8..68334a09948 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UserGroupsModule.java @@ -19,7 +19,7 @@ */ package org.sonar.server.usergroups.ws; -import org.sonar.core.component.Module; +import org.sonar.core.platform.Module; public class UserGroupsModule extends Module { diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java index 6cb3a52d35f..34176d12cd0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java @@ -29,11 +29,11 @@ import org.sonar.api.server.ws.WebService.SelectionMode; import org.sonar.api.utils.Paging; import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.user.GroupMembershipQuery; -import org.sonar.core.user.UserMembershipDto; -import org.sonar.core.user.UserMembershipQuery; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.user.GroupMembershipQuery; +import org.sonar.db.user.UserMembershipDto; +import org.sonar.db.user.UserMembershipQuery; import org.sonar.server.db.DbClient; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java index 1c12e86c163..2662b5b3150 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewIndexer.java @@ -23,9 +23,9 @@ package org.sonar.server.view.index; import java.util.List; import java.util.Map; import org.elasticsearch.action.update.UpdateRequest; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.UuidWithProjectUuidDto; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.UuidWithProjectUuidDto; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.es.BaseIndexer; import org.sonar.server.es.BulkIndexer; diff --git a/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/ProjectCleanerTest.java b/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/ProjectCleanerTest.java index 6c87b2ab739..bf85d76c00b 100644 --- a/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/ProjectCleanerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/ProjectCleanerTest.java @@ -25,13 +25,14 @@ import org.junit.Test; import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; import org.sonar.api.utils.log.Logger; -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.core.config.PurgeConstants; +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 java.util.Date; @@ -80,7 +81,7 @@ public class ProjectCleanerTest { @Test public void call_period_cleaner_index_client_and_purge_dao() { - settings.setProperty(DbCleanerConstants.DAYS_BEFORE_DELETING_CLOSED_ISSUES, 5); + settings.setProperty(PurgeConstants.DAYS_BEFORE_DELETING_CLOSED_ISSUES, 5); sut.purge(mock(DbSession.class), mock(IdUuidPair.class), settings); diff --git a/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java index c2bb32d8197..487c3abcca0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/activity/ActivityServiceTest.java @@ -28,7 +28,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.activity.db.ActivityDao; import org.sonar.server.activity.index.ActivityDoc; import org.sonar.server.activity.index.ActivityIndexDefinition; diff --git a/server/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java index 5608f473118..bfdf049d5e3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/activity/db/ActivityDaoTest.java @@ -24,8 +24,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; -import org.sonar.core.activity.db.ActivityDto; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.activity.ActivityDto; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; import java.util.Map; diff --git a/server/sonar-server/src/test/java/org/sonar/server/activity/index/ActivityResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/activity/index/ActivityResultSetIteratorTest.java index 0fae6a28d6f..0ece66fcd57 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/activity/index/ActivityResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/activity/index/ActivityResultSetIteratorTest.java @@ -28,7 +28,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.DateUtils; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsTest.java index f0778ab7da0..8ac406d8666 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsTest.java @@ -29,7 +29,7 @@ import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.core.properties.PropertiesDao; +import org.sonar.db.property.PropertiesDao; import org.sonar.server.db.DbClient; import org.sonar.server.issue.index.IssueIndex; import org.sonar.server.tester.UserSessionRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java index 3f26d051c4f..d6e20f479a5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java @@ -27,11 +27,11 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -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.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.DbSession; +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.metric.persistence.MetricDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java index c127fb83405..6a106265a18 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java @@ -32,10 +32,10 @@ import org.sonar.api.security.DefaultGroups; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.Constants.Severity; import org.sonar.batch.protocol.input.BatchInput.ServerIssue; -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.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java index 8b1e5e25166..01c98a28d01 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java @@ -38,15 +38,15 @@ import org.sonar.batch.protocol.input.ActiveRule; import org.sonar.batch.protocol.input.FileData; import org.sonar.batch.protocol.input.ProjectRepositories; import org.sonar.batch.protocol.input.QProfile; -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.properties.PropertyDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.source.db.FileSourceDto; -import org.sonar.core.source.db.FileSourceDto.Type; +import org.sonar.db.DbSession; +import org.sonar.db.property.PropertyDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; +import org.sonar.db.source.FileSourceDto; +import org.sonar.db.source.FileSourceDto.Type; import org.sonar.server.component.ComponentTesting; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceMediumTest.java index 0c70e06c6ee..42c77ff534a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceMediumTest.java @@ -31,9 +31,9 @@ import org.junit.Test; import org.sonar.api.resources.Qualifiers; import org.sonar.api.security.DefaultGroups; import org.sonar.api.web.UserRole; -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.db.DbSession; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java index 35368c5f78e..838ab5af06f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java @@ -34,12 +34,12 @@ import org.sonar.api.i18n.I18n; import org.sonar.api.resources.Qualifiers; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; -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.DbTester; -import org.sonar.core.resource.ResourceIndexerDao; -import org.sonar.core.resource.ResourceKeyUpdaterDao; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.component.ResourceIndexerDao; +import org.sonar.db.component.ResourceKeyUpdaterDao; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java index 8578e2fedc9..27cdebb8488 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java @@ -24,9 +24,9 @@ import com.google.common.base.Preconditions; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; import org.sonar.api.utils.internal.Uuids; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; -import static org.sonar.core.component.ComponentDto.MODULE_UUID_PATH_SEP; +import static org.sonar.db.component.ComponentDto.MODULE_UUID_PATH_SEP; public class ComponentTesting { diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentsFinderSortTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentsFinderSortTest.java index 1e2cd6f51e7..cbf91602b39 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentsFinderSortTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentsFinderSortTest.java @@ -22,7 +22,7 @@ package org.sonar.server.component; import org.junit.Test; import org.sonar.api.component.Component; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import java.util.List; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java index 51fde950b85..771fe687441 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/DefaultRubyComponentServiceTest.java @@ -27,8 +27,8 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.sonar.api.component.Component; import org.sonar.api.resources.Qualifiers; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.resource.ResourceDao; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.ResourceDao; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.permission.InternalPermissionService; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/SnapshotTesting.java b/server/sonar-server/src/test/java/org/sonar/server/component/SnapshotTesting.java index 0f0d6cf3ccb..738c7b5924d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/SnapshotTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/SnapshotTesting.java @@ -22,8 +22,8 @@ package org.sonar.server.component; import com.google.common.base.Preconditions; import org.assertj.core.util.Strings; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; public class SnapshotTesting { diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java index 9a7d5a27d1d..c0efcd49313 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java @@ -30,10 +30,10 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.api.utils.DateUtils; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.FilePathWithHashDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.FilePathWithHashDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.es.SearchOptions; import org.sonar.server.exceptions.NotFoundException; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentIndexDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentIndexDaoTest.java index 24a480baa0f..c14695e3238 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentIndexDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentIndexDaoTest.java @@ -25,8 +25,8 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentLinkDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentLinkDaoTest.java index f29a3ddc20b..68b86c320db 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentLinkDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentLinkDaoTest.java @@ -25,9 +25,9 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.component.ComponentLinkDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.component.ComponentLinkDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; import java.util.List; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/db/SnapshotDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/SnapshotDaoTest.java index 22d6fa06e5b..730542712db 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/db/SnapshotDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/SnapshotDaoTest.java @@ -28,16 +28,16 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.DateUtils; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.component.db.SnapshotQuery; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.component.SnapshotQuery; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; -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; @Category(DbTests.class) public class SnapshotDaoTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java index c29c021743b..354b7890351 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java @@ -35,12 +35,12 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.utils.Duration; import org.sonar.api.utils.Durations; 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.properties.PropertiesDao; -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.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; +import org.sonar.db.property.PropertyQuery; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java index e32288433bd..32caf954616 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java @@ -27,8 +27,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.web.UserRole; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.AuthorizationDao; +import org.sonar.db.DbTester; +import org.sonar.db.user.AuthorizationDao; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.component.db.ComponentIndexDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java index 22cdb93d282..935104f93cb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java @@ -31,8 +31,8 @@ import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; -import org.sonar.core.computation.db.AnalysisReportDto; -import org.sonar.core.computation.db.AnalysisReportDto.Status; +import org.sonar.db.compute.AnalysisReportDto; +import org.sonar.db.compute.AnalysisReportDto.Status; import org.sonar.server.computation.activity.ActivityManager; import org.sonar.server.computation.step.ComputationStep; import org.sonar.server.computation.step.ComputationSteps; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationThreadTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationThreadTest.java index 00d3652e08a..d684d3ad9b5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationThreadTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationThreadTest.java @@ -25,7 +25,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.sonar.api.utils.log.LogTester; -import org.sonar.core.computation.db.AnalysisReportDto; +import org.sonar.db.compute.AnalysisReportDto; import org.sonar.core.platform.ComponentContainer; import org.sonar.server.computation.container.ComputeEngineContainer; import org.sonar.server.computation.container.ContainerFactory; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ReportQueueTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ReportQueueTest.java index 2fcfac3ea86..b2156df45fa 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ReportQueueTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ReportQueueTest.java @@ -30,9 +30,9 @@ import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; import org.sonar.api.config.Settings; import org.sonar.api.utils.System2; -import org.sonar.core.computation.db.AnalysisReportDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.compute.AnalysisReportDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.process.ProcessProperties; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.computation.db.AnalysisReportDao; @@ -46,8 +46,8 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -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; @Category(DbTests.class) public class ReportQueueTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/activity/ActivityManagerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/activity/ActivityManagerTest.java index 4a00b613b68..8be4ff33ba4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/activity/ActivityManagerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/activity/ActivityManagerTest.java @@ -24,8 +24,8 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.ArgumentCaptor; -import org.sonar.core.computation.db.AnalysisReportDto; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.compute.AnalysisReportDto; +import org.sonar.db.DbTester; import org.sonar.server.activity.Activity; import org.sonar.server.activity.ActivityService; import org.sonar.server.component.db.ComponentDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java index 749ff7351f0..e754baded51 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java @@ -26,11 +26,11 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.config.Settings; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/db/AnalysisReportDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/db/AnalysisReportDaoTest.java index 0b636a01c33..17480756c21 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/db/AnalysisReportDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/db/AnalysisReportDaoTest.java @@ -28,10 +28,10 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; import org.sonar.api.utils.System2; -import org.sonar.core.computation.db.AnalysisReportDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.compute.AnalysisReportDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.MyBatis; import org.sonar.test.DbTests; import java.util.List; @@ -39,8 +39,8 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -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; @Category(DbTests.class) public class AnalysisReportDaoTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java index f07db4e1b6d..47b933a4ffc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java @@ -55,7 +55,7 @@ //import org.sonar.api.utils.System2; //import org.sonar.api.utils.log.LogTester; //import org.sonar.batch.protocol.output.BatchReport; -//import org.sonar.core.rule.RuleDto; +//import org.sonar.db.rule.RuleDto; //import org.sonar.server.computation.batch.BatchReportReaderRule; //import org.sonar.server.computation.component.ProjectSettingsRepository; //import org.sonar.server.user.index.UserDoc; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/NewDebtCalculatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/NewDebtCalculatorTest.java index 37add915d09..f6afc136df4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/NewDebtCalculatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/NewDebtCalculatorTest.java @@ -29,7 +29,7 @@ import org.sonar.api.CoreProperties; import org.sonar.api.utils.Duration; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.FieldDiffs; -import org.sonar.core.issue.db.IssueChangeDto; +import org.sonar.db.issue.IssueChangeDto; import org.sonar.server.computation.period.Period; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java index 0457c5dc0f2..917e0f3605c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java @@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.db.DbClient; import org.sonar.server.rule.db.RuleDao; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/UpdateConflictResolverTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/UpdateConflictResolverTest.java index 9a4d5037901..c1fe31c3bbc 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/UpdateConflictResolverTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/UpdateConflictResolverTest.java @@ -17,18 +17,22 @@ * 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 org.junit.Test; import org.mockito.ArgumentCaptor; import org.sonar.api.issue.Issue; -import org.sonar.core.issue.DefaultIssue; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.api.utils.DateUtils; +import org.sonar.core.issue.DefaultIssue; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.issue.IssueMapper; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class UpdateConflictResolverTest { @@ -52,9 +56,9 @@ public class UpdateConflictResolverTest { .setLine(10) .setStatus(Issue.STATUS_OPEN) - // field changed by user + // field changed by user .setAssignee("arthur") - ); + ); new UpdateConflictResolver().resolve(issue, mapper); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureDtoToMeasureTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureDtoToMeasureTest.java index 85fa5722ddf..77325419571 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureDtoToMeasureTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureDtoToMeasureTest.java @@ -27,7 +27,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; -import org.sonar.core.measure.db.MeasureDto; +import org.sonar.db.measure.MeasureDto; import org.sonar.server.computation.measure.Measure.Level; import org.sonar.server.computation.metric.Metric; import org.sonar.server.computation.metric.MetricImpl; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java index 67d0a10e685..15c46891992 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java @@ -38,10 +38,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.sonar.api.rule.RuleKey; 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.DbTester; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.rule.RuleDto; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.component.db.SnapshotDao; import org.sonar.server.computation.batch.BatchReportReader; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryRule.java index 28e2332d115..dda1db6c940 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryRule.java @@ -30,7 +30,7 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.junit.rules.ExternalResource; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.ComponentVisitor; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureToMeasureDtoTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureToMeasureDtoTest.java index 96a5af26a7d..e59068cca42 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureToMeasureDtoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureToMeasureDtoTest.java @@ -24,7 +24,7 @@ import com.tngtech.java.junit.dataprovider.DataProviderRunner; import com.tngtech.java.junit.dataprovider.UseDataProvider; import org.junit.Test; import org.junit.runner.RunWith; -import org.sonar.core.measure.db.MeasureDto; +import org.sonar.db.measure.MeasureDto; import org.sonar.server.computation.metric.Metric; import org.sonar.server.computation.metric.MetricImpl; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricDtoToMetricTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricDtoToMetricTest.java index d4f04fbde21..5396edde70f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricDtoToMetricTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricDtoToMetricTest.java @@ -20,7 +20,7 @@ package org.sonar.server.computation.metric; import org.junit.Test; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.metric.MetricDto; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java index 5224b634269..dc95314ae8f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java @@ -25,7 +25,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.metric.persistence.MetricDao; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateServiceImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateServiceImplTest.java index df05d59e0bf..cf238d063c5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateServiceImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/qualitygate/QualityGateServiceImplTest.java @@ -23,10 +23,10 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.util.Collections; import org.junit.Test; -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; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java index 686a2572b84..3789643c89c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java @@ -32,15 +32,15 @@ import org.sonar.api.config.Settings; import org.sonar.api.security.DefaultGroups; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.permission.PermissionFacade; -import org.sonar.core.permission.PermissionTemplateDao; -import org.sonar.core.permission.PermissionTemplateDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.user.GroupRoleDto; -import org.sonar.core.user.RoleDao; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.permission.PermissionFacade; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.permission.PermissionTemplateDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.user.GroupRoleDto; +import org.sonar.db.user.RoleDao; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.computation.batch.TreeRootHolderRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java index 5ba5dd55d3a..fd22ccb71bf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java @@ -25,8 +25,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.ArgumentCaptor; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.DbTester; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DumbComponent; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java index 429b2c3282f..5ff799f77e4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java @@ -25,9 +25,9 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.debt.CharacteristicDao; import org.sonar.server.computation.debt.Characteristic; import org.sonar.server.computation.debt.DebtModelHolderImpl; import org.sonar.server.computation.debt.MutableDebtModelHolder; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java index 12bc74b4334..632569fa956 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java @@ -34,8 +34,8 @@ import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; import org.sonar.api.utils.log.LogTester; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.component.db.SnapshotDao; import org.sonar.server.computation.batch.BatchReportReaderRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillComponentsStepTest.java index 090398d6a23..4240a27ba60 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillComponentsStepTest.java @@ -30,10 +30,10 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.MyBatis; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.computation.batch.BatchReportReaderRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java index 786fdcce131..1cdc8389733 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java @@ -29,13 +29,13 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -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.DbTester; -import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.debt.CharacteristicDao; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.component.db.SnapshotDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java index 00aed4c760b..f5fe742e7ca 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java @@ -23,7 +23,7 @@ package org.sonar.server.computation.step; import java.io.IOException; import org.junit.Rule; import org.junit.Test; -import org.sonar.core.resource.ResourceIndexerDao; +import org.sonar.db.component.ResourceIndexerDao; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java index bce022a2745..1203f3a8ac2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java @@ -27,7 +27,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DumbComponent; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java index 6a53a5ed29c..ba2491deaa8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java @@ -28,7 +28,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DumbComponent; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java index 94d0edbe395..abf452c57a4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java @@ -32,9 +32,9 @@ import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.component.db.SnapshotDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java index b5ace55beb3..47676ecf0c7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java @@ -30,9 +30,9 @@ import org.junit.experimental.categories.Category; 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.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java index 38fd8378950..a2294bb1530 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java @@ -30,8 +30,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java index edcd04043d6..a425810a066 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java @@ -34,10 +34,10 @@ import org.sonar.api.resources.Language; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.source.db.FileSourceDto; -import org.sonar.core.source.db.FileSourceDto.Type; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.source.FileSourceDto; +import org.sonar.db.source.FileSourceDto.Type; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java index fbb5aae1c1a..07fea4201d7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java @@ -34,9 +34,9 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.FieldDiffs; -import org.sonar.core.issue.db.UpdateConflictResolver; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.server.computation.issue.UpdateConflictResolver; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.issue.IssueCache; import org.sonar.server.computation.issue.RuleCacheLoader; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java index f6d18a644dd..7d3ad333d7f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java @@ -33,10 +33,10 @@ import org.sonar.api.utils.System2; import org.sonar.api.utils.internal.Uuids; import org.sonar.batch.protocol.Constants.MeasureValueType; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.rule.RuleDto; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java index 169e0fb9576..28a82331bc3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java @@ -29,7 +29,7 @@ import org.sonar.api.config.Settings; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java index 4a199bac406..5996fc35d22 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java @@ -30,8 +30,8 @@ import org.junit.experimental.categories.Category; import org.sonar.api.i18n.I18n; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.db.ComponentLinkDao; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java index e652df89b41..d4c583cc739 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java @@ -31,11 +31,11 @@ import org.sonar.api.CoreProperties; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.output.BatchReport; -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.core.persistence.DbTester; +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.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.SnapshotTesting; import org.sonar.server.component.db.ComponentDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java index 5722571f79d..cf96586ebe9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java @@ -33,10 +33,10 @@ import org.sonar.api.utils.log.LoggerLevel; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.batch.protocol.output.BatchReport.CoverageDetail; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.source.db.FileSourceDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.MyBatis; +import org.sonar.db.source.FileSourceDto; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java index ffb00f9d3cd..e7850ac4e1d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java @@ -29,8 +29,8 @@ import org.mockito.Mockito; import org.sonar.api.config.Settings; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.computation.dbcleaner.ProjectCleaner; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.purge.IdUuidPair; +import org.sonar.db.DbSession; +import org.sonar.db.purge.IdUuidPair; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java index 8d2342f90ee..a9e703e5e43 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java @@ -36,7 +36,7 @@ import org.mockito.stubbing.Answer; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.resources.AbstractLanguage; import org.sonar.api.resources.Language; -import org.sonar.core.UtcDateUtils; +import org.sonar.core.util.UtcDateUtils; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DumbComponent; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportExtractionStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportExtractionStepTest.java index 5f0cefd713f..1d4371b9e93 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportExtractionStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportExtractionStepTest.java @@ -32,7 +32,7 @@ import org.mockito.ArgumentCaptor; import org.sonar.api.utils.internal.JUnitTempFolder; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; -import org.sonar.core.computation.db.AnalysisReportDto; +import org.sonar.db.compute.AnalysisReportDto; import org.sonar.server.computation.ReportQueue; import org.sonar.server.computation.batch.MutableBatchReportDirectoryHolder; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java index b43e283e108..0e6362328d4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.component.db.SnapshotDao; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java index feca62fff9d..6c9d67d28c8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java @@ -32,9 +32,9 @@ import org.sonar.api.config.Settings; import org.sonar.api.utils.MessageException; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.SnapshotTesting; import org.sonar.server.component.db.ComponentDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/HistoryActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/HistoryActionMediumTest.java index 42a93b83300..f971c31a338 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/HistoryActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/HistoryActionMediumTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.sonar.core.computation.db.AnalysisReportDto; +import org.sonar.db.compute.AnalysisReportDto; import org.sonar.core.permission.GlobalPermissions; import org.sonar.server.activity.Activity; import org.sonar.server.activity.ActivityService; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java index e88401ec61a..a170469766f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.Test; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; -import org.sonar.core.computation.db.AnalysisReportDto; +import org.sonar.db.compute.AnalysisReportDto; import org.sonar.server.computation.ReportQueue; import java.io.ByteArrayOutputStream; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueActionTest.java index 9da351bc172..e74d9d15416 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueActionTest.java @@ -24,7 +24,7 @@ import com.google.common.collect.Lists; import org.junit.Before; import org.junit.Test; import org.sonar.api.utils.DateUtils; -import org.sonar.core.computation.db.AnalysisReportDto; +import org.sonar.db.compute.AnalysisReportDto; import org.sonar.server.computation.ReportQueue; import org.sonar.server.ws.WsTester; @@ -33,7 +33,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.sonar.core.computation.db.AnalysisReportDto.Status.PENDING; +import static org.sonar.db.compute.AnalysisReportDto.Status.PENDING; public class QueueActionTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitReportActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitReportActionTest.java index e0dd6760804..6a2016b5be2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitReportActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitReportActionTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.server.ws.WebService; -import org.sonar.core.computation.db.AnalysisReportDto; +import org.sonar.db.compute.AnalysisReportDto; import org.sonar.core.permission.GlobalPermissions; import org.sonar.server.computation.ComputationThreadLauncher; import org.sonar.server.computation.ReportQueue; diff --git a/server/sonar-server/src/test/java/org/sonar/server/dashboard/db/WidgetDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/dashboard/db/WidgetDaoTest.java index 65af6e084cb..7d8d0595ec4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/dashboard/db/WidgetDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/dashboard/db/WidgetDaoTest.java @@ -24,10 +24,10 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.dashboard.WidgetDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.dashboard.WidgetDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.MyBatis; import org.sonar.test.DbTests; import java.util.Collection; diff --git a/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/GlobalDefaultDashboardTest.java b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/GlobalDefaultDashboardTest.java index f9f784bd830..49b97643472 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/GlobalDefaultDashboardTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/GlobalDefaultDashboardTest.java @@ -24,8 +24,8 @@ import org.junit.Before; import org.junit.Test; import org.sonar.api.web.Dashboard; import org.sonar.api.web.Dashboard.Widget; -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; diff --git a/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest.java b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest.java index b84c0a00ae1..b8cca4a557e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/dashboard/template/ProjectIssuesDashboardTest.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.web.Dashboard; import org.sonar.api.web.DashboardLayout; -import org.sonar.core.issue.db.IssueFilterDao; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.issue.IssueFilterDao; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java index d2d4826b37d..59d860f1dc9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/BaseDaoTest.java @@ -27,9 +27,9 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; import org.sonar.api.utils.internal.Uuids; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.DbTester; import org.sonar.server.db.fake.FakeDao; import org.sonar.server.db.fake.FakeDto; import org.sonar.server.db.fake.FakeMapper; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/DatabaseCheckerTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/DatabaseCheckerTest.java index 7204cce22c9..da0e53d6808 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/DatabaseCheckerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/DatabaseCheckerTest.java @@ -23,11 +23,11 @@ import org.apache.commons.lang.StringUtils; import org.junit.Test; import org.mockito.Mockito; import org.sonar.api.utils.MessageException; -import org.sonar.core.persistence.Database; -import org.sonar.core.persistence.dialect.Dialect; -import org.sonar.core.persistence.dialect.H2; -import org.sonar.core.persistence.dialect.MySql; -import org.sonar.core.persistence.dialect.Oracle; +import org.sonar.db.Database; +import org.sonar.db.dialect.Dialect; +import org.sonar.db.dialect.H2; +import org.sonar.db.dialect.MySql; +import org.sonar.db.dialect.Oracle; import java.sql.SQLException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java index 838328cc937..8c9ae2e8e45 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java @@ -23,10 +23,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.qualityprofile.db.QualityProfileDao; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.MyBatis; +import org.sonar.db.qualityprofile.QualityProfileDao; import org.sonar.server.qualityprofile.db.ActiveRuleDao; import org.sonar.server.rule.db.RuleDao; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/ResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/ResultSetIteratorTest.java index e4380a7e28c..3aa7f6a5b73 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/ResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/ResultSetIteratorTest.java @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; import java.sql.Connection; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/fake/FakeDao.java b/server/sonar-server/src/test/java/org/sonar/server/db/fake/FakeDao.java index 73ec0efcc47..b105f56d36c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/fake/FakeDao.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/fake/FakeDao.java @@ -20,7 +20,7 @@ package org.sonar.server.db.fake; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.db.BaseDao; import org.sonar.server.search.IndexDefinition; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/fake/FakeDto.java b/server/sonar-server/src/test/java/org/sonar/server/db/fake/FakeDto.java index 592becd09ec..592298ba67d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/fake/FakeDto.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/fake/FakeDto.java @@ -19,7 +19,7 @@ */ package org.sonar.server.db.fake; -import org.sonar.core.persistence.Dto; +import org.sonar.db.Dto; public class FakeDto extends Dto<String> { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/AddColumnsBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/AddColumnsBuilderTest.java index a7c9f19340a..2ce3e5b8b9a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/AddColumnsBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/AddColumnsBuilderTest.java @@ -20,11 +20,11 @@ package org.sonar.server.db.migrations; import org.junit.Test; -import org.sonar.core.persistence.dialect.H2; -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.H2; +import org.sonar.db.dialect.MsSql; +import org.sonar.db.dialect.MySql; +import org.sonar.db.dialect.Oracle; +import org.sonar.db.dialect.PostgreSql; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java index 38e9edd51d6..5ae0b495006 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/BaseDataChangeTest.java @@ -25,9 +25,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.BatchSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.BatchSession; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.Select.Row; import org.sonar.server.db.migrations.Select.RowReader; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigratorTest.java index 877455432af..15e6e013aba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/DatabaseMigratorTest.java @@ -25,11 +25,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; import org.sonar.api.platform.ServerUpgradeStatus; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.dialect.Dialect; -import org.sonar.core.persistence.dialect.H2; -import org.sonar.core.persistence.dialect.MySql; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; +import org.sonar.db.dialect.Dialect; +import org.sonar.db.dialect.H2; +import org.sonar.db.dialect.MySql; import org.sonar.server.db.DbClient; import java.sql.Connection; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/DropColumnsBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/DropColumnsBuilderTest.java index 6c1e67945b8..eae6d7aec34 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/DropColumnsBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/DropColumnsBuilderTest.java @@ -20,7 +20,11 @@ package org.sonar.server.db.migrations; import org.junit.Test; -import org.sonar.core.persistence.dialect.*; +import org.sonar.db.dialect.H2; +import org.sonar.db.dialect.MsSql; +import org.sonar.db.dialect.MySql; +import org.sonar.db.dialect.Oracle; +import org.sonar.db.dialect.PostgreSql; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java index 869dff59537..5d377c2c6fc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v36/ViolationMigrationTest.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations.v36; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.config.Settings; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java index 9250a571042..a98a6615f94 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/CompleteIssueMessageMigrationTest.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v42; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class CompleteIssueMessageMigrationTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java index c292eefd178..8fa88c87fd2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v42/PackageKeysMigrationTest.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v42; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class PackageKeysMigrationTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStepTest.java index fed7264f748..be103757c15 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStepTest.java @@ -28,9 +28,9 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.DbTester; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import java.util.List; import java.util.Map; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStepTest.java index 60e7bb11af5..f6440896649 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/DevelopmentCostMeasuresMigrationStepTest.java @@ -26,9 +26,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.DbTester; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import static org.mockito.Mockito.when; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStepTest.java index de38b9eb7e5..ef4a0d175af 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/IssueChangelogMigrationStepTest.java @@ -28,9 +28,9 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.DbTester; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStepTest.java index 8a47e64b282..9c2098288fe 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/NotResolvedIssuesOnRemovedComponentsMigrationStepTest.java @@ -28,7 +28,7 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import static org.mockito.Mockito.when; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStepTest.java index c1d7f9932af..2a95d9aff1d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/RequirementMeasuresMigrationStepTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v43; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; public class RequirementMeasuresMigrationStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStepTest.java index 1adb672c4a0..b50adc14f4d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/TechnicalDebtMeasuresMigrationStepTest.java @@ -26,9 +26,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.DbTester; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import static org.mockito.Mockito.when; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/WorkDurationConvertorTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/WorkDurationConvertorTest.java index 5dcb16bfdf4..b1702378e5a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/WorkDurationConvertorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v43/WorkDurationConvertorTest.java @@ -21,8 +21,8 @@ package org.sonar.server.db.migrations.v43; import org.junit.Test; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java index 78730a3b0be..c48f20771e4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ChangeLogMigrationTest.java @@ -25,8 +25,8 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.activity.db.ActivityDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java index 1e37ec60c79..c9823f04f56 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v44; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import java.sql.Connection; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java index 2ff095da737..aca0c351dcb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java @@ -24,8 +24,8 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.UtcDateUtils; -import org.sonar.core.persistence.DbTester; +import org.sonar.core.util.UtcDateUtils; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import java.util.Map; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java index 89697240cee..770fb78dd87 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileKeysMigrationTest.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations.v44; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import java.util.List; import java.util.Map; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java index 92b817e8dc9..5c0e4ac744a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/IssueActionPlanKeyMigrationTest.java @@ -28,7 +28,7 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import static org.mockito.Mockito.when; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java index aa86b64d69d..b863f7fb2d8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/MeasureDataMigrationTest.java @@ -25,7 +25,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; @RunWith(MockitoJUnitRunner.class) public class MeasureDataMigrationTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationTest.java index d9af88e441e..b58f35660f7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/AddMissingRuleParameterDefaultValuesMigrationTest.java @@ -24,7 +24,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationTest.java index e0c22d4ddb2..d5455854200 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v45; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.db.migrations.MigrationStep; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationTest.java index 6234aae32bd..f8e732e4346 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationTest.java @@ -24,7 +24,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.db.migrations.MigrationStep; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivitiesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivitiesTest.java index 79d62c49ac6..cd4c5c60cc1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivitiesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivitiesTest.java @@ -21,7 +21,7 @@ package org.sonar.server.db.migrations.v451; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedFileSourcesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedFileSourcesTest.java index 33f94cf7010..9460abe4a4a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedFileSourcesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedFileSourcesTest.java @@ -26,7 +26,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import java.nio.charset.StandardCharsets; import java.sql.Connection; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedIssueLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedIssueLongDatesTest.java index 9668a68524e..9b2d4983017 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedIssueLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FeedIssueLongDatesTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v50; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java index 23fdd41681f..78e4b4fcb26 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/InsertProjectsAuthorizationUpdatedAtMigrationTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest.java index 7adde185508..7548811cf62 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/PopulateProjectsUuidColumnsMigrationTest.java @@ -25,10 +25,10 @@ import org.junit.After; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.persistence.migration.v50.Component; -import org.sonar.core.persistence.migration.v50.Migration50Mapper; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.version.v50.Component; +import org.sonar.db.version.v50.Migration50Mapper; import org.sonar.server.db.DbClient; import org.sonar.server.db.migrations.MigrationStep; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationTest.java index e71a69da294..50e117e9a3c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/RemoveSortFieldFromIssueFiltersMigrationTest.java @@ -24,7 +24,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuidTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuidTest.java index 06494e4d46c..11f82c5557f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuidTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/ReplaceIssueFiltersProjectKeyByUuidTest.java @@ -24,7 +24,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddIssuesColumnsTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddIssuesColumnsTest.java index 784401f29cb..1d275951535 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddIssuesColumnsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddIssuesColumnsTest.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import java.sql.Types; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest.java index f5cc219ca1b..611b36302a8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/AddNewCharacteristicsTest.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.MessageException; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static junit.framework.TestCase.fail; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsersTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsersTest.java index 225008d884f..425ebef8ddf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsersTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/CopyScmAccountsFromAuthorsToUsersTest.java @@ -24,8 +24,8 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbTester; +import org.sonar.db.user.UserDto; import org.sonar.server.db.migrations.MigrationStep; import java.util.Map; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/DropIssuesColumnsTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/DropIssuesColumnsTest.java index a510574d1ee..37b4f6c05dd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/DropIssuesColumnsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/DropIssuesColumnsTest.java @@ -21,8 +21,8 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.Database; -import org.sonar.core.persistence.dialect.PostgreSql; +import org.sonar.db.Database; +import org.sonar.db.dialect.PostgreSql; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDatesTest.java index 007c7b68ac9..c60ff98f2a5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedAnalysisReportsLongDatesTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedEventsLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedEventsLongDatesTest.java index 6bfce09f823..996f5541efd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedEventsLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedEventsLongDatesTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryDataTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryDataTest.java index 7496712e7b9..050bcd4acb9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryDataTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedFileSourcesBinaryDataTest.java @@ -24,8 +24,8 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -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.migrations.MigrationStep; import org.sonar.server.source.db.FileSourceDb; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDatesTest.java index ea5a6ada331..3dcb9dbd0b3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueChangesLongDatesTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuidsTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuidsTest.java index cdc3c049bb9..c7cb885211c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuidsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueComponentUuidsTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; public class FeedIssueComponentUuidsTest { @ClassRule diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueTagsTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueTagsTest.java index 9eae280d327..9ca104a837b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueTagsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssueTagsTest.java @@ -24,7 +24,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import java.util.Date; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDatesTest.java index 1044ad73d45..cc818e5b5ee 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedIssuesLongDatesTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDatesTest.java index 0e29d0d78f4..01007f370f2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedManualMeasuresLongDatesTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDatesTest.java index 09edce288fe..172ea26ba2a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSemaphoresLongDatesTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDatesTest.java index 16e45e770e5..bcdeaa85757 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedSnapshotsLongDatesTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedUsersLongDatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedUsersLongDatesTest.java index e31d843500a..25b2d3551c3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedUsersLongDatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/FeedUsersLongDatesTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationTest.java index 49b62c3a8e2..e004d2c4b7e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationTest.java @@ -22,7 +22,7 @@ package org.sonar.server.db.migrations.v51; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class RemovePermissionsOnModulesMigrationTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFiltersMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFiltersMigrationTest.java index ace0591da3b..dc27518622e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFiltersMigrationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/RenameComponentRelatedParamsInIssueFiltersMigrationTest.java @@ -24,7 +24,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPathTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPathTest.java index bb2d0567eeb..541ee1faf30 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPathTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v51/UpdateProjectsModuleUuidPathTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class UpdateProjectsModuleUuidPathTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java index c60f2f3e00f..03eca8a0adf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java @@ -24,7 +24,7 @@ import java.sql.Types; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; public class AddManualMeasuresComponentUuidColumnTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuidTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuidTest.java index 42d8fc3eaf8..d733f25596a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuidTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedEventsComponentUuidTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class FeedEventsComponentUuidTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataTypeTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataTypeTest.java index b8f0cf1f6f4..f39d1e0c688 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataTypeTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedFileSourcesDataTypeTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class FeedFileSourcesDataTypeTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java index 41df873ec9f..ff79022f42a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; public class FeedManualMeasuresComponentUuidTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleansTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleansTest.java index aac8b55a99b..078ed7b348d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleansTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedMetricsBooleansTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class FeedMetricsBooleansTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuidTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuidTest.java index 593d87f5c40..cea982f96ed 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuidTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedProjectLinksComponentUuidTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class FeedProjectLinksComponentUuidTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociationTest.java index 5b2545ba8bb..75fff962568 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/MoveProjectProfileAssociationTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class MoveProjectProfileAssociationTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveComponentLibrariesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveComponentLibrariesTest.java index a20f54ffcde..f6bdb94d675 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveComponentLibrariesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveComponentLibrariesTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class RemoveComponentLibrariesTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibrariesTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibrariesTest.java index 6ddd7a57b88..96bdf99c7fa 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibrariesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/RemoveSnapshotLibrariesTest.java @@ -23,7 +23,7 @@ package org.sonar.server.db.migrations.v52; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.migrations.MigrationStep; public class RemoveSnapshotLibrariesTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java index 66196e232a9..472086bd4fd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java @@ -45,10 +45,10 @@ import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.api.utils.ValidationMessages; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.technicaldebt.db.CharacteristicDao; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.debt.CharacteristicDao; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.debt.DebtModelXMLExporter.DebtModel; import org.sonar.server.debt.DebtModelXMLExporter.RuleDebt; diff --git a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelLookupTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelLookupTest.java index 9c3c3905720..01a3f681c49 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelLookupTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelLookupTest.java @@ -26,8 +26,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.server.debt.internal.DefaultDebtCharacteristic; -import org.sonar.core.technicaldebt.db.CharacteristicDao; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.debt.CharacteristicDao; +import org.sonar.db.debt.CharacteristicDto; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java index 2ef3283dd68..bb2608a0c93 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java @@ -38,10 +38,10 @@ import org.sonar.api.server.debt.internal.DefaultDebtCharacteristic; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.technicaldebt.db.CharacteristicDao; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.debt.CharacteristicDao; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtTesting.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtTesting.java index d35d08ba3b3..9c7b4ae0356 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtTesting.java @@ -20,7 +20,7 @@ package org.sonar.server.debt; import org.apache.commons.lang.StringUtils; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.debt.CharacteristicDto; public class DebtTesting { private DebtTesting() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java index d05ef2052a2..13c6e2cdc8a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsJsonWriterTest.java @@ -26,8 +26,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.utils.text.JsonWriter; -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.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.test.JsonAssert; diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java index d4b43ab4fc5..2ae0f5210d9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java @@ -29,8 +29,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -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.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java index 95e0d7ec791..0786e0bf6fa 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java @@ -30,9 +30,9 @@ import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.measures.CoreMetrics; 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.db.component.ComponentDto; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.DbSession; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/event/db/EventDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/event/db/EventDaoTest.java index 7639a6260bc..f30b437f38c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/event/db/EventDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/event/db/EventDaoTest.java @@ -25,9 +25,9 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.event.EventDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.event.EventDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; import java.util.List; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java index 1738484d0c8..0334d107abc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java @@ -30,13 +30,12 @@ import org.sonar.api.issue.action.Function; import org.sonar.api.issue.condition.Condition; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.issue.IssueUpdater; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.issue.db.IssueStorage; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.DbSession; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java index 392c7182df1..81bf4ad2614 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/InternalRubyIssueServiceTest.java @@ -38,11 +38,11 @@ import org.sonar.core.issue.FieldDiffs; import org.sonar.api.user.User; import org.sonar.api.web.UserRole; import org.sonar.core.issue.DefaultActionPlan; -import org.sonar.core.issue.db.IssueFilterDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; -import org.sonar.core.resource.ResourceQuery; +import org.sonar.db.issue.IssueFilterDto; +import org.sonar.db.DbSession; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; +import org.sonar.db.component.ResourceQuery; import org.sonar.server.component.ws.ComponentJsonWriter; import org.sonar.server.db.DbClient; import org.sonar.server.es.SearchOptions; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java index 992df6249f9..9500605c7ef 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceMediumTest.java @@ -32,13 +32,13 @@ import org.sonar.api.issue.DefaultTransitions; import org.sonar.api.issue.Issue; import org.sonar.api.security.DefaultGroups; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.issue.db.IssueDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.issue.IssueDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.user.UserDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.SnapshotTesting; import org.sonar.server.component.db.ComponentDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java index f06bea4e57b..df470edf4a8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueChangelogServiceTest.java @@ -31,7 +31,7 @@ import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.FieldDiffs; import org.sonar.api.user.User; import org.sonar.api.user.UserFinder; -import org.sonar.core.issue.db.IssueChangeDao; +import org.sonar.db.issue.IssueChangeDao; import org.sonar.core.user.DefaultUser; import org.sonar.server.tester.UserSessionRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java index d0bdd68ea9d..99f0bde1609 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceMediumTest.java @@ -32,12 +32,12 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.security.DefaultGroups; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.issue.db.IssueDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.issue.IssueDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.SnapshotTesting; import org.sonar.server.component.db.ComponentDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java index 51d64252b1f..808b900ca0e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java @@ -32,11 +32,11 @@ import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.IssueChangeContext; import org.sonar.core.issue.IssueUpdater; -import org.sonar.core.issue.db.IssueChangeDao; -import org.sonar.core.issue.db.IssueChangeDto; -import org.sonar.core.issue.db.IssueDto; +import org.sonar.db.issue.IssueChangeDao; +import org.sonar.db.issue.IssueChangeDto; +import org.sonar.db.issue.IssueDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.component.ComponentTesting; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java index 39e3934b4be..d5ca0fc71e9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java @@ -42,9 +42,9 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.AuthorDao; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.user.AuthorDao; import org.sonar.server.component.ComponentService; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java index 60092ddb04f..3f7085ff1a1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java @@ -38,15 +38,15 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.api.security.DefaultGroups; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.issue.db.ActionPlanDto; -import org.sonar.core.issue.db.IssueDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.issue.ActionPlanDto; +import org.sonar.db.issue.IssueDto; import org.sonar.core.issue.workflow.Transition; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java index 259f751c12e..1ec06c32961 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java @@ -17,27 +17,28 @@ * 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.issue; +import java.util.Collection; +import java.util.Date; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.sonar.core.issue.DefaultIssue; -import org.sonar.core.issue.DefaultIssueComment; -import org.sonar.core.issue.IssueChangeContext; import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RuleFinder; import org.sonar.api.rules.RuleQuery; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.Duration; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; - -import java.util.Collection; -import java.util.Date; +import org.sonar.core.issue.DefaultIssue; +import org.sonar.core.issue.DefaultIssueComment; +import org.sonar.core.issue.IssueChangeContext; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.issue.IssueMapper; public class IssueStorageTest extends AbstractDaoTestCase { diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java index c1e5f421bca..e3311a9110a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueTesting.java @@ -25,9 +25,9 @@ import org.sonar.api.resources.Scopes; import org.sonar.api.rule.Severity; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.internal.Uuids; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.issue.index.IssueDoc; import org.sonar.server.rule.RuleTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java index 80ede6a36f0..144d236112d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.commons.lang.time.DateUtils; import org.junit.Rule; import org.junit.Test; -import org.sonar.core.issue.db.IssueDto; +import org.sonar.db.issue.IssueDto; import org.sonar.server.tester.UserSessionRule; import static com.google.common.collect.Lists.newArrayList; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java index 08e41c95fca..2714599bb2c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java @@ -22,7 +22,7 @@ package org.sonar.server.issue; import org.junit.Test; import org.sonar.api.rule.RuleKey; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.rule.RuleTesting; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java index e295b3c965f..09c84f75816 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java @@ -33,9 +33,9 @@ import org.sonar.api.rules.RuleQuery; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.Duration; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.resource.ResourceDao; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; +import org.sonar.db.component.ResourceDao; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.issue.db.IssueDao; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/ActionPlanDeadlineComparatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanDeadlineComparatorTest.java index 9950e249cb6..d68f9429420 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/ActionPlanDeadlineComparatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanDeadlineComparatorTest.java @@ -17,15 +17,15 @@ * 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; - -import org.junit.Test; -import org.sonar.api.issue.ActionPlan; -import org.sonar.api.utils.DateUtils; +package org.sonar.server.issue.actionplan; import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.junit.Test; +import org.sonar.api.issue.ActionPlan; +import org.sonar.api.utils.DateUtils; +import org.sonar.core.issue.DefaultActionPlan; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java index 500f85a8348..c05dfceaa14 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java @@ -34,16 +34,16 @@ import org.sonar.api.web.UserRole; import org.sonar.core.issue.ActionPlanStats; import org.sonar.core.issue.DefaultActionPlan; import org.sonar.core.issue.IssueUpdater; -import org.sonar.core.issue.db.ActionPlanDao; -import org.sonar.core.issue.db.ActionPlanDto; -import org.sonar.core.issue.db.ActionPlanStatsDao; -import org.sonar.core.issue.db.ActionPlanStatsDto; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.issue.db.IssueStorage; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; -import org.sonar.core.resource.ResourceQuery; +import org.sonar.db.issue.ActionPlanDao; +import org.sonar.db.issue.ActionPlanDto; +import org.sonar.db.issue.ActionPlanStatsDao; +import org.sonar.db.issue.ActionPlanStatsDto; +import org.sonar.db.issue.IssueDto; +import org.sonar.server.issue.IssueStorage; +import org.sonar.db.DbSession; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; +import org.sonar.db.component.ResourceQuery; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueDaoTest.java index 4c89e886a8b..580336a0833 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueDaoTest.java @@ -23,10 +23,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.sonar.api.rule.RuleKey; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; import org.sonar.server.rule.RuleTesting; import java.util.Arrays; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java index 31821775dca..c82918b71ed 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/AppActionTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.core.issue.db.IssueFilterDto; +import org.sonar.db.issue.IssueFilterDto; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java index bc03da1f778..c46ffa1f68f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/FavoritesActionTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.core.issue.db.IssueFilterDto; +import org.sonar.db.issue.IssueFilterDto; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/IssueFilterSerializerTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterSerializerTest.java index 5b992dd50d1..4c04d36d704 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/IssueFilterSerializerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterSerializerTest.java @@ -18,12 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue; - -import org.junit.Test; +package org.sonar.server.issue.filter; import java.util.List; import java.util.Map; +import org.junit.Test; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newLinkedHashMap; @@ -84,5 +83,4 @@ public class IssueFilterSerializerTest { assertThat(map.get("issues")).isEqualTo("ABCDE1234"); } - } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterServiceTest.java index 7d99241c37a..670e429c3db 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterServiceTest.java @@ -27,13 +27,12 @@ import org.hamcrest.Description; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.sonar.api.web.UserRole; -import org.sonar.core.issue.IssueFilterSerializer; -import org.sonar.core.issue.db.IssueFilterDao; -import org.sonar.core.issue.db.IssueFilterDto; -import org.sonar.core.issue.db.IssueFilterFavouriteDao; -import org.sonar.core.issue.db.IssueFilterFavouriteDto; +import org.sonar.db.issue.IssueFilterDao; +import org.sonar.db.issue.IssueFilterDto; +import org.sonar.db.issue.IssueFilterFavouriteDao; +import org.sonar.db.issue.IssueFilterFavouriteDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.user.AuthorizationDao; +import org.sonar.db.user.AuthorizationDao; import org.sonar.server.es.SearchOptions; import org.sonar.server.es.SearchResult; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWriterTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWriterTest.java index 9460ab54bde..8fda234c3ee 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWriterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/IssueFilterWriterTest.java @@ -22,7 +22,7 @@ package org.sonar.server.issue.filter; import org.junit.Test; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.issue.db.IssueFilterDto; +import org.sonar.db.issue.IssueFilterDto; import org.sonar.core.permission.GlobalPermissions; import org.sonar.server.tester.AnonymousMockUserSession; import org.sonar.server.tester.MockUserSession; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/RegisterIssueFiltersTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/RegisterIssueFiltersTest.java index 4d686c113d2..0c9c8d83209 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/RegisterIssueFiltersTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/RegisterIssueFiltersTest.java @@ -25,9 +25,9 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.issue.db.IssueFilterDao; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.template.LoadedTemplateDao; +import org.sonar.db.issue.IssueFilterDao; +import org.sonar.db.DbTester; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; import org.sonar.test.DbTests; import java.util.Date; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java index 392736f87fe..69030f44484 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/filter/ShowActionTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.core.issue.db.IssueFilterDto; +import org.sonar.db.issue.IssueFilterDto; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationDaoTest.java index f4a3cfe9f8f..cbfd4918f22 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationDaoTest.java @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java index 9c125a65c2c..92154d0c415 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java @@ -25,7 +25,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.config.Settings; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java index 2515b36fab1..441f51c603e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java @@ -34,7 +34,7 @@ import org.sonar.api.rule.Severity; import org.sonar.api.security.DefaultGroups; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.es.EsTester; import org.sonar.server.es.SearchOptions; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java index 38114c90918..fb0d5c8e221 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java @@ -42,7 +42,7 @@ import org.sonar.api.security.DefaultGroups; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.KeyValueFormat; import org.sonar.api.utils.System2; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.es.EsTester; import org.sonar.server.es.SearchOptions; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java index 13fb8233478..4d4f3de3941 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.config.Settings; import org.sonar.api.rule.RuleKey; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java index 5d4ce292bb4..9c9fd49f67f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueResultSetIteratorTest.java @@ -28,7 +28,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.rule.RuleKey; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangeNotificationTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangeNotificationTest.java index 49a57b9db6d..6c84fbe14d8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangeNotificationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/IssueChangeNotificationTest.java @@ -22,7 +22,7 @@ package org.sonar.server.issue.notification; import org.junit.Test; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.FieldDiffs; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java index 61e2e63bf0b..6667a837c83 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java @@ -30,7 +30,7 @@ import org.sonar.api.rule.Severity; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.Duration; import org.sonar.api.utils.Durations; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.rule.Rule; import org.sonar.server.rule.index.RuleDoc; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java index 4c90e46023c..1d249d407b2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java @@ -31,11 +31,11 @@ import org.sonar.api.security.DefaultGroups; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.DateUtils; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.issue.db.IssueDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.issue.IssueDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.db.DbClient; import org.sonar.server.issue.IssueTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java index 85daaa6f4d9..05088a66e48 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionMediumTest.java @@ -32,16 +32,16 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.KeyValueFormat; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.issue.db.ActionPlanDao; -import org.sonar.core.issue.db.ActionPlanDto; -import org.sonar.core.issue.db.IssueChangeDao; -import org.sonar.core.issue.db.IssueChangeDto; -import org.sonar.core.issue.db.IssueDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.issue.ActionPlanDao; +import org.sonar.db.issue.ActionPlanDto; +import org.sonar.db.issue.IssueChangeDao; +import org.sonar.db.issue.IssueChangeDto; +import org.sonar.db.issue.IssueDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.user.UserDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.db.DbClient; import org.sonar.server.issue.IssueQuery; diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ShowActionTest.java index 5d1268abc73..538d887fbc3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ShowActionTest.java @@ -41,10 +41,10 @@ import org.sonar.api.user.UserFinder; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.Duration; import org.sonar.api.utils.Durations; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.issue.DefaultActionPlan; import org.sonar.core.issue.workflow.Transition; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.core.user.DefaultUser; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java index 6e86bd098e1..ed0fef582b8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/MeasureFilterExecutorTest.java @@ -27,9 +27,9 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.resource.ResourceDao; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.DbTester; +import org.sonar.db.component.ResourceDao; import org.sonar.test.DbTests; import java.sql.SQLException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureDaoTest.java index b071bc00d5f..81b2a6bf2a5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureDaoTest.java @@ -27,9 +27,9 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureTesting.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureTesting.java index dacee6f26cc..0de6d64494c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureTesting.java @@ -23,7 +23,7 @@ package org.sonar.server.measure.custom.persistence; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.math.RandomUtils; import org.sonar.api.utils.System2; -import org.sonar.core.measure.custom.db.CustomMeasureDto; +import org.sonar.db.measure.CustomMeasureDto; public class CustomMeasureTesting { private CustomMeasureTesting() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java index 29044bfaf89..8ce5c9894fc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java @@ -35,12 +35,12 @@ import org.sonar.api.measures.Metric; import org.sonar.api.measures.Metric.ValueType; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.metric.MetricDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java index 4a67c98df75..60226992b8c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java @@ -24,7 +24,7 @@ import org.assertj.core.data.Offset; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.core.measure.custom.db.CustomMeasureDto; +import org.sonar.db.measure.CustomMeasureDto; import org.sonar.server.measure.custom.persistence.CustomMeasureTesting; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java index b2b3cca8a8a..b04887848e6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java @@ -28,11 +28,11 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.measure.custom.db.CustomMeasureDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.measure.CustomMeasureDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java index e48f2d76142..b99c59ff32c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java @@ -31,12 +31,12 @@ import org.junit.rules.ExpectedException; import org.sonar.api.config.Settings; import org.sonar.api.measures.Metric; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.metric.MetricDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java index d609b3f12d3..504e22ca63a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java @@ -34,12 +34,12 @@ import org.sonar.api.measures.Metric.ValueType; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.DateUtils; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.metric.MetricDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.SnapshotTesting; import org.sonar.server.component.db.ComponentDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java index a143bd026af..a8efdc7d796 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java @@ -31,12 +31,12 @@ import org.junit.rules.ExpectedException; import org.sonar.api.config.Settings; import org.sonar.api.measures.Metric.ValueType; import org.sonar.api.utils.System2; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.metric.MetricDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java index af51b7ccbd8..1a797609ef0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MeasureDaoTest.java @@ -31,10 +31,10 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.measure.db.MeasureDto; -import org.sonar.core.measure.db.PastMeasureDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.measure.PastMeasureDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; import static com.google.common.collect.Lists.newArrayList; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java index 3d257d40b1a..00f01461f78 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/DefaultMetricFinderTest.java @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.metric.persistence.MetricDao; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java index 797cc459fbe..f8a98862dd1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java @@ -25,9 +25,9 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.exceptions.NotFoundException; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java index 915f6cc8dde..4b8790f4eed 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java @@ -28,10 +28,10 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.api.measures.Metric.ValueType; -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.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.ServerException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java index ed4ee6fba1f..58cf6bfe60c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java @@ -29,11 +29,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.metric.MetricDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.measure.custom.persistence.CustomMeasureDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java index b00bf454e35..51dce8f6270 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java @@ -25,9 +25,9 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.metric.persistence.MetricDao; import org.sonar.server.ws.WsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java index 480e8be107b..f04d3f1152b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java @@ -23,7 +23,7 @@ package org.sonar.server.metric.ws; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.math.RandomUtils; import org.sonar.api.measures.Metric; -import org.sonar.core.metric.db.MetricDto; +import org.sonar.db.metric.MetricDto; public class MetricTesting { private MetricTesting() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java index c2206fc99cc..6999e6c2aae 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/SearchActionTest.java @@ -27,9 +27,9 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.server.ws.WebService.Param; -import org.sonar.core.metric.db.MetricDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.metric.persistence.MetricDao; import org.sonar.server.ws.WsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java index f83484a72eb..59cafc2499b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java @@ -28,10 +28,10 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.api.measures.Metric.ValueType; -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.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.ServerException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java index 15205263036..4e759f57ede 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/DefaultNotificationManagerTest.java @@ -33,9 +33,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.sonar.api.notifications.Notification; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.core.notification.db.NotificationQueueDao; -import org.sonar.core.notification.db.NotificationQueueDto; -import org.sonar.core.properties.PropertiesDao; +import org.sonar.db.notification.NotificationQueueDao; +import org.sonar.db.notification.NotificationQueueDto; +import org.sonar.db.property.PropertiesDao; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationServiceTest.java index 214f062eebd..6ad4d212096 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationServiceTest.java @@ -27,7 +27,7 @@ import org.mockito.stubbing.Answer; import org.sonar.api.config.Settings; import org.sonar.api.notifications.Notification; import org.sonar.api.notifications.NotificationChannel; -import org.sonar.core.properties.PropertiesDao; +import org.sonar.db.property.PropertiesDao; import org.sonar.server.db.DbClient; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java index 2ba6021d607..0b8d1ef7a9a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java @@ -32,11 +32,11 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.RoleDao; -import org.sonar.core.user.UserDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.RoleDao; +import org.sonar.db.user.UserDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java index 815c63980b9..163bd4397db 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionTemplateServiceTest.java @@ -32,17 +32,17 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.web.UserRole; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.permission.PermissionQuery; -import org.sonar.core.permission.PermissionTemplateDao; -import org.sonar.core.permission.PermissionTemplateDto; -import org.sonar.core.permission.PermissionTemplateGroupDto; -import org.sonar.core.permission.PermissionTemplateUserDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDao; -import org.sonar.core.user.UserDto; +import org.sonar.db.permission.PermissionQuery; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.permission.PermissionTemplateDto; +import org.sonar.db.permission.PermissionTemplateGroupDto; +import org.sonar.db.permission.PermissionTemplateUserDto; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDao; +import org.sonar.db.user.UserDto; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.tester.UserSessionRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java index c76854a0465..da5793949f2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java @@ -27,15 +27,15 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.core.permission.GroupWithPermission; -import org.sonar.core.permission.GroupWithPermissionDto; -import org.sonar.core.permission.PermissionDao; -import org.sonar.core.permission.PermissionQuery; -import org.sonar.core.permission.PermissionTemplateDao; -import org.sonar.core.permission.PermissionTemplateDto; -import org.sonar.core.permission.UserWithPermissionDto; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; -import org.sonar.core.resource.ResourceQuery; +import org.sonar.db.permission.GroupWithPermissionDto; +import org.sonar.db.permission.PermissionDao; +import org.sonar.db.permission.PermissionQuery; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.permission.PermissionTemplateDto; +import org.sonar.db.permission.UserWithPermissionDto; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; +import org.sonar.db.component.ResourceQuery; import org.sonar.server.exceptions.NotFoundException; import static com.google.common.collect.Lists.newArrayList; diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryParserTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryParserTest.java index 40e9d03ab14..6e4adbbdce0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryParserTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryParserTest.java @@ -21,7 +21,7 @@ package org.sonar.server.permission; import org.junit.Test; -import org.sonar.core.permission.PermissionQuery; +import org.sonar.db.permission.PermissionQuery; import java.util.Map; diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryTest.java index 21e61307e79..793588ce0ec 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionQueryTest.java @@ -21,7 +21,7 @@ package org.sonar.server.permission; import org.junit.Test; -import org.sonar.core.permission.PermissionQuery; +import org.sonar.db.permission.PermissionQuery; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateTest.java index c851589dfa1..d9939126c0d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateTest.java @@ -22,9 +22,9 @@ package org.sonar.server.permission; import com.google.common.collect.Lists; import org.junit.Test; -import org.sonar.core.permission.PermissionTemplateDto; -import org.sonar.core.permission.PermissionTemplateGroupDto; -import org.sonar.core.permission.PermissionTemplateUserDto; +import org.sonar.db.permission.PermissionTemplateDto; +import org.sonar.db.permission.PermissionTemplateGroupDto; +import org.sonar.db.permission.PermissionTemplateUserDto; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java index d18eb7b79d2..1ee16c93c51 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateUpdaterTest.java @@ -26,11 +26,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.web.UserRole; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.permission.PermissionTemplateDao; -import org.sonar.core.permission.PermissionTemplateDto; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDao; -import org.sonar.core.user.UserDto; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.permission.PermissionTemplateDto; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDao; +import org.sonar.db.user.UserDto; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.UnauthorizedException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupMediumTest.java index 766c8485e8c..413da3ae015 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupMediumTest.java @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.es.EsTester; import org.sonar.server.issue.IssueTesting; import org.sonar.server.issue.index.IssueIndexDefinition; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java index 5367ee316de..e01f36ad0d4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java @@ -21,7 +21,7 @@ package org.sonar.server.platform; import org.junit.Test; import org.sonar.api.utils.MessageException; -import org.sonar.core.persistence.DatabaseVersion; +import org.sonar.db.version.DatabaseVersion; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java index ae5970b7f93..c5ac262d58e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java @@ -20,7 +20,7 @@ package org.sonar.server.platform; import org.junit.Test; -import org.sonar.core.persistence.DatabaseVersion; +import org.sonar.db.version.DatabaseVersion; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java index b7f175d19d1..285f0dcd98d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java @@ -24,8 +24,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentMatcher; import org.sonar.api.config.PropertyDefinitions; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import java.util.Arrays; import java.util.Properties; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java index ca03a703e34..d8394a8a15b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java @@ -22,8 +22,8 @@ package org.sonar.server.platform.monitoring; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.core.persistence.DatabaseVersion; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.version.DatabaseVersion; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import java.util.LinkedHashMap; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbSystemActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbSystemActionTest.java index 8cbee38474f..9948abedd91 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbSystemActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbSystemActionTest.java @@ -27,9 +27,9 @@ import org.junit.Before; import org.junit.Test; import org.sonar.api.server.ws.Request; import org.sonar.api.utils.DateUtils; -import org.sonar.core.persistence.Database; -import org.sonar.core.persistence.DatabaseVersion; -import org.sonar.core.persistence.dialect.Dialect; +import org.sonar.db.Database; +import org.sonar.db.version.DatabaseVersion; +import org.sonar.db.dialect.Dialect; import org.sonar.server.db.migrations.DatabaseMigration; import org.sonar.server.db.migrations.DatabaseMigration.Status; import org.sonar.server.ws.WsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java index 26f3c2dc54a..f6c1523517a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java @@ -24,8 +24,8 @@ import org.junit.Test; import org.sonar.api.platform.Server; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.WebService; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.IsAliveMapper; +import org.sonar.db.DbSession; +import org.sonar.db.IsAliveMapper; import org.sonar.server.db.DbClient; import org.sonar.server.db.migrations.DatabaseMigration; import org.sonar.server.platform.Platform; diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java index e85cde7f8af..b4313c5a144 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java @@ -36,16 +36,16 @@ import org.sonar.api.resources.ResourceTypes; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.issue.db.IssueDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.issue.IssueDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.purge.PurgeDao; -import org.sonar.core.purge.PurgeProfiler; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.purge.PurgeDao; +import org.sonar.db.purge.PurgeProfiler; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.rule.RuleDto; import org.sonar.server.component.ComponentCleanerService; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.SnapshotTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java index c7f695b904e..6d24ca4ee06 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java @@ -35,15 +35,15 @@ import org.sonar.api.resources.ResourceTypes; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.purge.PurgeDao; -import org.sonar.core.purge.PurgeProfiler; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.purge.PurgeDao; +import org.sonar.db.purge.PurgeProfiler; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.rule.RuleDto; import org.sonar.server.component.ComponentCleanerService; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.SnapshotTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java index c0c055231dc..ab55f9bd35c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java @@ -31,10 +31,10 @@ import org.junit.experimental.categories.Category; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.DateUtils; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.SnapshotTesting; import org.sonar.server.component.db.ComponentDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java index f40b18603d5..ed5f5fe242c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java @@ -31,11 +31,11 @@ import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.DateUtils; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.SnapshotTesting; import org.sonar.server.component.db.ComponentDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryFactoryTest.java index 9e454ca2355..489d9f4c5e5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryFactoryTest.java @@ -24,8 +24,8 @@ import com.google.common.collect.Lists; import org.junit.Before; import org.junit.Test; import org.sonar.api.config.Settings; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import java.util.Map; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java index d627aaf6fc5..6f8f611f897 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGatesTest.java @@ -40,16 +40,16 @@ import org.sonar.api.measures.Metric; import org.sonar.api.measures.Metric.ValueType; import org.sonar.api.measures.MetricFinder; import org.sonar.api.web.UserRole; -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.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; -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.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; +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.component.db.ComponentDao; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java index 4bf97cd4e46..0b41a677775 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java @@ -25,9 +25,9 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.core.qualitygate.db.QualityGateDto; -import org.sonar.core.template.LoadedTemplateDao; -import org.sonar.core.template.LoadedTemplateDto; +import org.sonar.db.qualitygate.QualityGateDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java index 58281f8ff40..a82e4550523 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java @@ -30,10 +30,10 @@ import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.i18n.I18n; import org.sonar.api.server.ws.WebService.Action; import org.sonar.api.server.ws.WebService.Controller; -import org.sonar.core.qualitygate.db.ProjectQgateAssociation; -import org.sonar.core.qualitygate.db.ProjectQgateAssociationQuery; -import org.sonar.core.qualitygate.db.QualityGateConditionDto; -import org.sonar.core.qualitygate.db.QualityGateDto; +import org.sonar.db.qualitygate.ProjectQgateAssociation; +import org.sonar.db.qualitygate.ProjectQgateAssociationQuery; +import org.sonar.db.qualitygate.QualityGateConditionDto; +import org.sonar.db.qualitygate.QualityGateDto; import org.sonar.core.timemachine.Periods; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.qualitygate.QgateProjectFinder; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java index 771b43ce3ed..7ec9a26b61c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ActiveRuleBackendMediumTest.java @@ -31,12 +31,12 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.api.server.debt.DebtRemediationFunction; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.platform.Platform; import org.sonar.server.qualityprofile.index.ActiveRuleIndex; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java index 6c017b07ad7..39a914313ce 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperMediumTest.java @@ -31,10 +31,10 @@ import org.junit.Test; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.api.server.rule.RuleParamType; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.rule.RuleTesting; import org.sonar.server.tester.ServerTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java index 8a095cc4547..c133a198f26 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonMediumTest.java @@ -28,10 +28,10 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.rule.Severity; import org.sonar.api.server.rule.RuleParamType; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.QProfileComparison.ActiveRuleDiff; import org.sonar.server.qualityprofile.QProfileComparison.QProfileComparisonResult; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierMediumTest.java index 37ae08f6767..1fe25bf4f5e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierMediumTest.java @@ -28,11 +28,11 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.rule.Severity; import org.sonar.api.server.rule.RuleParamType; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.index.ActiveRuleIndex; import org.sonar.server.rule.RuleTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java index b7f6ebcff4b..b93717d10b0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java @@ -35,8 +35,8 @@ import org.sonar.api.rules.RulePriority; import org.sonar.api.server.rule.RuleParamType; import org.sonar.api.server.rule.RulesDefinition; import org.sonar.api.utils.ValidationMessages; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java index 9feeb7c08ed..cbf48ac91be 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryMediumTest.java @@ -25,12 +25,12 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.sonar.api.server.rule.RuleParamType; -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.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.qualityprofile.index.ActiveRuleIndex; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileProjectOperationsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileProjectOperationsMediumTest.java index 28f09a659cb..41477af5427 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileProjectOperationsMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileProjectOperationsMediumTest.java @@ -26,12 +26,12 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.permission.PermissionFacade; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.user.UserDto; +import org.sonar.db.permission.PermissionFacade; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.user.UserDto; import org.sonar.server.db.DbClient; import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetMediumTest.java index 841b0997327..ed665d97ae7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetMediumTest.java @@ -35,10 +35,10 @@ import org.sonar.api.rules.RulePriority; import org.sonar.api.server.rule.RuleParamType; import org.sonar.api.server.rule.RulesDefinition; import org.sonar.api.utils.ValidationMessages; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.platform.Platform; import org.sonar.server.qualityprofile.index.ActiveRuleIndex; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java index ff6118371a1..549328c7e63 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileServiceMediumTest.java @@ -41,11 +41,11 @@ import org.sonar.api.rules.Rule; import org.sonar.api.rules.RulePriority; import org.sonar.api.utils.ValidationMessages; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.user.UserDto; import org.sonar.server.activity.Activity; import org.sonar.server.activity.ActivityService; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java index e3caded3c16..a74a5822491 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java @@ -19,7 +19,7 @@ */ package org.sonar.server.qualityprofile; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; /** * Utility class for tests involving quality profiles diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java index 2574a399ddf..f9700408c99 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesMediumTest.java @@ -33,13 +33,13 @@ import org.sonar.api.rules.RulePriority; import org.sonar.api.server.rule.RuleParamType; import org.sonar.api.server.rule.RulesDefinition; import org.sonar.api.utils.ValidationMessages; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.template.LoadedTemplateDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; import org.sonar.server.db.DbClient; import org.sonar.server.platform.Platform; import org.sonar.server.qualityprofile.db.ActiveRuleDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java index 758b54fe8f3..1aeeeee45d0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleActivatorMediumTest.java @@ -35,13 +35,13 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.api.server.rule.RuleParamType; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.Message; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java index 502059c3035..39484429458 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java @@ -29,7 +29,7 @@ import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.language.LanguageTesting; import org.sonar.server.qualityprofile.QProfileBackuper; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionMediumTest.java index f660fcce5c2..6b3bf179238 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionMediumTest.java @@ -28,10 +28,10 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.qualityprofile.QProfileName; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java index 7862c75fb3e..c145248e8cf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java @@ -33,12 +33,12 @@ import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.api.utils.internal.Uuids; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.user.UserDto; import org.sonar.server.activity.Activity; import org.sonar.server.activity.index.ActivityDoc; import org.sonar.server.activity.index.ActivityIndex; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java index 639548566c4..b4e189c2a71 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java @@ -30,12 +30,12 @@ import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.api.server.rule.RuleParamType; import org.sonar.api.server.rule.RulesDefinition; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.QProfileName; import org.sonar.server.qualityprofile.QProfileTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java index 161132b851e..c5744f45631 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.language.LanguageTesting; import org.sonar.server.qualityprofile.QProfileCopier; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionMediumTest.java index 5a137338b5b..81d6686c54c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionMediumTest.java @@ -25,7 +25,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.qualityprofile.QProfileExporters; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java index 1b6a67a9309..dd764b10efa 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java @@ -25,8 +25,8 @@ import org.junit.Test; import org.sonar.api.server.ws.WebService.Action; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.qualityprofile.db.QualityProfileDao; +import org.sonar.db.DbTester; +import org.sonar.db.qualityprofile.QualityProfileDao; import org.sonar.server.db.DbClient; import org.sonar.server.language.LanguageTesting; import org.sonar.server.qualityprofile.QProfileFactory; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java index f2e0f48c603..97e1bd8745b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java @@ -27,12 +27,12 @@ import org.junit.Test; import org.sonar.api.resources.Language; import org.sonar.api.resources.Languages; import org.sonar.api.utils.System2; -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.DbTester; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java index 733e0351348..575cc3751a0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java @@ -35,10 +35,10 @@ import org.sonar.api.profiles.ProfileExporter; import org.sonar.api.profiles.RulesProfile; import org.sonar.api.server.ws.WebService.Action; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.language.LanguageTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionMediumTest.java index 6db05c6f350..b3115f83737 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionMediumTest.java @@ -27,10 +27,10 @@ import org.junit.Test; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.qualityprofile.QProfileName; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java index 7393b198da9..30cbc8f5456 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java @@ -27,16 +27,16 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.user.AuthorizationDao; -import org.sonar.core.user.GroupRoleDto; -import org.sonar.core.user.RoleDao; -import org.sonar.core.user.UserDto; -import org.sonar.core.user.UserRoleDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.user.AuthorizationDao; +import org.sonar.db.user.GroupRoleDto; +import org.sonar.db.user.RoleDao; +import org.sonar.db.user.UserDto; +import org.sonar.db.user.UserRoleDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java index 64b7f15e42a..5c9810631ba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java @@ -29,13 +29,13 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.api.server.ws.WebService; -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.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java index af38b8cdcab..6b6b22ea104 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java @@ -26,10 +26,10 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java index d8bddee3710..524a6eb4c49 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.language.LanguageTesting; import org.sonar.server.qualityprofile.BulkChangeResult; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java index 4ef6a789662..1b70675c9c4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java @@ -28,10 +28,10 @@ import org.sonar.api.resources.Language; import org.sonar.api.resources.Languages; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java index 06fc865302e..636cc5c09a1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java @@ -27,10 +27,10 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java index 3d5939bdd16..727a15dae87 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderMediumTest.java @@ -29,8 +29,8 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RuleQuery; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; import org.sonar.server.db.DbClient; import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java index c9d52563aab..0ee1ca13275 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java @@ -38,10 +38,10 @@ import org.sonar.api.server.rule.RuleParamType; import org.sonar.api.server.rule.RulesDefinition; import org.sonar.api.utils.MessageException; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.platform.Platform; import org.sonar.server.qualityprofile.ActiveRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java index 522175215d8..a5c3487e6ff 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java @@ -31,12 +31,12 @@ import org.sonar.api.rule.Severity; import org.sonar.api.server.rule.RulesDefinition; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.technicaldebt.db.CharacteristicDao; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; +import org.sonar.db.debt.CharacteristicDao; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.RuleActivator; import org.sonar.server.qualityprofile.db.ActiveRuleDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleBackendMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleBackendMediumTest.java index d97afc80ab0..c93de49e8cb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleBackendMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleBackendMediumTest.java @@ -27,10 +27,10 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.rule.RuleStatus; import org.sonar.api.server.rule.RuleParamType; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.debt.DebtTesting; import org.sonar.server.platform.Platform; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java index 5ffaae8e5e2..c0622369a39 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java @@ -31,10 +31,10 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.api.server.debt.DebtRemediationFunction; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleDto.Format; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleDto.Format; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.rule.db.RuleDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDeleterMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDeleterMediumTest.java index 5f6d53b03ed..7c618e5f3f1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDeleterMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDeleterMediumTest.java @@ -28,9 +28,9 @@ import org.junit.Test; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.ActiveRule; import org.sonar.server.qualityprofile.QProfileTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java index 91dba0e04f4..b20cfe5cdad 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java @@ -29,10 +29,10 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.rule.RuleKey; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.technicaldebt.db.CharacteristicDao; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.debt.CharacteristicDao; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java index 06078595bfa..290b86d2f21 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java @@ -31,8 +31,8 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.exceptions.UnauthorizedException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java index 2a9b004f206..eaa0e902091 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java @@ -21,7 +21,7 @@ package org.sonar.server.rule; import com.google.common.collect.Sets; import org.junit.Test; -import org.sonar.core.rule.RuleDto; +import org.sonar.db.rule.RuleDto; import java.util.Collections; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java index 274aec5de5b..d521ead8bb9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java @@ -25,8 +25,8 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.api.server.debt.DebtRemediationFunction; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleDto.Format; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleDto.Format; /** * Utility class for tests involving rules diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java index fee5591d673..5c5d2b9e40e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java @@ -32,12 +32,12 @@ import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.api.server.debt.DebtRemediationFunction; import org.sonar.api.server.debt.internal.DefaultDebtRemediationFunction; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleKey; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleKey; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.debt.DebtTesting; import org.sonar.server.qualityprofile.ActiveRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java index efddaf517a9..fae1c548c41 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java @@ -29,11 +29,11 @@ import org.sonar.api.rule.Severity; import org.sonar.api.server.debt.DebtRemediationFunction; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleDto.Format; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleDto.Format; +import org.sonar.db.rule.RuleParamDto; import java.util.List; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java index a9793c9a594..d4d85f431ba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java @@ -32,12 +32,12 @@ import org.junit.Test; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.debt.DebtTesting; import org.sonar.server.qualityprofile.ActiveRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java index 9d53a92a191..884c2f61913 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java @@ -35,7 +35,7 @@ import org.sonar.api.server.debt.DebtCharacteristic; import org.sonar.api.server.debt.DebtModel; import org.sonar.api.server.debt.internal.DefaultDebtCharacteristic; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.qualityprofile.db.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.server.qualityprofile.QProfileLoader; import org.sonar.server.qualityprofile.QProfileTesting; import org.sonar.server.rule.RuleRepositories; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java index 9b2f70bf3fd..be4ad2c558a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionMediumTest.java @@ -31,9 +31,9 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.rule.RuleTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWsMediumTest.java index 6de35e43f02..bbdb3340c0a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWsMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWsMediumTest.java @@ -34,15 +34,15 @@ import org.sonar.api.rule.Severity; import org.sonar.api.server.debt.DebtRemediationFunction; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.DateUtils; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleDto.Format; -import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleDto.Format; +import org.sonar.db.rule.RuleParamDto; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.debt.DebtTesting; import org.sonar.server.qualityprofile.QProfileTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java index 2ca529121ef..1798f42cb9a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java @@ -29,12 +29,12 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleDto.Format; -import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.technicaldebt.db.CharacteristicDao; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleDto.Format; +import org.sonar.db.rule.RuleParamDto; +import org.sonar.db.debt.CharacteristicDao; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.rule.NewRule; import org.sonar.server.rule.RuleService; diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java index d8f4b4b0dde..aefeea4bd49 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java @@ -30,9 +30,9 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleParamDto; +import org.sonar.db.DbSession; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.rule.NewRule; import org.sonar.server.rule.RuleService; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/db/FileSourceDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/db/FileSourceDaoTest.java index 6f3f0562196..2c3e2abcd50 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/db/FileSourceDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/db/FileSourceDaoTest.java @@ -28,10 +28,10 @@ import org.apache.commons.io.IOUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.source.db.FileSourceDto; -import org.sonar.core.source.db.FileSourceDto.Type; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; +import org.sonar.db.source.FileSourceDto; +import org.sonar.db.source.FileSourceDto.Type; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/db/FileSourceTesting.java b/server/sonar-server/src/test/java/org/sonar/server/source/db/FileSourceTesting.java index 3398223732e..5722ad60cdf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/db/FileSourceTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/db/FileSourceTesting.java @@ -26,7 +26,7 @@ import java.sql.SQLException; import java.util.Arrays; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.math.RandomUtils; -import org.sonar.core.source.db.FileSourceDto; +import org.sonar.db.source.FileSourceDto; public class FileSourceTesting { diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java index d1c3de5eaaa..cae481e0995 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.config.Settings; import org.sonar.api.utils.DateUtils; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.server.source.db.FileSourceDb; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java index 970166ff20e..ea481ab7f11 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineResultSetIteratorTest.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.source.db.FileSourceDb; import org.sonar.server.source.db.FileSourceTesting; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java index 42599e5ca38..85bb53dacd8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java @@ -28,8 +28,8 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.web.UserRole; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java index c1077e50e7f..492ac5b7e13 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java @@ -27,8 +27,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.web.UserRole; -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.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java index c34c04c5812..370574e24c1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java @@ -28,9 +28,9 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java index a3a3e914303..ea5ddb653b7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java @@ -27,8 +27,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.web.UserRole; -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.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java index 345547dc3b7..a8011505543 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java @@ -28,9 +28,9 @@ import org.junit.Test; import org.sonar.api.config.Settings; import org.sonar.api.utils.DateUtils; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java index edbaceb1367..d4cfa2a9e61 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ShowActionTest.java @@ -26,8 +26,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.web.UserRole; -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.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/ActivityServerIdTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/ActivityServerIdTest.java index cb5e293b977..705fc73e51a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/ActivityServerIdTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/ActivityServerIdTest.java @@ -25,8 +25,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.sonar.api.CoreProperties; import org.sonar.api.utils.log.Logger; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import static org.mockito.Mockito.*; diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java index aaa29b610a8..4fcba6f5c49 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java @@ -28,9 +28,9 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.template.LoadedTemplateDao; +import org.sonar.db.DbTester; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; import org.sonar.server.db.DbClient; import org.sonar.server.rule.db.RuleDao; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDashboardsTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDashboardsTest.java index 5ababc6e721..df92895d8a9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDashboardsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDashboardsTest.java @@ -27,13 +27,18 @@ import org.mockito.ArgumentMatcher; import org.sonar.api.web.Dashboard; import org.sonar.api.web.DashboardLayout; import org.sonar.api.web.DashboardTemplate; -import org.sonar.core.dashboard.*; -import org.sonar.core.template.LoadedTemplateDao; -import org.sonar.core.template.LoadedTemplateDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; import java.util.Arrays; import java.util.Collection; import java.util.List; +import org.sonar.db.dashboard.ActiveDashboardDao; +import org.sonar.db.dashboard.ActiveDashboardDto; +import org.sonar.db.dashboard.DashboardDao; +import org.sonar.db.dashboard.DashboardDto; +import org.sonar.db.dashboard.WidgetDto; +import org.sonar.db.dashboard.WidgetPropertyDto; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java index eefc9578ff1..1b069d5814b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterDebtModelTest.java @@ -25,8 +25,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.core.technicaldebt.db.CharacteristicDao; -import org.sonar.core.technicaldebt.db.CharacteristicDto; +import org.sonar.db.debt.CharacteristicDao; +import org.sonar.db.debt.CharacteristicDto; import org.sonar.server.debt.DebtModelBackup; import java.util.Collections; diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java index c37600379b9..f2f79dadf9b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java @@ -27,8 +27,8 @@ import org.junit.experimental.categories.Category; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; import org.sonar.api.measures.Metrics; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.qualitygate.db.QualityGateConditionDao; +import org.sonar.db.DbTester; +import org.sonar.db.qualitygate.QualityGateConditionDao; import org.sonar.server.db.DbClient; import org.sonar.server.metric.persistence.MetricDao; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterNewMeasureFiltersTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterNewMeasureFiltersTest.java index efbb20ab1c8..97b3e465edc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterNewMeasureFiltersTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterNewMeasureFiltersTest.java @@ -25,10 +25,10 @@ import org.sonar.api.web.Criterion; import org.sonar.api.web.Filter; import org.sonar.api.web.FilterColumn; import org.sonar.api.web.FilterTemplate; -import org.sonar.core.measure.db.MeasureFilterDao; -import org.sonar.core.measure.db.MeasureFilterDto; -import org.sonar.core.template.LoadedTemplateDao; -import org.sonar.core.template.LoadedTemplateDto; +import org.sonar.db.measure.MeasureFilterDao; +import org.sonar.db.measure.MeasureFilterDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java index 5fa9a9af0f4..ea05f59fc51 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java @@ -26,12 +26,12 @@ import org.junit.Before; import org.junit.Test; import org.sonar.api.security.DefaultGroups; import org.sonar.api.web.UserRole; -import org.sonar.core.permission.PermissionTemplateDao; -import org.sonar.core.permission.PermissionTemplateDto; -import org.sonar.core.template.LoadedTemplateDao; -import org.sonar.core.template.LoadedTemplateDto; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDao; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.permission.PermissionTemplateDto; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDao; import org.sonar.server.platform.PersistentSettings; import static org.mockito.Matchers.any; diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java index ce674ecd459..2ab6c0ed3f4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.sonar.api.Properties; import org.sonar.api.Property; import org.sonar.api.config.PropertyDefinitions; -import org.sonar.core.properties.PropertiesDao; +import org.sonar.db.property.PropertiesDao; import static org.mockito.Mockito.*; diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RenameIssueWidgetsTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RenameIssueWidgetsTest.java index 61b09224b25..6eb2e705d6c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/RenameIssueWidgetsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RenameIssueWidgetsTest.java @@ -24,9 +24,9 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.issue.db.IssueFilterDao; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.template.LoadedTemplateDao; +import org.sonar.db.issue.IssueFilterDao; +import org.sonar.db.DbTester; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; import org.sonar.server.dashboard.db.DashboardDao; import org.sonar.server.dashboard.db.WidgetDao; import org.sonar.server.dashboard.db.WidgetPropertyDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java index 5f71cb5ffa5..3a10470bd05 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/CoverageServiceTest.java @@ -30,8 +30,8 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.web.UserRole; -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.measure.persistence.MeasureDao; import org.sonar.server.tester.UserSessionRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java b/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java index a9bb19c7bec..79ef35166db 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java @@ -23,7 +23,7 @@ package org.sonar.server.test.db; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.math.RandomUtils; import org.sonar.api.utils.internal.Uuids; -import org.sonar.core.source.db.FileSourceDto; +import org.sonar.db.source.FileSourceDto; import org.sonar.server.source.db.FileSourceDb; import org.sonar.server.source.db.FileSourceDb.Test.TestStatus; diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java index 9445800e654..ae1809eefe9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java @@ -31,7 +31,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.config.Settings; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.server.source.db.FileSourceDb; diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java index bc97186e500..7e6e9e9bac8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.source.db.FileSourceDb; import org.sonar.server.source.db.FileSourceDb.Test.TestStatus; diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java index d0c68a032de..d2add9948c9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.web.UserRole; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.DbSession; import org.sonar.server.db.DbClient; import org.sonar.server.test.index.CoveredFileDoc; import org.sonar.server.test.index.TestIndex; diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java index 753687d911e..d857bf363fc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java @@ -28,9 +28,9 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.config.Settings; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java index b6651e7bb3a..7a29f2c9916 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/ComponentNavigationActionTest.java @@ -41,17 +41,17 @@ import org.sonar.api.web.ResourceLanguage; import org.sonar.api.web.ResourceQualifier; import org.sonar.api.web.ResourceScope; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.dashboard.ActiveDashboardDao; -import org.sonar.core.dashboard.ActiveDashboardDto; -import org.sonar.core.dashboard.DashboardDao; -import org.sonar.core.dashboard.DashboardDto; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.dashboard.ActiveDashboardDao; +import org.sonar.db.dashboard.ActiveDashboardDto; +import org.sonar.db.dashboard.DashboardDao; +import org.sonar.db.dashboard.DashboardDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.properties.PropertiesDao; -import org.sonar.core.properties.PropertyDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.property.PropertyDto; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.SnapshotTesting; import org.sonar.server.component.db.ComponentDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java index 337c8b36e92..c40a6fb17fb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java @@ -33,14 +33,14 @@ import org.sonar.api.web.NavigationSection; import org.sonar.api.web.Page; import org.sonar.api.web.UserRole; import org.sonar.api.web.View; -import org.sonar.core.dashboard.ActiveDashboardDao; -import org.sonar.core.dashboard.ActiveDashboardDto; -import org.sonar.core.dashboard.DashboardDao; -import org.sonar.core.dashboard.DashboardDto; +import org.sonar.db.dashboard.ActiveDashboardDao; +import org.sonar.db.dashboard.ActiveDashboardDto; +import org.sonar.db.dashboard.DashboardDao; +import org.sonar.db.dashboard.DashboardDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.UserDto; import org.sonar.server.db.DbClient; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ui.Views; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java index dacae4737fa..ccc7f0065df 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java @@ -24,11 +24,11 @@ import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.sonar.core.user.GroupMembership; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.GroupMembershipDto; -import org.sonar.core.user.GroupMembershipQuery; -import org.sonar.core.user.UserDao; -import org.sonar.core.user.UserDto; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.GroupMembershipDto; +import org.sonar.db.user.GroupMembershipQuery; +import org.sonar.db.user.UserDao; +import org.sonar.db.user.UserDto; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipServiceTest.java index 2c5b83f6422..c7c0000e4cb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipServiceTest.java @@ -24,10 +24,10 @@ import com.google.common.collect.ImmutableMap; import org.junit.Before; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.AbstractDaoTestCase; +import org.sonar.db.AbstractDaoTestCase; import org.sonar.core.user.GroupMembership; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.UserDao; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.UserDao; import org.sonar.server.exceptions.NotFoundException; import java.util.List; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java index a333e423258..044efcb08e3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java @@ -22,11 +22,11 @@ package org.sonar.server.user; import java.util.Arrays; import org.junit.Test; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; +import org.sonar.db.component.ComponentDto; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; -import org.sonar.core.user.AuthorizationDao; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; +import org.sonar.db.user.AuthorizationDao; import org.sonar.server.component.ComponentTesting; import org.sonar.server.exceptions.ForbiddenException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java index 29527c23b81..531c7454b98 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java @@ -33,12 +33,12 @@ import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; import org.sonar.api.platform.NewUserHandler; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.GroupMembershipQuery; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.GroupMembershipQuery; +import org.sonar.db.user.UserDto; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java index 70a1f674b53..19e9d42cd9e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java @@ -27,9 +27,9 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/db/UserDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/db/UserDaoTest.java index 1de7629233e..6ec82e79a3f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/db/UserDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/db/UserDaoTest.java @@ -26,9 +26,9 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.UserDto; import org.sonar.server.exceptions.NotFoundException; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/db/UserGroupDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/db/UserGroupDaoTest.java index a1b72ef3831..a1a6b3d15ef 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/db/UserGroupDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/db/UserGroupDaoTest.java @@ -25,9 +25,9 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.UserGroupDto; import org.sonar.test.DbTests; @Category(DbTests.class) diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java index 8a4bf020f7a..46c872fc5f8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java @@ -24,7 +24,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.config.Settings; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserResultSetIteratorTest.java index ecedc14b5a1..ec9285357f4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserResultSetIteratorTest.java @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.server.db.DbClient; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java index c0c419bbd95..fb7d43a9ba7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java @@ -29,9 +29,9 @@ import org.sonar.api.config.Settings; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java index 099700b8ffa..8f2dec21f98 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java @@ -32,10 +32,10 @@ import org.sonar.api.i18n.I18n; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.UserDto; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.server.exceptions.ForbiddenException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java index ae86e7aeeaa..071ea3277e0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java @@ -31,10 +31,10 @@ import org.sonar.api.i18n.I18n; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.UserDto; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.server.exceptions.BadRequestException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java index d57b5baa082..fcebfae115f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java @@ -29,12 +29,12 @@ import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.server.ws.WebService.SelectionMode; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.UserDto; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.UserDto; +import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java index 067d05306ce..167d9104766 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java @@ -34,12 +34,12 @@ import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.UserDto; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.UserDto; +import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.server.tester.UserSessionRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java index 154dc55194f..f8b8dc24c94 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java @@ -29,11 +29,11 @@ import org.sonar.api.config.Settings; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.UserDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.UserDto; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.server.exceptions.ForbiddenException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java index db56d1a1afd..8c485f96142 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java @@ -32,12 +32,12 @@ import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.UserDto; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.UserDto; +import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.tester.UserSessionRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java index 44e47770954..320a00619f8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java @@ -31,9 +31,9 @@ import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.ServerException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java index 82c96a928b9..9a968201f4e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java @@ -31,13 +31,13 @@ import org.sonar.api.config.Settings; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.permission.PermissionTemplateDao; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupRoleDto; -import org.sonar.core.user.RoleDao; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupRoleDto; +import org.sonar.db.user.RoleDao; +import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.tester.UserSessionRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java index 106671a5e07..4ea662d56ff 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java @@ -31,12 +31,12 @@ import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.UserDto; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.UserDto; +import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.tester.UserSessionRule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java index 9ec90c7554c..1b0c32aa153 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java @@ -28,11 +28,11 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.user.db.GroupDao; import org.sonar.server.user.db.UserGroupDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java index 90ad8c4d3eb..ddf0684c8ec 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java @@ -31,11 +31,11 @@ import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java index c7288d6d818..3f0e123f116 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java @@ -30,12 +30,12 @@ import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.server.ws.WebService.SelectionMode; import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupMembershipDao; -import org.sonar.core.user.UserDto; -import org.sonar.core.user.UserGroupDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupMembershipDao; +import org.sonar.db.user.UserDto; +import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java index eb6f1114cce..a8fe4fd41c0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java @@ -33,13 +33,13 @@ import org.junit.experimental.categories.Category; import org.sonar.api.config.Settings; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.issue.db.IssueDto; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.user.GroupRoleDto; -import org.sonar.core.user.RoleDao; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.user.GroupRoleDto; +import org.sonar.db.user.RoleDao; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml index bea6889ccad..48631f4bb0f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml @@ -19,7 +19,7 @@ issue_creation_date="1368878400000" issue_update_date="1368878400000" issue_close_date="1368878400000" - /> + /> <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="emmerik" change_data="the comment" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml index 30ba1970b6a..58a27702be5 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml @@ -29,5 +29,5 @@ issue_creation_date="1115848800000" issue_update_date="1368828000000" issue_close_date="[null]" - /> + /> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml index ef25cfab275..5f4ddaca1a1 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_resolve_conflicts_on_updates.xml @@ -31,5 +31,5 @@ issue_creation_date="1115848800000" issue_update_date="1368878400000" issue_close_date="[null]" - /> + /> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml index 91524aa02bc..170a3b210cc 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml @@ -24,7 +24,7 @@ issue_creation_date="1368878400000" issue_update_date="1368878400000" issue_close_date="1368878400000" - /> + /> <issue_changes id="1" kee="FGHIJ" issue_key="ABCDE" change_type="comment" user_login="emmerik" change_data="the comment" created_at="[null]" updated_at="[null]" issue_change_creation_date="[null]"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml index 971c9c75120..61c625b7bcb 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml @@ -24,5 +24,5 @@ issue_creation_date="1262300400000" issue_update_date="1265065200000" issue_close_date="[null]" - /> + /> </dataset> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/README.txt b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/README.txt index 6788e4cd28c..f10856770f2 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/README.txt +++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/README.txt @@ -2,8 +2,8 @@ HOW TO ADD A MIGRATION * Jump some versions when adding the first Ruby on Rails migration of a new sonar version. For example if sonar 2.10 is 193, then sonar 2.11 should start at 200. * Complete the DDL files for H2 : - + sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl - + sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql : + + sonar-core/src/main/resources/org/sonar/db/version/schema-h2.ddl + + sonar-core/src/main/resources/org/sonar/db/version/rows-h2.sql : - add "INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('<THE MIGRATION ID>')" * Update the migration id defined in sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java * If a table is added or removed, then edit sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java diff --git a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/adapter.rb b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/adapter.rb index 2f442f829cc..56effa71abd 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/adapter.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/postgresql/adapter.rb @@ -466,7 +466,7 @@ module ::ArJdbc end #sonar - # standard_conforming_strings is forced to true in JDBC connection pool (see org.sonar.core.persistence.dialect.PostgreSql) + # standard_conforming_strings is forced to true in JDBC connection pool (see org.sonar.db.dialect.PostgreSql) # so double backslashing must be removed def quote_string(s) s.gsub(/'/, "''") # ' (for ruby-mode) diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml index fdc637497e1..9c5ab4e2156 100644 --- a/sonar-batch/pom.xml +++ b/sonar-batch/pom.xml @@ -32,7 +32,6 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-core</artifactId> @@ -117,29 +116,11 @@ </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.dbunit</groupId> - <artifactId>dbunit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-java-api</artifactId> <scope>test</scope> </dependency> <dependency> - <!-- local database --> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.google.code.bean-matchers</groupId> <artifactId>bean-matchers</artifactId> <scope>test</scope> diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java index 353bf44c9c7..ae4a35f7162 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java @@ -49,7 +49,7 @@ import org.sonar.batch.scm.ScmSensor; import org.sonar.batch.source.CodeColorizerSensor; import org.sonar.batch.source.LinesSensor; import org.sonar.core.config.CorePropertyDefinitions; -import org.sonar.core.resource.DefaultResourceTypes; +import org.sonar.core.component.DefaultResourceTypes; public class BatchComponents { private BatchComponents() { diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java index 55cec2910ed..3310365a856 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginInstaller.java @@ -34,8 +34,8 @@ import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.log.Profiler; import org.sonar.core.platform.PluginInfo; -import org.sonar.core.plugins.RemotePlugin; -import org.sonar.core.plugins.RemotePluginFile; +import org.sonar.core.platform.RemotePlugin; +import org.sonar.core.platform.RemotePluginFile; import org.sonar.home.cache.FileCache; /** diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/index/DbDuplicationsIndex.java b/sonar-batch/src/main/java/org/sonar/batch/cpd/index/DbDuplicationsIndex.java deleted file mode 100644 index 5e2908d23f0..00000000000 --- a/sonar-batch/src/main/java/org/sonar/batch/cpd/index/DbDuplicationsIndex.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * 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.batch.cpd.index; - -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import org.sonar.api.batch.fs.InputFile; -import org.sonar.api.batch.fs.internal.DefaultInputFile; -import org.sonar.batch.index.BatchComponentCache; -import org.sonar.core.duplication.DuplicationUnitDto; -import org.sonar.duplications.block.Block; -import org.sonar.duplications.block.ByteArray; - -public class DbDuplicationsIndex { - - private final Map<ByteArray, Collection<Block>> cache = Maps.newHashMap(); - - private final BatchComponentCache resourceCache; - - public DbDuplicationsIndex(BatchComponentCache resourceCache) { - this.resourceCache = resourceCache; - } - - int getSnapshotIdFor(InputFile inputFile) { - return resourceCache.get(((DefaultInputFile) inputFile).key()).snapshotId(); - } - - public void prepareCache(InputFile inputFile) { - List<DuplicationUnitDto> units = new ArrayList<>(); - cache.clear(); - // TODO Godin: maybe remove conversion of units to blocks? - for (DuplicationUnitDto unit : units) { - String hash = unit.getHash(); - String resourceKey = unit.getResourceKey(); - int indexInFile = unit.getIndexInFile(); - int startLine = unit.getStartLine(); - int endLine = unit.getEndLine(); - - // TODO Godin: in fact we could work directly with id instead of key - this will allow to decrease memory consumption - Block block = Block.builder() - .setResourceId(resourceKey) - .setBlockHash(new ByteArray(hash)) - .setIndexInFile(indexInFile) - .setLines(startLine, endLine) - .build(); - - // Group blocks by hash - Collection<Block> sameHash = cache.get(block.getBlockHash()); - if (sameHash == null) { - sameHash = Lists.newArrayList(); - cache.put(block.getBlockHash(), sameHash); - } - sameHash.add(block); - } - } - - public Collection<Block> getByHash(ByteArray hash) { - Collection<Block> result = cache.get(hash); - if (result != null) { - return result; - } else { - return Collections.emptyList(); - } - } - - public void insert(InputFile inputFile, Collection<Block> blocks) { - int resourceSnapshotId = getSnapshotIdFor(inputFile); - - // TODO Godin: maybe remove conversion of blocks to units? - List<DuplicationUnitDto> units = Lists.newArrayList(); - for (Block block : blocks) { - DuplicationUnitDto unit = new DuplicationUnitDto( - // TODO batch is no more creating snapshot - null, - resourceSnapshotId, - block.getBlockHash().toString(), - block.getIndexInFile(), - block.getStartLine(), - block.getEndLine()); - units.add(unit); - } - } - -} diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/index/SonarDuplicationsIndex.java b/sonar-batch/src/main/java/org/sonar/batch/cpd/index/SonarDuplicationsIndex.java index dacedc06b74..ab583d672dd 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/cpd/index/SonarDuplicationsIndex.java +++ b/sonar-batch/src/main/java/org/sonar/batch/cpd/index/SonarDuplicationsIndex.java @@ -19,7 +19,7 @@ */ package org.sonar.batch.cpd.index; -import com.google.common.collect.Lists; +import java.util.Collection; import org.sonar.api.batch.fs.InputFile; import org.sonar.duplications.block.Block; import org.sonar.duplications.block.ByteArray; @@ -27,47 +27,23 @@ import org.sonar.duplications.index.AbstractCloneIndex; import org.sonar.duplications.index.CloneIndex; import org.sonar.duplications.index.PackedMemoryCloneIndex; -import java.util.Collection; -import java.util.List; - public class SonarDuplicationsIndex extends AbstractCloneIndex { private final CloneIndex mem = new PackedMemoryCloneIndex(); - private final DbDuplicationsIndex db; - - public SonarDuplicationsIndex() { - this.db = null; - } - - public SonarDuplicationsIndex(DbDuplicationsIndex db) { - this.db = db; - } public void insert(InputFile inputFile, Collection<Block> blocks) { for (Block block : blocks) { mem.insert(block); } - if (db != null) { - db.insert(inputFile, blocks); - } } public Collection<Block> getByInputFile(InputFile inputFile, String resourceKey) { - if (db != null) { - db.prepareCache(inputFile); - } return mem.getByResourceId(resourceKey); } @Override public Collection<Block> getBySequenceHash(ByteArray hash) { - if (db == null) { - return mem.getBySequenceHash(hash); - } else { - List<Block> result = Lists.newArrayList(mem.getBySequenceHash(hash)); - result.addAll(db.getByHash(hash)); - return result; - } + return mem.getBySequenceHash(hash); } @Override diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/ServerIssueFromDb.java b/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/ServerIssueFromDb.java deleted file mode 100644 index d858d3a745f..00000000000 --- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/ServerIssueFromDb.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * 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.batch.issue.tracking; - -import org.sonar.api.rule.RuleKey; -import org.sonar.core.issue.db.IssueDto; - -public class ServerIssueFromDb implements ServerIssue { - - private IssueDto dto; - - public ServerIssueFromDb(IssueDto dto) { - this.dto = dto; - } - - public IssueDto getDto() { - return dto; - } - - @Override - public String key() { - return dto.getKee(); - } - - @Override - public RuleKey ruleKey() { - return dto.getRuleKey(); - } - - @Override - public String checksum() { - return dto.getChecksum(); - } - - @Override - public Integer line() { - return dto.getLine(); - } - - @Override - public String message() { - return dto.getMessage(); - } - -} diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/UsedQProfiles.java b/sonar-batch/src/main/java/org/sonar/batch/rule/UsedQProfiles.java index 15a6d3cd3ae..e2911b382d5 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/rule/UsedQProfiles.java +++ b/sonar-batch/src/main/java/org/sonar/batch/rule/UsedQProfiles.java @@ -25,7 +25,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.UtcDateUtils; +import org.sonar.core.util.UtcDateUtils; import javax.annotation.concurrent.Immutable; diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java index a224d4a3fb8..0d844339fba 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java @@ -19,8 +19,6 @@ */ package org.sonar.batch.scan; -import org.sonar.batch.bootstrap.ProjectTempFolderProvider; - import com.google.common.annotations.VisibleForTesting; import org.sonar.api.CoreProperties; import org.sonar.api.batch.InstantiationStrategy; @@ -41,6 +39,7 @@ import org.sonar.batch.bootstrap.ExtensionInstaller; import org.sonar.batch.bootstrap.ExtensionMatcher; import org.sonar.batch.bootstrap.ExtensionUtils; import org.sonar.batch.bootstrap.MetricProvider; +import org.sonar.batch.bootstrap.ProjectTempFolderProvider; import org.sonar.batch.bootstrapper.EnvironmentInformation; import org.sonar.batch.deprecated.components.DefaultResourceCreationLock; import org.sonar.batch.duplication.DuplicationCache; @@ -77,7 +76,6 @@ import org.sonar.batch.test.TestableBuilder; import org.sonar.core.issue.IssueUpdater; import org.sonar.core.issue.workflow.FunctionExecutor; import org.sonar.core.issue.workflow.IssueWorkflow; -import org.sonar.core.permission.PermissionFacade; import org.sonar.core.platform.ComponentContainer; public class ProjectScanContainer extends ComponentContainer { @@ -131,7 +129,6 @@ public class ProjectScanContainer extends ComponentContainer { EventBus.class, PhasesTimeProfiler.class, ResourceTypes.class, - PermissionFacade.class, DefaultProjectTree.class, ProjectExclusions.class, ProjectReactorValidator.class, diff --git a/sonar-batch/src/main/resources/org/sonar/batch/bootstrapper/logback.xml b/sonar-batch/src/main/resources/org/sonar/batch/bootstrapper/logback.xml index 4cda7344a24..99f956e4b4c 100644 --- a/sonar-batch/src/main/resources/org/sonar/batch/bootstrapper/logback.xml +++ b/sonar-batch/src/main/resources/org/sonar/batch/bootstrapper/logback.xml @@ -24,7 +24,7 @@ </logger> <!-- sonar.showSql --> - <!-- see also org.sonar.core.persistence.MyBatis#configureLogback() --> + <!-- see also org.sonar.db.MyBatis#configureLogback() --> <logger name="org.mybatis"> <level value="${SQL_LOGGER_LEVEL:-WARN}"/> </logger> diff --git a/sonar-batch/src/main/resources/org/sonar/batch/logback.xml b/sonar-batch/src/main/resources/org/sonar/batch/logback.xml index 8efa6dfeaad..198cd9c1bc6 100644 --- a/sonar-batch/src/main/resources/org/sonar/batch/logback.xml +++ b/sonar-batch/src/main/resources/org/sonar/batch/logback.xml @@ -20,7 +20,7 @@ </logger> <!-- sonar.showSql --> - <!-- see also org.sonar.core.persistence.MyBatis#configureLogback() --> + <!-- see also org.sonar.db.MyBatis#configureLogback() --> <logger name="org.apache.ibatis"> <level value="WARN"/> </logger> diff --git a/sonar-batch/src/test/java/org/sonar/batch/ProjectConfiguratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/ProjectConfiguratorTest.java index 38305cc1c30..a892e726d1e 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/ProjectConfiguratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/ProjectConfiguratorTest.java @@ -27,13 +27,12 @@ import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; import org.sonar.api.resources.Project; import org.sonar.api.utils.System2; -import org.sonar.jpa.test.AbstractDbUnitTestCase; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ProjectConfiguratorTest extends AbstractDbUnitTestCase { +public class ProjectConfiguratorTest { System2 system2; diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java index 319f056dda1..c8d2e367475 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginInstallerTest.java @@ -23,7 +23,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.sonar.core.plugins.RemotePlugin; +import org.sonar.core.platform.RemotePlugin; import org.sonar.home.cache.FileCache; import java.io.File; diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/tracking/IssueTrackingTest.java b/sonar-batch/src/test/java/org/sonar/batch/issue/tracking/IssueTrackingTest.java deleted file mode 100644 index 616c7fb6ed4..00000000000 --- a/sonar-batch/src/test/java/org/sonar/batch/issue/tracking/IssueTrackingTest.java +++ /dev/null @@ -1,391 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * 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.batch.issue.tracking; - -import com.google.common.collect.Lists; -import com.google.common.io.Resources; -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.rules.TemporaryFolder; -import org.sonar.api.batch.fs.internal.DefaultInputFile; -import org.sonar.api.issue.Issue; -import org.sonar.core.issue.DefaultIssue; -import org.sonar.api.resources.Project; -import org.sonar.api.resources.Resource; -import org.sonar.api.rule.RuleKey; -import org.sonar.core.issue.db.IssueDto; - -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Collections; - -import static com.google.common.collect.Lists.newArrayList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; - -public class IssueTrackingTest { - - @Rule - public TemporaryFolder temp = new TemporaryFolder(); - - @Rule - public ExpectedException thrown = ExpectedException.none(); - - IssueTracking tracking; - Resource project; - SourceHashHolder sourceHashHolder; - ServerLineHashesLoader lastSnapshots; - long violationId = 0; - - @Before - public void before() { - lastSnapshots = mock(ServerLineHashesLoader.class); - - project = mock(Project.class); - tracking = new IssueTracking(); - } - - @Test - public void key_should_be_the_prioritary_field_to_check() { - ServerIssueFromDb referenceIssue1 = newReferenceIssue("message", 10, "squid", "AvoidCycle", "checksum1"); - referenceIssue1.getDto().setKee("100"); - ServerIssueFromDb referenceIssue2 = newReferenceIssue("message", 10, "squid", "AvoidCycle", "checksum2"); - referenceIssue2.getDto().setKee("200"); - - // exactly the fields of referenceIssue1 but not the same key - DefaultIssue newIssue = newDefaultIssue("message", 10, RuleKey.of("squid", "AvoidCycle"), "checksum1").setKey("200"); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues(newArrayList(newIssue), Lists.<ServerIssue>newArrayList(referenceIssue1, referenceIssue2), null, result); - // same key - assertThat(result.matching(newIssue)).isSameAs(referenceIssue2); - } - - @Test - public void checksum_should_have_greater_priority_than_line() { - ServerIssue referenceIssue1 = newReferenceIssue("message", 1, "squid", "AvoidCycle", "checksum1"); - ServerIssue referenceIssue2 = newReferenceIssue("message", 3, "squid", "AvoidCycle", "checksum2"); - - DefaultIssue newIssue1 = newDefaultIssue("message", 3, RuleKey.of("squid", "AvoidCycle"), "checksum1"); - DefaultIssue newIssue2 = newDefaultIssue("message", 5, RuleKey.of("squid", "AvoidCycle"), "checksum2"); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues(newArrayList(newIssue1, newIssue2), newArrayList(referenceIssue1, referenceIssue2), null, result); - assertThat(result.matching(newIssue1)).isSameAs(referenceIssue1); - assertThat(result.matching(newIssue2)).isSameAs(referenceIssue2); - } - - /** - * SONAR-2928 - */ - @Test - public void same_rule_and_null_line_and_checksum_but_different_messages() { - DefaultIssue newIssue = newDefaultIssue("new message", null, RuleKey.of("squid", "AvoidCycle"), "checksum1"); - ServerIssue referenceIssue = newReferenceIssue("old message", null, "squid", "AvoidCycle", "checksum1"); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues(newArrayList(newIssue), newArrayList(referenceIssue), null, result); - assertThat(result.matching(newIssue)).isSameAs(referenceIssue); - } - - @Test - public void same_rule_and_line_and_checksum_but_different_messages() { - DefaultIssue newIssue = newDefaultIssue("new message", 1, RuleKey.of("squid", "AvoidCycle"), "checksum1"); - ServerIssue referenceIssue = newReferenceIssue("old message", 1, "squid", "AvoidCycle", "checksum1"); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues(newArrayList(newIssue), newArrayList(referenceIssue), null, result); - assertThat(result.matching(newIssue)).isSameAs(referenceIssue); - } - - @Test - public void same_rule_and_line_message() { - DefaultIssue newIssue = newDefaultIssue("message", 1, RuleKey.of("squid", "AvoidCycle"), "checksum1"); - ServerIssue referenceIssue = newReferenceIssue("message", 1, "squid", "AvoidCycle", "checksum2"); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues(newArrayList(newIssue), newArrayList(referenceIssue), null, result); - assertThat(result.matching(newIssue)).isSameAs(referenceIssue); - } - - @Test - public void should_ignore_reference_measure_without_checksum() { - DefaultIssue newIssue = newDefaultIssue("message", 1, RuleKey.of("squid", "AvoidCycle"), null); - ServerIssue referenceIssue = newReferenceIssue("message", 1, "squid", "NullDeref", null); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues(newArrayList(newIssue), newArrayList(referenceIssue), null, result); - assertThat(result.matching(newIssue)).isNull(); - } - - @Test - public void same_rule_and_message_and_checksum_but_different_line() { - DefaultIssue newIssue = newDefaultIssue("message", 1, RuleKey.of("squid", "AvoidCycle"), "checksum1"); - ServerIssue referenceIssue = newReferenceIssue("message", 2, "squid", "AvoidCycle", "checksum1"); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues(newArrayList(newIssue), newArrayList(referenceIssue), null, result); - assertThat(result.matching(newIssue)).isSameAs(referenceIssue); - } - - /** - * SONAR-2812 - */ - @Test - public void same_checksum_and_rule_but_different_line_and_different_message() { - DefaultIssue newIssue = newDefaultIssue("new message", 1, RuleKey.of("squid", "AvoidCycle"), "checksum1"); - ServerIssue referenceIssue = newReferenceIssue("old message", 2, "squid", "AvoidCycle", "checksum1"); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues(newArrayList(newIssue), newArrayList(referenceIssue), null, result); - assertThat(result.matching(newIssue)).isSameAs(referenceIssue); - } - - @Test - public void should_create_new_issue_when_same_rule_same_message_but_different_line_and_checksum() { - DefaultIssue newIssue = newDefaultIssue("message", 1, RuleKey.of("squid", "AvoidCycle"), "checksum1"); - ServerIssue referenceIssue = newReferenceIssue("message", 2, "squid", "AvoidCycle", "checksum2"); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues(newArrayList(newIssue), newArrayList(referenceIssue), null, result); - assertThat(result.matching(newIssue)).isNull(); - } - - @Test - public void should_not_track_issue_if_different_rule() { - DefaultIssue newIssue = newDefaultIssue("message", 1, RuleKey.of("squid", "AvoidCycle"), "checksum1"); - ServerIssue referenceIssue = newReferenceIssue("message", 1, "squid", "NullDeref", "checksum1"); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues(newArrayList(newIssue), newArrayList(referenceIssue), null, result); - assertThat(result.matching(newIssue)).isNull(); - } - - @Test - public void should_compare_issues_with_database_format() { - // issue messages are trimmed and can be abbreviated when persisted in database. - // Comparing issue messages must use the same format. - DefaultIssue newIssue = newDefaultIssue(" message ", 1, RuleKey.of("squid", "AvoidCycle"), "checksum1"); - ServerIssue referenceIssue = newReferenceIssue("message", 1, "squid", "AvoidCycle", "checksum2"); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues(newArrayList(newIssue), newArrayList(referenceIssue), null, result); - assertThat(result.matching(newIssue)).isSameAs(referenceIssue); - } - - @Test - public void past_issue_not_associated_with_line_should_not_cause_npe() throws Exception { - initLastHashes("example2-v1", "example2-v2"); - - DefaultIssue newIssue = newDefaultIssue("Indentation", 9, RuleKey.of("squid", "AvoidCycle"), "foo"); - ServerIssue referenceIssue = newReferenceIssue("2 branches need to be covered", null, "squid", "AvoidCycle", null); - - IssueTrackingResult result = tracking.track(sourceHashHolder, newArrayList(referenceIssue), newArrayList(newIssue)); - - assertThat(result.matched()).isEmpty(); - } - - @Test - public void new_issue_not_associated_with_line_should_not_cause_npe() throws Exception { - initLastHashes("example2-v1", "example2-v2"); - - DefaultIssue newIssue = newDefaultIssue("1 branch need to be covered", null, RuleKey.of("squid", "AvoidCycle"), "foo"); - ServerIssue referenceIssue = newReferenceIssue("Indentationd", 7, "squid", "AvoidCycle", null); - - IssueTrackingResult result = tracking.track(sourceHashHolder, newArrayList(referenceIssue), newArrayList(newIssue)); - - assertThat(result.matched()).isEmpty(); - } - - /** - * SONAR-2928 - */ - @Test - public void issue_not_associated_with_line() throws Exception { - initLastHashes("example2-v1", "example2-v2"); - - DefaultIssue newIssue = newDefaultIssue("1 branch need to be covered", null, RuleKey.of("squid", "AvoidCycle"), null); - ServerIssue referenceIssue = newReferenceIssue("2 branches need to be covered", null, "squid", "AvoidCycle", null); - - IssueTrackingResult result = tracking.track(sourceHashHolder, newArrayList(referenceIssue), newArrayList(newIssue)); - - assertThat(result.matching(newIssue)).isEqualTo(referenceIssue); - } - - @Test - public void check_valid_line() throws Exception { - initLastHashes("example2-v1", "example2-v2"); - - DefaultIssue newIssue = newDefaultIssue("1 branch need to be covered", 200, RuleKey.of("squid", "AvoidCycle"), null); - - thrown - .expectMessage("Invalid line number for issue"); - - tracking.track(sourceHashHolder, Collections.<ServerIssue>emptyList(), newArrayList(newIssue)); - } - - /** - * SONAR-3072 - */ - @Test - public void should_track_issues_based_on_blocks_recognition_on_example1() throws Exception { - initLastHashes("example1-v1", "example1-v2"); - - ServerIssue referenceIssue1 = newReferenceIssue("Indentation", 7, "squid", "AvoidCycle", null); - ServerIssue referenceIssue2 = newReferenceIssue("Indentation", 11, "squid", "AvoidCycle", null); - - DefaultIssue newIssue1 = newDefaultIssue("Indentation", 9, RuleKey.of("squid", "AvoidCycle"), null); - DefaultIssue newIssue2 = newDefaultIssue("Indentation", 13, RuleKey.of("squid", "AvoidCycle"), null); - DefaultIssue newIssue3 = newDefaultIssue("Indentation", 17, RuleKey.of("squid", "AvoidCycle"), null); - DefaultIssue newIssue4 = newDefaultIssue("Indentation", 21, RuleKey.of("squid", "AvoidCycle"), null); - - IssueTrackingResult result = tracking.track(sourceHashHolder, Arrays.asList(referenceIssue1, referenceIssue2), Arrays.asList(newIssue1, newIssue2, newIssue3, newIssue4)); - - assertThat(result.matching(newIssue1)).isNull(); - assertThat(result.matching(newIssue2)).isNull(); - assertThat(result.matching(newIssue3)).isSameAs(referenceIssue1); - assertThat(result.matching(newIssue4)).isSameAs(referenceIssue2); - } - - /** - * SONAR-3072 - */ - @Test - public void should_track_issues_based_on_blocks_recognition_on_example2() throws Exception { - initLastHashes("example2-v1", "example2-v2"); - - ServerIssue referenceIssue1 = newReferenceIssue("SystemPrintln", 5, "squid", "AvoidCycle", null); - - DefaultIssue newIssue1 = newDefaultIssue("SystemPrintln", 6, RuleKey.of("squid", "AvoidCycle"), null); - DefaultIssue newIssue2 = newDefaultIssue("SystemPrintln", 10, RuleKey.of("squid", "AvoidCycle"), null); - DefaultIssue newIssue3 = newDefaultIssue("SystemPrintln", 14, RuleKey.of("squid", "AvoidCycle"), null); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues( - Arrays.asList(newIssue1, newIssue2, newIssue3), - Arrays.asList(referenceIssue1), - sourceHashHolder, result); - - assertThat(result.matching(newIssue1)).isNull(); - assertThat(result.matching(newIssue2)).isSameAs(referenceIssue1); - assertThat(result.matching(newIssue3)).isNull(); - } - - @Test - public void should_track_issues_based_on_blocks_recognition_on_example3() throws Exception { - initLastHashes("example3-v1", "example3-v2"); - - ServerIssue referenceIssue1 = newReferenceIssue("Avoid unused local variables such as 'j'.", 6, "squid", "AvoidCycle", "63c11570fc0a76434156be5f8138fa03"); - ServerIssue referenceIssue2 = newReferenceIssue("Avoid unused private methods such as 'myMethod()'.", 13, "squid", "NullDeref", "ef23288705d1ef1e512448ace287586e"); - ServerIssue referenceIssue3 = newReferenceIssue("Method 'avoidUtilityClass' is not designed for extension - needs to be abstract, final or empty.", 9, "pmd", - "UnusedLocalVariable", "ed5cdd046fda82727d6fedd1d8e3a310"); - - // New issue - DefaultIssue newIssue1 = newDefaultIssue("Avoid unused local variables such as 'msg'.", 18, RuleKey.of("squid", "AvoidCycle"), "a24254126be2bf1a9b9a8db43f633733"); - // Same as referenceIssue2 - DefaultIssue newIssue2 = newDefaultIssue("Avoid unused private methods such as 'myMethod()'.", 13, RuleKey.of("squid", "NullDeref"), "ef23288705d1ef1e512448ace287586e"); - // Same as referenceIssue3 - DefaultIssue newIssue3 = newDefaultIssue("Method 'avoidUtilityClass' is not designed for extension - needs to be abstract, final or empty.", 9, - RuleKey.of("pmd", "UnusedLocalVariable"), "ed5cdd046fda82727d6fedd1d8e3a310"); - // New issue - DefaultIssue newIssue4 = newDefaultIssue("Method 'newViolation' is not designed for extension - needs to be abstract, final or empty.", 17, - RuleKey.of("pmd", "UnusedLocalVariable"), "7d58ac9040c27e4ca2f11a0269e251e2"); - // Same as referenceIssue1 - DefaultIssue newIssue5 = newDefaultIssue("Avoid unused local variables such as 'j'.", 6, RuleKey.of("squid", "AvoidCycle"), "4432a2675ec3e1620daefe38386b51ef"); - - IssueTrackingResult result = new IssueTrackingResult(); - tracking.mapIssues( - Arrays.asList(newIssue1, newIssue2, newIssue3, newIssue4, newIssue5), - Arrays.asList(referenceIssue1, referenceIssue2, referenceIssue3), - sourceHashHolder, result); - - assertThat(result.matching(newIssue1)).isNull(); - assertThat(result.matching(newIssue2)).isSameAs(referenceIssue2); - assertThat(result.matching(newIssue3)).isSameAs(referenceIssue3); - assertThat(result.matching(newIssue4)).isNull(); - assertThat(result.matching(newIssue5)).isSameAs(referenceIssue1); - } - - @Test - public void dont_load_checksum_if_no_new_issue() { - sourceHashHolder = mock(SourceHashHolder.class); - - ServerIssue referenceIssue = newReferenceIssue("2 branches need to be covered", null, "squid", "AvoidCycle", null); - - tracking.track(sourceHashHolder, newArrayList(referenceIssue), Collections.<DefaultIssue>emptyList()); - - verifyZeroInteractions(lastSnapshots, sourceHashHolder); - } - - private static String load(String name) throws IOException { - return Resources.toString(IssueTrackingTest.class.getResource("IssueTrackingTest/" + name + ".txt"), StandardCharsets.UTF_8); - } - - private DefaultIssue newDefaultIssue(String message, Integer line, RuleKey ruleKey, String checksum) { - return new DefaultIssue().setMessage(message).setLine(line).setRuleKey(ruleKey).setChecksum(checksum).setStatus(Issue.STATUS_OPEN); - } - - private ServerIssueFromDb newReferenceIssue(String message, Integer lineId, String ruleRepo, String ruleKey, String lineChecksum) { - IssueDto referenceIssue = new IssueDto(); - Long id = violationId++; - referenceIssue.setId(id); - referenceIssue.setKee(Long.toString(id)); - referenceIssue.setLine(lineId); - referenceIssue.setMessage(message); - referenceIssue.setRuleKey(ruleRepo, ruleKey); - referenceIssue.setChecksum(lineChecksum); - referenceIssue.setResolution(null); - referenceIssue.setStatus(Issue.STATUS_OPEN); - return new ServerIssueFromDb(referenceIssue); - } - - private void initLastHashes(String reference, String newSource) throws IOException { - DefaultInputFile inputFile = mock(DefaultInputFile.class); - File f = temp.newFile(); - when(inputFile.path()).thenReturn(f.toPath()); - when(inputFile.file()).thenReturn(f); - when(inputFile.charset()).thenReturn(StandardCharsets.UTF_8); - String data = load(newSource); - when(inputFile.lines()).thenReturn(StringUtils.countMatches(data, "\n") + 1); - FileUtils.write(f, data, StandardCharsets.UTF_8); - when(inputFile.key()).thenReturn("foo:Action.java"); - when(lastSnapshots.getLineHashes("foo:Action.java")).thenReturn(computeHexHashes(load(reference))); - sourceHashHolder = new SourceHashHolder(inputFile, lastSnapshots); - } - - private String[] computeHexHashes(String source) { - String[] lines = source.split("\n"); - String[] hashes = new String[lines.length]; - for (int i = 0; i < lines.length; i++) { - hashes[i] = DigestUtils.md5Hex(lines[i].replaceAll("[\t ]", "")); - } - return hashes; - } -} diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/ReportPublisherTest.java b/sonar-batch/src/test/java/org/sonar/batch/report/ReportPublisherTest.java index 8d2bdf973c7..ea301e425b0 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/report/ReportPublisherTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/report/ReportPublisherTest.java @@ -29,20 +29,16 @@ import org.sonar.api.platform.Server; import org.sonar.api.utils.TempFolder; import org.sonar.batch.bootstrap.DefaultAnalysisMode; import org.sonar.batch.bootstrap.ServerClient; -import org.sonar.batch.index.BatchComponentCache; import org.sonar.batch.scan.ImmutableProjectReactor; -import org.sonar.jpa.test.AbstractDbUnitTestCase; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class ReportPublisherTest extends AbstractDbUnitTestCase { +public class ReportPublisherTest { private DefaultAnalysisMode mode; - BatchComponentCache resourceCache = mock(BatchComponentCache.class); - private ImmutableProjectReactor reactor; @Before diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java b/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java index f362690979a..81a9afb5938 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java @@ -29,7 +29,7 @@ import org.sonar.api.batch.fs.internal.DefaultFileSystem; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.resources.Project; import org.sonar.api.test.IsMeasure; -import org.sonar.core.UtcDateUtils; +import org.sonar.core.util.UtcDateUtils; import java.util.Collections; import java.util.Date; diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/UsedQProfilesTest.java b/sonar-batch/src/test/java/org/sonar/batch/rule/UsedQProfilesTest.java index 1a26aeba91d..2bdd9fe7401 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/rule/UsedQProfilesTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/rule/UsedQProfilesTest.java @@ -20,7 +20,7 @@ package org.sonar.batch.rule; import org.junit.Test; -import org.sonar.core.UtcDateUtils; +import org.sonar.core.util.UtcDateUtils; import java.util.Arrays; import java.util.Map; diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml index cb7784aaefc..2f9a09ab9d8 100644 --- a/sonar-core/pom.xml +++ b/sonar-core/pom.xml @@ -11,7 +11,7 @@ <artifactId>sonar-core</artifactId> <name>SonarQube :: Core</name> - <description>Core components shared to batch and server</description> + <description>Library shared by analyzer and server</description> <dependencies> <dependency> @@ -41,32 +41,14 @@ <version>4.1</version> </dependency> <dependency> - <groupId>org.mybatis</groupId> - <artifactId>mybatis</artifactId> - </dependency> - <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-update-center-common</artifactId> </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar-batch-protocol</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-home</artifactId> </dependency> <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - </dependency> - <dependency> - <groupId>commons-dbutils</groupId> - <artifactId>commons-dbutils</artifactId> - </dependency> - <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-graph</artifactId> </dependency> @@ -110,11 +92,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.dbunit</groupId> - <artifactId>dbunit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.google.code.bean-matchers</groupId> <artifactId>bean-matchers</artifactId> <scope>test</scope> @@ -125,56 +102,11 @@ <version>4.1.21</version> <scope>test</scope> </dependency> - - - - <!-- - JDBC drivers for MyBatis integration tests. - They can't be moved to the profile run-mybatis-its because - --> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/main/gen-java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> @@ -199,17 +131,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java b/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java index c9dd6d1e78e..ad5856a6667 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java +++ b/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java @@ -19,6 +19,7 @@ */ package org.sonar.core.component; +import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; import org.sonar.api.batch.fs.InputPath; import org.sonar.api.database.model.ResourceModel; @@ -26,8 +27,6 @@ import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.resources.Scopes; -import javax.annotation.Nullable; - public final class ComponentKeys { /* @@ -46,9 +45,6 @@ public final class ComponentKeys { } /** - * - * @param project - * @param resource * @return the full key of a component, based on its parent projects' key and own key */ public static String createEffectiveKey(Project project, Resource resource) { diff --git a/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourceTypes.java b/sonar-core/src/main/java/org/sonar/core/component/DefaultResourceTypes.java index fcd6ffdab73..c6411165af7 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourceTypes.java +++ b/sonar-core/src/main/java/org/sonar/core/component/DefaultResourceTypes.java @@ -17,7 +17,7 @@ * 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.resource; +package org.sonar.core.component; import org.sonar.api.batch.BatchSide; import org.sonar.api.resources.Qualifiers; diff --git a/sonar-core/src/main/java/org/sonar/core/component/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/component/db/package-info.java deleted file mode 100644 index c30c0a24205..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/component/db/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.component.db; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/component/package-info.java b/sonar-core/src/main/java/org/sonar/core/component/package-info.java index 918f2ef4869..1d523349b1e 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/package-info.java +++ b/sonar-core/src/main/java/org/sonar/core/component/package-info.java @@ -21,3 +21,4 @@ package org.sonar.core.component; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/computation/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/computation/db/package-info.java deleted file mode 100644 index d10519ef9d9..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/computation/db/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -@ParametersAreNonnullByDefault -package org.sonar.core.computation.db; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java deleted file mode 100644 index 8a7156fd308..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -@ParametersAreNonnullByDefault -package org.sonar.core.computation.dbcleaner; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/package-info.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/package-info.java deleted file mode 100644 index 283ef7fa912..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -@ParametersAreNonnullByDefault -package org.sonar.core.computation.dbcleaner.period; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java index c4506f9beda..fd8d25fe29a 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java +++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java @@ -27,7 +27,6 @@ import org.sonar.api.CoreProperties; import org.sonar.api.PropertyType; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.resources.Qualifiers; -import org.sonar.core.computation.dbcleaner.DataCleanerProperties; public class CorePropertyDefinitions { @@ -41,7 +40,7 @@ public class CorePropertyDefinitions { defs.addAll(ExclusionProperties.all()); defs.addAll(SecurityProperties.all()); defs.addAll(DebtProperties.all()); - defs.addAll(DataCleanerProperties.all()); + defs.addAll(PurgeProperties.all()); defs.addAll(ImmutableList.of( PropertyDefinition.builder(CoreProperties.SERVER_BASE_URL) @@ -51,11 +50,11 @@ public class CorePropertyDefinitions { .defaultValue(CoreProperties.SERVER_BASE_URL_DEFAULT_VALUE) .build(), - PropertyDefinition.builder(CoreProperties.LINKS_HOME_PAGE) - .name("Project Home Page") - .description("HTTP URL of the home page of the project.") - .hidden() - .build(), + PropertyDefinition.builder(CoreProperties.LINKS_HOME_PAGE) + .name("Project Home Page") + .description("HTTP URL of the home page of the project.") + .hidden() + .build(), PropertyDefinition.builder(CoreProperties.LINKS_CI) .name("CI server") .description("HTTP URL of the continuous integration server.") @@ -164,7 +163,7 @@ public class CorePropertyDefinitions { .onlyOnQualifiers(Qualifiers.PROJECT) .build(), - // WEB LOOK&FEEL + // WEB LOOK&FEEL PropertyDefinition.builder("sonar.lf.logoUrl") .deprecatedKey("sonar.branding.image") .name("Logo URL") @@ -195,7 +194,7 @@ public class CorePropertyDefinitions { .subCategory(CoreProperties.SUBCATEGORY_LOOKNFEEL) .build(), - // ISSUES + // ISSUES PropertyDefinition.builder(CoreProperties.DEFAULT_ISSUE_ASSIGNEE) .name("Default Assignee") .description("New issues will be assigned to this user each time it is not possible to determine the user who is the author of the issue.") @@ -205,68 +204,68 @@ public class CorePropertyDefinitions { .type(PropertyType.USER_LOGIN) .build(), - // BATCH + // BATCH - PropertyDefinition.builder(CoreProperties.CORE_VIOLATION_LOCALE_PROPERTY) - .defaultValue("en") - .name("Locale used for issue messages") - .description("Deprecated property. Keep default value for backward compatibility.") - .hidden() - .build(), + PropertyDefinition.builder(CoreProperties.CORE_VIOLATION_LOCALE_PROPERTY) + .defaultValue("en") + .name("Locale used for issue messages") + .description("Deprecated property. Keep default value for backward compatibility.") + .hidden() + .build(), - PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 1) - .name("Period 1") - .description("Period used to compare measures and track new issues. Values are : <ul class='bullet'><li>Number of days before " + - "analysis, for example 5.</li><li>A custom date. Format is yyyy-MM-dd, for example 2010-12-25</li><li>'previous_analysis' to " + - "compare to previous analysis</li><li>'previous_version' to compare to the previous version in the project history</li></ul>" + - "<p>When specifying a number of days or a date, the snapshot selected for comparison is " + - " the first one available inside the corresponding time range. </p>" + - "<p>Changing this property only takes effect after subsequent project inspections.<p/>") - .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_1) - .category(CoreProperties.CATEGORY_GENERAL) - .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) - .build(), + PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 1) + .name("Period 1") + .description("Period used to compare measures and track new issues. Values are : <ul class='bullet'><li>Number of days before " + + "analysis, for example 5.</li><li>A custom date. Format is yyyy-MM-dd, for example 2010-12-25</li><li>'previous_analysis' to " + + "compare to previous analysis</li><li>'previous_version' to compare to the previous version in the project history</li></ul>" + + "<p>When specifying a number of days or a date, the snapshot selected for comparison is " + + " the first one available inside the corresponding time range. </p>" + + "<p>Changing this property only takes effect after subsequent project inspections.<p/>") + .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_1) + .category(CoreProperties.CATEGORY_GENERAL) + .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) + .build(), - PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 2) - .name("Period 2") - .description("See the property 'Period 1'") - .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_2) - .category(CoreProperties.CATEGORY_GENERAL) - .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) - .build(), + PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 2) + .name("Period 2") + .description("See the property 'Period 1'") + .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_2) + .category(CoreProperties.CATEGORY_GENERAL) + .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) + .build(), - PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 3) - .name("Period 3") - .description("See the property 'Period 1'") - .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_3) - .category(CoreProperties.CATEGORY_GENERAL) - .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) - .build(), + PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 3) + .name("Period 3") + .description("See the property 'Period 1'") + .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_3) + .category(CoreProperties.CATEGORY_GENERAL) + .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) + .build(), - PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 4) - .name("Period 4") - .description("Period used to compare measures and track new issues. This property is specific to the project. Values are : " + - "<ul class='bullet'><li>Number of days before analysis, for example 5.</li><li>A custom date. Format is yyyy-MM-dd, " + - "for example 2010-12-25</li><li>'previous_analysis' to compare to previous analysis</li>" + - "<li>'previous_version' to compare to the previous version in the project history</li><li>A version, for example 1.2</li></ul>" + - "<p>When specifying a number of days or a date, the snapshot selected for comparison is the first one available inside the corresponding time range. </p>" + - "<p>Changing this property only takes effect after subsequent project inspections.<p/>") - .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_4) - .onlyOnQualifiers(Qualifiers.PROJECT) - .category(CoreProperties.CATEGORY_GENERAL) - .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) - .build(), + PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 4) + .name("Period 4") + .description("Period used to compare measures and track new issues. This property is specific to the project. Values are : " + + "<ul class='bullet'><li>Number of days before analysis, for example 5.</li><li>A custom date. Format is yyyy-MM-dd, " + + "for example 2010-12-25</li><li>'previous_analysis' to compare to previous analysis</li>" + + "<li>'previous_version' to compare to the previous version in the project history</li><li>A version, for example 1.2</li></ul>" + + "<p>When specifying a number of days or a date, the snapshot selected for comparison is the first one available inside the corresponding time range. </p>" + + "<p>Changing this property only takes effect after subsequent project inspections.<p/>") + .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_4) + .onlyOnQualifiers(Qualifiers.PROJECT) + .category(CoreProperties.CATEGORY_GENERAL) + .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) + .build(), - PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 5) - .name("Period 5") - .description("See the property 'Period 4'") - .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_5) - .onlyOnQualifiers(Qualifiers.PROJECT) - .category(CoreProperties.CATEGORY_GENERAL) - .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) - .build(), + PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 5) + .name("Period 5") + .description("See the property 'Period 4'") + .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_5) + .onlyOnQualifiers(Qualifiers.PROJECT) + .category(CoreProperties.CATEGORY_GENERAL) + .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) + .build(), - // CPD + // CPD PropertyDefinition.builder(CoreProperties.CPD_CROSS_PROJECT) .defaultValue(Boolean.toString(CoreProperties.CPD_CROSS_RPOJECT_DEFAULT_VALUE)) .name("Cross project duplication detection") diff --git a/sonar-core/src/main/java/org/sonar/core/config/DebtProperties.java b/sonar-core/src/main/java/org/sonar/core/config/DebtProperties.java index e53e113c708..2899477be3e 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/DebtProperties.java +++ b/sonar-core/src/main/java/org/sonar/core/config/DebtProperties.java @@ -21,14 +21,13 @@ package org.sonar.core.config; import com.google.common.collect.ImmutableList; +import java.util.List; import org.sonar.api.CoreProperties; import org.sonar.api.PropertyType; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.config.PropertyFieldDefinition; import org.sonar.api.measures.CoreMetrics; -import java.util.List; - class DebtProperties { private DebtProperties() { @@ -100,6 +99,6 @@ class DebtProperties { .build() ) .build() - ); + ); } } diff --git a/sonar-core/src/main/java/org/sonar/core/config/ExclusionProperties.java b/sonar-core/src/main/java/org/sonar/core/config/ExclusionProperties.java index 5f6e968c2d8..9813911c193 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/ExclusionProperties.java +++ b/sonar-core/src/main/java/org/sonar/core/config/ExclusionProperties.java @@ -20,13 +20,12 @@ package org.sonar.core.config; import com.google.common.collect.ImmutableList; +import java.util.List; import org.sonar.api.CoreProperties; import org.sonar.api.PropertyType; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.resources.Qualifiers; -import java.util.List; - public class ExclusionProperties { private ExclusionProperties() { diff --git a/sonar-core/src/main/java/org/sonar/core/config/IssueExclusionProperties.java b/sonar-core/src/main/java/org/sonar/core/config/IssueExclusionProperties.java index b98f1cab9be..041470114b0 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/IssueExclusionProperties.java +++ b/sonar-core/src/main/java/org/sonar/core/config/IssueExclusionProperties.java @@ -20,14 +20,13 @@ package org.sonar.core.config; import com.google.common.collect.ImmutableList; +import java.util.List; import org.sonar.api.CoreProperties; import org.sonar.api.PropertyType; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.config.PropertyFieldDefinition; import org.sonar.api.resources.Qualifiers; -import java.util.List; - public final class IssueExclusionProperties { public static final String SUB_CATEGORY_IGNORE_ISSUES = "issues"; @@ -145,6 +144,6 @@ public final class IssueExclusionProperties { .build() ) .build() - ); + ); } } diff --git a/sonar-core/src/main/java/org/sonar/core/config/Logback.java b/sonar-core/src/main/java/org/sonar/core/config/Logback.java index ba9824191cb..efe9aede004 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/Logback.java +++ b/sonar-core/src/main/java/org/sonar/core/config/Logback.java @@ -19,22 +19,20 @@ */ package org.sonar.core.config; -import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.util.StatusPrinter; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.slf4j.LoggerFactory; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Map; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.slf4j.LoggerFactory; +import org.sonar.api.batch.BatchSide; +import org.sonar.api.server.ServerSide; /** * Configure Logback @@ -87,7 +85,4 @@ public class Logback { return context; } - public void setLoggerLevel(String loggerName, Level level) { - ((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(loggerName)).setLevel(level); - } } diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerConstants.java b/sonar-core/src/main/java/org/sonar/core/config/PurgeConstants.java index a577f632608..480fa2a684e 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerConstants.java +++ b/sonar-core/src/main/java/org/sonar/core/config/PurgeConstants.java @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.core.config; -public interface DbCleanerConstants { +public interface PurgeConstants { String PLUGIN_KEY = "dbcleaner"; String PLUGIN_NAME = "DbCleaner"; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DataCleanerProperties.java b/sonar-core/src/main/java/org/sonar/core/config/PurgeProperties.java index f4bc98dea9a..a4b57985b68 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DataCleanerProperties.java +++ b/sonar-core/src/main/java/org/sonar/core/config/PurgeProperties.java @@ -18,24 +18,23 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.core.config; +import java.util.Arrays; +import java.util.List; import org.sonar.api.CoreProperties; import org.sonar.api.PropertyType; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.resources.Qualifiers; -import java.util.Arrays; -import java.util.List; - -public final class DataCleanerProperties { +public final class PurgeProperties { - private DataCleanerProperties() { + private PurgeProperties() { } public static List<PropertyDefinition> all() { return Arrays.asList( - PropertyDefinition.builder(DbCleanerConstants.PROPERTY_CLEAN_DIRECTORY) + PropertyDefinition.builder(PurgeConstants.PROPERTY_CLEAN_DIRECTORY) .defaultValue("true") .name("Clean directory/package history") .description("If set to true, no history is kept at directory/package level. Setting this to false can cause database bloat.") @@ -46,7 +45,7 @@ public final class DataCleanerProperties { .index(1) .build(), - PropertyDefinition.builder(DbCleanerConstants.DAYS_BEFORE_DELETING_CLOSED_ISSUES) + PropertyDefinition.builder(PurgeConstants.DAYS_BEFORE_DELETING_CLOSED_ISSUES) .defaultValue("30") .name("Delete closed issues after") .description("Issues that have been closed for more than this number of days will be deleted.") @@ -57,7 +56,7 @@ public final class DataCleanerProperties { .index(2) .build(), - PropertyDefinition.builder(DbCleanerConstants.HOURS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_DAY) + PropertyDefinition.builder(PurgeConstants.HOURS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_DAY) .defaultValue("24") .name("Keep only one snapshot a day after") .description("After this number of hours, if there are several snapshots during the same day, " @@ -69,7 +68,7 @@ public final class DataCleanerProperties { .index(3) .build(), - PropertyDefinition.builder(DbCleanerConstants.WEEKS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_WEEK) + PropertyDefinition.builder(PurgeConstants.WEEKS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_WEEK) .defaultValue("4") .name("Keep only one snapshot a week after") .description("After this number of weeks, if there are several snapshots during the same week, " @@ -81,7 +80,7 @@ public final class DataCleanerProperties { .index(4) .build(), - PropertyDefinition.builder(DbCleanerConstants.WEEKS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_MONTH) + PropertyDefinition.builder(PurgeConstants.WEEKS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_MONTH) .defaultValue("52") .name("Keep only one snapshot a month after") .description("After this number of weeks, if there are several snapshots during the same month, " @@ -93,7 +92,7 @@ public final class DataCleanerProperties { .index(5) .build(), - PropertyDefinition.builder(DbCleanerConstants.WEEKS_BEFORE_DELETING_ALL_SNAPSHOTS) + PropertyDefinition.builder(PurgeConstants.WEEKS_BEFORE_DELETING_ALL_SNAPSHOTS) .defaultValue("260") .name("Delete all snapshots after") .description("After this number of weeks, all snapshots are fully deleted.") diff --git a/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java index ec10843e3e9..5c40e31aa1c 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java +++ b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java @@ -20,12 +20,11 @@ package org.sonar.core.config; import com.google.common.collect.ImmutableList; +import java.util.List; import org.sonar.api.CoreProperties; import org.sonar.api.PropertyType; import org.sonar.api.config.PropertyDefinition; -import java.util.List; - class SecurityProperties { private SecurityProperties() { diff --git a/sonar-core/src/main/java/org/sonar/core/config/package-info.java b/sonar-core/src/main/java/org/sonar/core/config/package-info.java index e2df78bded3..fad3203780c 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/package-info.java +++ b/sonar-core/src/main/java/org/sonar/core/config/package-info.java @@ -21,3 +21,4 @@ package org.sonar.core.config; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/package-info.java b/sonar-core/src/main/java/org/sonar/core/dashboard/package-info.java deleted file mode 100644 index e354181289e..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.dashboard; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/duplication/package-info.java b/sonar-core/src/main/java/org/sonar/core/duplication/package-info.java deleted file mode 100644 index ed92061017a..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/duplication/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.duplication; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java b/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java index 4ec0d8db26d..3b4bb3150d9 100644 --- a/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java +++ b/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java @@ -37,7 +37,6 @@ class DurationLabel { return getMessage(nbSeconds, nbMinutes, nbHours, nbDays, nbYears); } - private static Result getMessage(double nbSeconds, double nbMinutes, double nbHours, double nbDays, double nbYears) { if (nbSeconds < 45) { return message("seconds"); @@ -52,15 +51,15 @@ class DurationLabel { } else if (nbHours < 48) { return message("day"); } else if (nbDays < 30) { - return message("days", (long)(Math.floor(nbDays))); + return message("days", (long) (Math.floor(nbDays))); } else if (nbDays < 60) { - return message( "month"); + return message("month"); } else if (nbDays < 365) { - return message("months", (long)(Math.floor(nbDays / 30))); + return message("months", (long) (Math.floor(nbDays / 30))); } else if (nbYears < 2) { return message("year"); } - return message("years", (long)(Math.floor(nbYears))); + return message("years", (long) (Math.floor(nbYears))); } private static Result message(String key) { diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/I18nClassloader.java b/sonar-core/src/main/java/org/sonar/core/i18n/I18nClassloader.java index 9c672864ead..4020f09ffaf 100644 --- a/sonar-core/src/main/java/org/sonar/core/i18n/I18nClassloader.java +++ b/sonar-core/src/main/java/org/sonar/core/i18n/I18nClassloader.java @@ -21,13 +21,12 @@ package org.sonar.core.i18n; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; -import org.sonar.api.Plugin; -import org.sonar.core.platform.PluginInfo; -import org.sonar.core.platform.PluginRepository; - import java.net.URL; import java.net.URLClassLoader; import java.util.List; +import org.sonar.api.Plugin; +import org.sonar.core.platform.PluginInfo; +import org.sonar.core.platform.PluginRepository; /** * Aggregation of all plugin and core classloaders, used to search for all l10n bundles diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/RuleI18nManager.java b/sonar-core/src/main/java/org/sonar/core/i18n/RuleI18nManager.java index d529ee02c31..f58f6ea1331 100644 --- a/sonar-core/src/main/java/org/sonar/core/i18n/RuleI18nManager.java +++ b/sonar-core/src/main/java/org/sonar/core/i18n/RuleI18nManager.java @@ -19,15 +19,13 @@ */ package org.sonar.core.i18n; +import java.util.Locale; +import javax.annotation.CheckForNull; import org.apache.commons.lang.StringUtils; import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; import org.sonar.api.i18n.RuleI18n; import org.sonar.api.rules.Rule; - -import javax.annotation.CheckForNull; - -import java.util.Locale; +import org.sonar.api.server.ServerSide; /** * @deprecated in 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885 diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/package-info.java b/sonar-core/src/main/java/org/sonar/core/i18n/package-info.java index 56497024b63..1e17722791c 100644 --- a/sonar-core/src/main/java/org/sonar/core/i18n/package-info.java +++ b/sonar-core/src/main/java/org/sonar/core/i18n/package-info.java @@ -21,3 +21,4 @@ package org.sonar.core.i18n; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultActionPlan.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultActionPlan.java index 0fe3fd96aeb..3e8fbdded69 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultActionPlan.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultActionPlan.java @@ -20,12 +20,11 @@ package org.sonar.core.issue; -import org.sonar.api.issue.ActionPlan; -import org.sonar.api.utils.internal.Uuids; - +import java.util.Date; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import java.util.Date; +import org.sonar.api.issue.ActionPlan; +import org.sonar.api.utils.internal.Uuids; public class DefaultActionPlan implements ActionPlan { @@ -39,7 +38,7 @@ public class DefaultActionPlan implements ActionPlan { private Date createdAt; private Date updatedAt; - public DefaultActionPlan(){ + public DefaultActionPlan() { } diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java index 962a4591916..5990eb41146 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java @@ -21,15 +21,13 @@ package org.sonar.core.issue; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; +import java.util.Map; +import javax.annotation.Nullable; import org.sonar.api.issue.Issuable; import org.sonar.api.issue.Issue; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.internal.Uuids; -import javax.annotation.Nullable; - -import java.util.Map; - public class DefaultIssueBuilder implements Issuable.IssueBuilder { private String componentKey; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueComment.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueComment.java index 3a5b23b0056..c54e50546ee 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueComment.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueComment.java @@ -19,14 +19,12 @@ */ package org.sonar.core.issue; -import org.sonar.api.issue.IssueComment; -import org.sonar.api.utils.internal.Uuids; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - import java.io.Serializable; import java.util.Date; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; +import org.sonar.api.issue.IssueComment; +import org.sonar.api.utils.internal.Uuids; /** * PLUGINS MUST NOT BE USED THIS CLASS, EXCEPT FOR UNIT TESTING. diff --git a/sonar-core/src/main/java/org/sonar/core/issue/FieldDiffs.java b/sonar-core/src/main/java/org/sonar/core/issue/FieldDiffs.java index d162056a795..784b9b9cf27 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/FieldDiffs.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/FieldDiffs.java @@ -118,9 +118,9 @@ public class FieldDiffs implements Serializable { String[] values = keyValues[1].split("\\|"); String oldValue = ""; String newValue = ""; - if(values.length == 1) { + if (values.length == 1) { newValue = Strings.nullToEmpty(values[0]); - } else if(values.length == 2) { + } else if (values.length == 2) { oldValue = Strings.nullToEmpty(values[0]); newValue = Strings.nullToEmpty(values[1]); } @@ -180,10 +180,10 @@ public class FieldDiffs implements Serializable { @Override public String toString() { - //TODO escape , and | characters + // TODO escape , and | characters StringBuilder sb = new StringBuilder(); - if(newValue != null) { - if(oldValue != null) { + if (newValue != null) { + if (oldValue != null) { sb.append(oldValue.toString()); sb.append('|'); } diff --git a/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeContext.java b/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeContext.java index 1df5bd5e3eb..f9637fa398d 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeContext.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeContext.java @@ -19,11 +19,10 @@ */ package org.sonar.core.issue; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - import java.io.Serializable; import java.util.Date; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; /** * PLUGINS MUST NOT BE USED THIS CLASS, EXCEPT FOR UNIT TESTING. diff --git a/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java b/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java index cb3bb6079aa..e9884c6539a 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java @@ -25,22 +25,20 @@ import com.google.common.base.Objects; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.Sets; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.Set; +import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateUtils; import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; import org.sonar.api.issue.ActionPlan; +import org.sonar.api.server.ServerSide; import org.sonar.api.server.rule.RuleTagFormat; import org.sonar.api.user.User; import org.sonar.api.utils.Duration; -import javax.annotation.Nullable; - -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; -import java.util.Set; - /** * Updates issue fields and chooses if changes must be kept in history. */ diff --git a/sonar-core/src/main/java/org/sonar/core/issue/tracking/Input.java b/sonar-core/src/main/java/org/sonar/core/issue/tracking/Input.java index b0681c67c94..9d2f1183ef0 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/tracking/Input.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/tracking/Input.java @@ -24,7 +24,9 @@ import java.util.Collection; public interface Input<ISSUE extends Trackable> { LineHashSequence getLineHashSequence(); + BlockHashSequence getBlockHashSequence(); + Collection<ISSUE> getIssues(); } diff --git a/sonar-core/src/main/java/org/sonar/core/issue/tracking/package-info.java b/sonar-core/src/main/java/org/sonar/core/issue/tracking/package-info.java index 1438e8aee5a..9ea80ad727c 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/tracking/package-info.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/tracking/package-info.java @@ -21,3 +21,4 @@ package org.sonar.core.issue.tracking; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Function.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/Function.java index ad25ff016a3..e7c54d2d8f6 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Function.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/workflow/Function.java @@ -19,17 +19,20 @@ */ package org.sonar.core.issue.workflow; +import javax.annotation.Nullable; import org.sonar.api.issue.Issue; import org.sonar.api.user.User; -import javax.annotation.Nullable; - interface Function { interface Context { Issue issue(); + Context setAssignee(@Nullable User user); + Context setResolution(@Nullable String s); + Context setCloseDate(boolean b); + Context setLine(@Nullable Integer line); } diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/FunctionExecutor.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/FunctionExecutor.java index dfeac403458..c76a11af301 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/FunctionExecutor.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/workflow/FunctionExecutor.java @@ -19,16 +19,15 @@ */ package org.sonar.core.issue.workflow; +import javax.annotation.Nullable; import org.sonar.api.batch.BatchSide; -import org.sonar.core.issue.DefaultIssue; -import org.sonar.core.issue.IssueChangeContext; -import org.sonar.api.server.ServerSide; import org.sonar.api.issue.Issue; +import org.sonar.api.server.ServerSide; import org.sonar.api.user.User; +import org.sonar.core.issue.DefaultIssue; +import org.sonar.core.issue.IssueChangeContext; import org.sonar.core.issue.IssueUpdater; -import javax.annotation.Nullable; - @BatchSide @ServerSide public class FunctionExecutor { diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/State.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/State.java index bce33fbfc12..50b451897cf 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/State.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/workflow/State.java @@ -23,12 +23,11 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; -import org.sonar.api.issue.Issue; - -import javax.annotation.CheckForNull; import java.util.List; import java.util.Set; +import javax.annotation.CheckForNull; +import org.apache.commons.lang.StringUtils; +import org.sonar.api.issue.Issue; public class State { private final String key; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Transition.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/Transition.java index fa4f3bbfef3..cdb52e9a7a6 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/Transition.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/workflow/Transition.java @@ -22,13 +22,12 @@ package org.sonar.core.issue.workflow; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; +import java.util.Arrays; +import java.util.List; import org.apache.commons.lang.StringUtils; import org.sonar.api.issue.Issue; import org.sonar.api.issue.condition.Condition; -import java.util.Arrays; -import java.util.List; - public class Transition { private final String key; private final String from; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/package-info.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/package-info.java index f4dc7f69eca..9a8fa299d88 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/package-info.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/workflow/package-info.java @@ -21,3 +21,4 @@ package org.sonar.core.issue.workflow; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/measure/custom/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/measure/custom/db/package-info.java deleted file mode 100644 index 4635db7f1aa..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/measure/custom/db/package-info.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -@ParametersAreNonnullByDefault -package org.sonar.core.measure.custom.db; - -import javax.annotation.ParametersAreNonnullByDefault; - diff --git a/sonar-core/src/main/java/org/sonar/core/notification/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/notification/db/package-info.java deleted file mode 100644 index 4fb140dd4cd..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/notification/db/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.notification.db; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/notification/package-info.java b/sonar-core/src/main/java/org/sonar/core/notification/package-info.java deleted file mode 100644 index c53b6d4b186..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/notification/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.notification; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/package-info.java b/sonar-core/src/main/java/org/sonar/core/persistence/dialect/package-info.java deleted file mode 100644 index b61912c93f3..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.persistence.dialect; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/package-info.java b/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/package-info.java deleted file mode 100644 index efd32c18d20..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -@ParametersAreNonnullByDefault -package org.sonar.core.persistence.migration.v44; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v45/package-info.java b/sonar-core/src/main/java/org/sonar/core/persistence/migration/v45/package-info.java deleted file mode 100644 index 4e661d78b28..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v45/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.persistence.migration.v45; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v50/package-info.java b/sonar-core/src/main/java/org/sonar/core/persistence/migration/v50/package-info.java deleted file mode 100644 index af7d784eb29..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v50/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -@ParametersAreNonnullByDefault -package org.sonar.core.persistence.migration.v50; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/package-info.java b/sonar-core/src/main/java/org/sonar/core/persistence/profiling/package-info.java deleted file mode 100644 index e7e56c621ca..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.persistence.profiling; - -import javax.annotation.ParametersAreNonnullByDefault; - diff --git a/sonar-core/src/main/java/org/sonar/core/platform/ComponentKeys.java b/sonar-core/src/main/java/org/sonar/core/platform/ComponentKeys.java index be315cd9cf7..1e02781c64f 100644 --- a/sonar-core/src/main/java/org/sonar/core/platform/ComponentKeys.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/ComponentKeys.java @@ -19,13 +19,12 @@ */ package org.sonar.core.platform; -import org.sonar.api.utils.internal.Uuids; -import org.sonar.api.utils.log.Logger; -import org.sonar.api.utils.log.Loggers; - import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; +import org.sonar.api.utils.internal.Uuids; +import org.sonar.api.utils.log.Logger; +import org.sonar.api.utils.log.Loggers; class ComponentKeys { diff --git a/sonar-core/src/main/java/org/sonar/core/component/Module.java b/sonar-core/src/main/java/org/sonar/core/platform/Module.java index 1d905291e5d..93319cc19ea 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/Module.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/Module.java @@ -17,10 +17,9 @@ * 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.component; +package org.sonar.core.platform; import javax.annotation.Nullable; -import org.sonar.core.platform.ComponentContainer; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/sonar-core/src/main/java/org/sonar/core/platform/PluginInfo.java b/sonar-core/src/main/java/org/sonar/core/platform/PluginInfo.java index 63938311df0..464a28099ad 100644 --- a/sonar-core/src/main/java/org/sonar/core/platform/PluginInfo.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/PluginInfo.java @@ -26,19 +26,17 @@ import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.ComparisonChain; import com.google.common.collect.Ordering; -import org.apache.commons.lang.StringUtils; -import org.sonar.api.utils.log.Loggers; -import org.sonar.updatecenter.common.PluginManifest; -import org.sonar.updatecenter.common.Version; - -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import java.io.File; import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import org.apache.commons.lang.StringUtils; +import org.sonar.api.utils.log.Loggers; +import org.sonar.updatecenter.common.PluginManifest; +import org.sonar.updatecenter.common.Version; public class PluginInfo implements Comparable<PluginInfo> { diff --git a/sonar-core/src/main/java/org/sonar/core/platform/PluginJarExploder.java b/sonar-core/src/main/java/org/sonar/core/platform/PluginJarExploder.java index fb96c72ae9e..36fbd51244d 100644 --- a/sonar-core/src/main/java/org/sonar/core/platform/PluginJarExploder.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/PluginJarExploder.java @@ -22,9 +22,8 @@ package org.sonar.core.platform; import java.io.File; import java.util.Collection; import java.util.Collections; -import org.sonar.api.utils.ZipUtils; - import java.util.zip.ZipEntry; +import org.sonar.api.utils.ZipUtils; import static org.apache.commons.io.FileUtils.listFiles; diff --git a/sonar-core/src/main/java/org/sonar/core/platform/PluginRepository.java b/sonar-core/src/main/java/org/sonar/core/platform/PluginRepository.java index a66251b288d..8457d391f9c 100644 --- a/sonar-core/src/main/java/org/sonar/core/platform/PluginRepository.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/PluginRepository.java @@ -19,12 +19,11 @@ */ package org.sonar.core.platform; -import org.sonar.api.batch.BatchSide; +import java.util.Collection; import org.sonar.api.Plugin; +import org.sonar.api.batch.BatchSide; import org.sonar.api.server.ServerSide; -import java.util.Collection; - /** * Provides information about the plugins installed in the dependency injection container */ diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java b/sonar-core/src/main/java/org/sonar/core/platform/RemotePlugin.java index f460118d445..39b5c7bde23 100644 --- a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/RemotePlugin.java @@ -17,11 +17,10 @@ * 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.plugins; +package org.sonar.core.platform; import java.io.File; import org.apache.commons.lang.StringUtils; -import org.sonar.core.platform.PluginInfo; import org.sonar.home.cache.FileHashes; public class RemotePlugin { diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePluginFile.java b/sonar-core/src/main/java/org/sonar/core/platform/RemotePluginFile.java index b6ab0c30298..9ad6ac15650 100644 --- a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePluginFile.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/RemotePluginFile.java @@ -17,8 +17,7 @@ * 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.plugins; - +package org.sonar.core.platform; public class RemotePluginFile { diff --git a/sonar-core/src/main/java/org/sonar/core/platform/package-info.java b/sonar-core/src/main/java/org/sonar/core/platform/package-info.java index d93af63a5ba..49e472128c1 100644 --- a/sonar-core/src/main/java/org/sonar/core/platform/package-info.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/package-info.java @@ -25,3 +25,4 @@ package org.sonar.core.platform; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/qualitygate/db/package-info.java deleted file mode 100644 index b46142598fa..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.qualitygate.db; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/package-info.java deleted file mode 100644 index 5f335f1e946..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.qualityprofile.db; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/package-info.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/package-info.java deleted file mode 100644 index 0f09c0fc850..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.qualityprofile; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/resource/package-info.java b/sonar-core/src/main/java/org/sonar/core/resource/package-info.java deleted file mode 100644 index c6b551c3d8a..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/resource/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.resource; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/event/package-info.java b/sonar-core/src/main/java/org/sonar/core/rule/package-info.java index a11358f5f24..0d12323afc0 100644 --- a/sonar-core/src/main/java/org/sonar/core/event/package-info.java +++ b/sonar-core/src/main/java/org/sonar/core/rule/package-info.java @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - @ParametersAreNonnullByDefault -package org.sonar.core.event; +package org.sonar.core.rule; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/source/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/source/db/package-info.java deleted file mode 100644 index 25857d48a33..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/source/db/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -@ParametersAreNonnullByDefault -package org.sonar.core.source.db; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/package-info.java deleted file mode 100644 index 0b40886eff2..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -@ParametersAreNonnullByDefault -package org.sonar.core.technicaldebt.db; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/package-info.java b/sonar-core/src/main/java/org/sonar/core/technicaldebt/package-info.java deleted file mode 100644 index 195391217b5..00000000000 --- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.core.technicaldebt; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/user/DefaultUser.java b/sonar-core/src/main/java/org/sonar/core/user/DefaultUser.java index 8d0fef42618..2847081ff06 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/DefaultUser.java +++ b/sonar-core/src/main/java/org/sonar/core/user/DefaultUser.java @@ -19,14 +19,13 @@ */ package org.sonar.core.user; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.sonar.api.user.User; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - /** * @since 3.6 */ diff --git a/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java b/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java index ad63f77f220..a1bcbee4601 100644 --- a/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java +++ b/sonar-core/src/main/java/org/sonar/core/util/DefaultHttpDownloader.java @@ -28,17 +28,6 @@ import com.google.common.io.ByteStreams; import com.google.common.io.CharStreams; import com.google.common.io.Files; import com.google.common.io.InputSupplier; -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.sonar.api.config.Settings; -import org.sonar.api.platform.Server; -import org.sonar.api.utils.HttpDownloader; -import org.sonar.api.utils.SonarException; -import org.sonar.api.utils.log.Loggers; - -import javax.annotation.Nullable; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -53,6 +42,15 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.zip.GZIPInputStream; +import javax.annotation.Nullable; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.sonar.api.config.Settings; +import org.sonar.api.platform.Server; +import org.sonar.api.utils.HttpDownloader; +import org.sonar.api.utils.SonarException; +import org.sonar.api.utils.log.Loggers; /** * This component downloads HTTP files diff --git a/sonar-core/src/main/java/org/sonar/core/util/MultiSets.java b/sonar-core/src/main/java/org/sonar/core/util/MultiSets.java index 05c93b572b2..4606b93704c 100644 --- a/sonar-core/src/main/java/org/sonar/core/util/MultiSets.java +++ b/sonar-core/src/main/java/org/sonar/core/util/MultiSets.java @@ -23,7 +23,6 @@ package org.sonar.core.util; import com.google.common.collect.Multiset; import com.google.common.collect.Ordering; import com.google.common.primitives.Ints; - import java.util.List; /** diff --git a/sonar-core/src/main/java/org/sonar/core/util/NonNullInputFunction.java b/sonar-core/src/main/java/org/sonar/core/util/NonNullInputFunction.java index 9ec5fbb4ec2..702fb1df5f5 100644 --- a/sonar-core/src/main/java/org/sonar/core/util/NonNullInputFunction.java +++ b/sonar-core/src/main/java/org/sonar/core/util/NonNullInputFunction.java @@ -20,7 +20,6 @@ package org.sonar.core.util; import com.google.common.base.Function; - import javax.annotation.Nullable; import static com.google.common.base.Preconditions.checkArgument; @@ -29,7 +28,7 @@ import static com.google.common.base.Preconditions.checkArgument; * Guava Function that does not accept null input elements * @since 5.1 */ -public abstract class NonNullInputFunction<F,T> implements Function<F, T> { +public abstract class NonNullInputFunction<F, T> implements Function<F, T> { @Override public final T apply(@Nullable F input) { diff --git a/sonar-core/src/main/java/org/sonar/core/UtcDateUtils.java b/sonar-core/src/main/java/org/sonar/core/util/UtcDateUtils.java index 298fda02e34..d6f404651b5 100644 --- a/sonar-core/src/main/java/org/sonar/core/UtcDateUtils.java +++ b/sonar-core/src/main/java/org/sonar/core/util/UtcDateUtils.java @@ -17,14 +17,13 @@ * 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; - -import org.sonar.api.utils.DateUtils; +package org.sonar.core.util; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; +import org.sonar.api.utils.DateUtils; public class UtcDateUtils { diff --git a/sonar-core/src/main/java/org/sonar/core/util/package-info.java b/sonar-core/src/main/java/org/sonar/core/util/package-info.java index 5f2ad77c297..cd7efe7a2b3 100644 --- a/sonar-core/src/main/java/org/sonar/core/util/package-info.java +++ b/sonar-core/src/main/java/org/sonar/core/util/package-info.java @@ -22,3 +22,4 @@ package org.sonar.core.util; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourceTypesTest.java b/sonar-core/src/test/java/org/sonar/core/component/DefaultResourceTypesTest.java index a09303ff2b9..0c3723fee14 100644 --- a/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourceTypesTest.java +++ b/sonar-core/src/test/java/org/sonar/core/component/DefaultResourceTypesTest.java @@ -17,7 +17,7 @@ * 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.resource; +package org.sonar.core.component; import org.junit.Test; import org.sonar.api.resources.Qualifiers; diff --git a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java index f96c5fe7632..a02fc1d962c 100644 --- a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java @@ -19,11 +19,10 @@ */ package org.sonar.core.config; +import java.util.List; import org.junit.Test; import org.sonar.api.config.PropertyDefinition; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; public class CorePropertyDefinitionsTest { diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DataCleanerPropertiesTest.java b/sonar-core/src/test/java/org/sonar/core/config/PurgePropertiesTest.java index d6fc2766cef..0086caa33dc 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DataCleanerPropertiesTest.java +++ b/sonar-core/src/test/java/org/sonar/core/config/PurgePropertiesTest.java @@ -18,16 +18,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.core.config; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -public class DataCleanerPropertiesTest { +public class PurgePropertiesTest { @Test public void shouldGetExtensions() { - assertThat(DataCleanerProperties.all()).hasSize(6); + assertThat(PurgeProperties.all()).hasSize(6); } } diff --git a/sonar-core/src/test/java/org/sonar/core/i18n/DurationLabelTest.java b/sonar-core/src/test/java/org/sonar/core/i18n/DurationLabelTest.java index 96a9f5efafe..82733720657 100644 --- a/sonar-core/src/test/java/org/sonar/core/i18n/DurationLabelTest.java +++ b/sonar-core/src/test/java/org/sonar/core/i18n/DurationLabelTest.java @@ -80,7 +80,7 @@ public class DurationLabelTest { @Test public void age_in_hours() { long hours = 3; - DurationLabel.Result result = DurationLabel.label(now() - ago(hours * HOUR)); + DurationLabel.Result result = DurationLabel.label(now() - ago(hours * HOUR)); assertThat(result.key()).isEqualTo("duration.hours"); assertThat(result.value()).isEqualTo(hours); } diff --git a/sonar-core/src/test/java/org/sonar/core/i18n/I18nClassloaderTest.java b/sonar-core/src/test/java/org/sonar/core/i18n/I18nClassloaderTest.java index 19f9add77cc..c02ef81bd5f 100644 --- a/sonar-core/src/test/java/org/sonar/core/i18n/I18nClassloaderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/i18n/I18nClassloaderTest.java @@ -20,15 +20,14 @@ package org.sonar.core.i18n; import com.google.common.collect.Lists; +import java.net.URL; +import java.net.URLClassLoader; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.core.platform.PluginRepository; -import java.net.URL; -import java.net.URLClassLoader; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/sonar-core/src/test/java/org/sonar/core/i18n/RuleI18nManagerTest.java b/sonar-core/src/test/java/org/sonar/core/i18n/RuleI18nManagerTest.java index 3dbf9a83a35..e1550a05d2b 100644 --- a/sonar-core/src/test/java/org/sonar/core/i18n/RuleI18nManagerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/i18n/RuleI18nManagerTest.java @@ -19,15 +19,17 @@ */ package org.sonar.core.i18n; +import java.util.Locale; import org.hamcrest.core.Is; import org.junit.Test; -import java.util.Locale; - -import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; public class RuleI18nManagerTest { @@ -60,7 +62,8 @@ public class RuleI18nManagerTest { String propertyKeyForName = "rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck.name"; DefaultI18n i18n = mock(DefaultI18n.class); - when(i18n.messageFromFile(Locale.ENGLISH, "rules/checkstyle/com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck.html", propertyKeyForName)).thenReturn("Description"); + when(i18n.messageFromFile(Locale.ENGLISH, "rules/checkstyle/com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck.html", propertyKeyForName)).thenReturn( + "Description"); RuleI18nManager ruleI18n = new RuleI18nManager(i18n); String description = ruleI18n.getDescription("checkstyle", "com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck", Locale.ENGLISH); diff --git a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java index 4572e8ac599..c3daf8b8848 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java @@ -20,6 +20,8 @@ package org.sonar.core.issue; import com.google.common.collect.ImmutableMap; +import java.text.SimpleDateFormat; +import java.util.List; import org.apache.commons.lang.StringUtils; import org.junit.Test; import org.sonar.api.issue.Issue; @@ -27,9 +29,6 @@ import org.sonar.api.issue.IssueComment; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.Duration; -import java.text.SimpleDateFormat; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; import static org.junit.Assert.fail; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/IssueChangeContextTest.java b/sonar-core/src/test/java/org/sonar/core/issue/IssueChangeContextTest.java index ed424565037..143acaf75d3 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/IssueChangeContextTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/IssueChangeContextTest.java @@ -19,9 +19,8 @@ */ package org.sonar.core.issue; -import org.junit.Test; - import java.util.Date; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/IssueUpdaterTest.java b/sonar-core/src/test/java/org/sonar/core/issue/IssueUpdaterTest.java index c3d927cbe3c..ab5954ac145 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/IssueUpdaterTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/IssueUpdaterTest.java @@ -19,6 +19,7 @@ */ package org.sonar.core.issue; +import java.util.Date; import org.junit.Before; import org.junit.Test; import org.sonar.api.issue.ActionPlan; @@ -26,10 +27,14 @@ import org.sonar.api.user.User; import org.sonar.api.utils.Duration; import org.sonar.core.user.DefaultUser; -import java.util.Date; - import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.core.issue.IssueUpdater.*; +import static org.sonar.core.issue.IssueUpdater.ACTION_PLAN; +import static org.sonar.core.issue.IssueUpdater.ASSIGNEE; +import static org.sonar.core.issue.IssueUpdater.RESOLUTION; +import static org.sonar.core.issue.IssueUpdater.SEVERITY; +import static org.sonar.core.issue.IssueUpdater.STATUS; +import static org.sonar.core.issue.IssueUpdater.TECHNICAL_DEBT; +import static org.sonar.core.issue.IssueUpdater.UNUSED; public class IssueUpdaterTest { diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsBeingClosedTest.java b/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsBeingClosedTest.java index 04e6c29304e..2d69d744767 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsBeingClosedTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsBeingClosedTest.java @@ -27,7 +27,6 @@ import static org.sonar.core.issue.workflow.IsBeingClosed.INSTANCE; public class IsBeingClosedTest { - @Test public void should_be_end_of_life() { DefaultIssue issue = new DefaultIssue(); diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IssueWorkflowTest.java b/sonar-core/src/test/java/org/sonar/core/issue/workflow/IssueWorkflowTest.java index 5ea870b09fb..57a1d934b9b 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IssueWorkflowTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/workflow/IssueWorkflowTest.java @@ -21,22 +21,21 @@ package org.sonar.core.issue.workflow; import com.google.common.base.Function; import com.google.common.collect.Collections2; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import javax.annotation.Nullable; import org.apache.commons.lang.time.DateUtils; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.sonar.api.issue.DefaultTransitions; import org.sonar.api.issue.Issue; +import org.sonar.api.rule.RuleKey; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueChangeContext; -import org.sonar.api.rule.RuleKey; import org.sonar.core.issue.IssueUpdater; -import javax.annotation.Nullable; - -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; @@ -139,7 +138,6 @@ public class IssueWorkflowTest { } } - @Test public void do_automatic_transition() { workflow.start(); @@ -153,10 +151,10 @@ public class IssueWorkflowTest { .setBeingClosed(true); Date now = new Date(); workflow.doAutomaticTransition(issue, IssueChangeContext.createScan(now)); - assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FIXED); - assertThat(issue.status()).isEqualTo(Issue.STATUS_CLOSED); - assertThat(issue.closeDate()).isNotNull(); - assertThat(issue.updateDate()).isEqualTo(DateUtils.truncate(now, Calendar.SECOND)); + Assertions.assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FIXED); + Assertions.assertThat(issue.status()).isEqualTo(Issue.STATUS_CLOSED); + Assertions.assertThat(issue.closeDate()).isNotNull(); + Assertions.assertThat(issue.updateDate()).isEqualTo(DateUtils.truncate(now, Calendar.SECOND)); } @Test @@ -171,10 +169,10 @@ public class IssueWorkflowTest { .setBeingClosed(true); Date now = new Date(); workflow.doAutomaticTransition(issue, IssueChangeContext.createScan(now)); - assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FIXED); - assertThat(issue.status()).isEqualTo(Issue.STATUS_CLOSED); - assertThat(issue.closeDate()).isNotNull(); - assertThat(issue.updateDate()).isEqualTo(DateUtils.truncate(now, Calendar.SECOND)); + Assertions.assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FIXED); + Assertions.assertThat(issue.status()).isEqualTo(Issue.STATUS_CLOSED); + Assertions.assertThat(issue.closeDate()).isNotNull(); + Assertions.assertThat(issue.updateDate()).isEqualTo(DateUtils.truncate(now, Calendar.SECOND)); } @Test @@ -189,10 +187,10 @@ public class IssueWorkflowTest { .setBeingClosed(true); Date now = new Date(); workflow.doAutomaticTransition(issue, IssueChangeContext.createScan(now)); - assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FIXED); - assertThat(issue.status()).isEqualTo(Issue.STATUS_CLOSED); - assertThat(issue.closeDate()).isNotNull(); - assertThat(issue.updateDate()).isEqualTo(DateUtils.truncate(now, Calendar.SECOND)); + Assertions.assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FIXED); + Assertions.assertThat(issue.status()).isEqualTo(Issue.STATUS_CLOSED); + Assertions.assertThat(issue.closeDate()).isNotNull(); + Assertions.assertThat(issue.updateDate()).isEqualTo(DateUtils.truncate(now, Calendar.SECOND)); } @Test @@ -207,13 +205,12 @@ public class IssueWorkflowTest { .setBeingClosed(true); Date now = new Date(); workflow.doAutomaticTransition(issue, IssueChangeContext.createScan(now)); - assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FIXED); - assertThat(issue.status()).isEqualTo(Issue.STATUS_CLOSED); - assertThat(issue.closeDate()).isNotNull(); - assertThat(issue.updateDate()).isEqualTo(DateUtils.truncate(now, Calendar.SECOND)); + Assertions.assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FIXED); + Assertions.assertThat(issue.status()).isEqualTo(Issue.STATUS_CLOSED); + Assertions.assertThat(issue.closeDate()).isNotNull(); + Assertions.assertThat(issue.updateDate()).isEqualTo(DateUtils.truncate(now, Calendar.SECOND)); } - @Test public void fail_if_unknown_status_on_automatic_trans() { workflow.start(); @@ -243,11 +240,11 @@ public class IssueWorkflowTest { workflow.start(); workflow.doTransition(issue, DefaultTransitions.FALSE_POSITIVE, IssueChangeContext.createScan(new Date())); - assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FALSE_POSITIVE); - assertThat(issue.status()).isEqualTo(Issue.STATUS_RESOLVED); + Assertions.assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FALSE_POSITIVE); + Assertions.assertThat(issue.status()).isEqualTo(Issue.STATUS_RESOLVED); // should remove assignee - assertThat(issue.assignee()).isNull(); + Assertions.assertThat(issue.assignee()).isNull(); } @Test @@ -261,11 +258,11 @@ public class IssueWorkflowTest { workflow.start(); workflow.doTransition(issue, DefaultTransitions.WONT_FIX, IssueChangeContext.createScan(new Date())); - assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_WONT_FIX); - assertThat(issue.status()).isEqualTo(Issue.STATUS_RESOLVED); + Assertions.assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_WONT_FIX); + Assertions.assertThat(issue.status()).isEqualTo(Issue.STATUS_RESOLVED); // should remove assignee - assertThat(issue.assignee()).isNull(); + Assertions.assertThat(issue.assignee()).isNull(); } @Test @@ -282,19 +279,19 @@ public class IssueWorkflowTest { Transition.create("resolve", "OPEN", "RESOLVED"), Transition.create("falsepositive", "OPEN", "RESOLVED"), Transition.create("wontfix", "OPEN", "RESOLVED") - ); + ); workflow.doTransition(issue, "resolve", mock(IssueChangeContext.class)); - assertThat(issue.resolution()).isEqualTo("FIXED"); - assertThat(issue.status()).isEqualTo("RESOLVED"); + Assertions.assertThat(issue.resolution()).isEqualTo("FIXED"); + Assertions.assertThat(issue.status()).isEqualTo("RESOLVED"); assertThat(workflow.outTransitions(issue)).containsOnly( Transition.create("reopen", "RESOLVED", "REOPENED") - ); + ); workflow.doAutomaticTransition(issue, mock(IssueChangeContext.class)); - assertThat(issue.resolution()).isEqualTo("FIXED"); - assertThat(issue.status()).isEqualTo("CLOSED"); + Assertions.assertThat(issue.resolution()).isEqualTo("FIXED"); + Assertions.assertThat(issue.status()).isEqualTo("CLOSED"); } @Test @@ -313,28 +310,28 @@ public class IssueWorkflowTest { Transition.create("resolve", "OPEN", "RESOLVED"), Transition.create("falsepositive", "OPEN", "RESOLVED"), Transition.create("wontfix", "OPEN", "RESOLVED") - ); + ); workflow.doTransition(issue, "confirm", mock(IssueChangeContext.class)); - assertThat(issue.resolution()).isNull(); - assertThat(issue.status()).isEqualTo("CONFIRMED"); + Assertions.assertThat(issue.resolution()).isNull(); + Assertions.assertThat(issue.status()).isEqualTo("CONFIRMED"); assertThat(workflow.outTransitions(issue)).containsOnly( Transition.create("unconfirm", "CONFIRMED", "REOPENED"), Transition.create("resolve", "CONFIRMED", "RESOLVED"), Transition.create("falsepositive", "CONFIRMED", "RESOLVED"), Transition.create("wontfix", "CONFIRMED", "RESOLVED") - ); + ); // keep confirmed and unresolved workflow.doAutomaticTransition(issue, mock(IssueChangeContext.class)); - assertThat(issue.resolution()).isNull(); - assertThat(issue.status()).isEqualTo("CONFIRMED"); + Assertions.assertThat(issue.resolution()).isNull(); + Assertions.assertThat(issue.status()).isEqualTo("CONFIRMED"); // unconfirm workflow.doTransition(issue, "unconfirm", mock(IssueChangeContext.class)); - assertThat(issue.resolution()).isNull(); - assertThat(issue.status()).isEqualTo("REOPENED"); + Assertions.assertThat(issue.resolution()).isNull(); + Assertions.assertThat(issue.status()).isEqualTo("REOPENED"); } @Test @@ -351,8 +348,8 @@ public class IssueWorkflowTest { workflow.start(); workflow.doAutomaticTransition(issue, mock(IssueChangeContext.class)); - assertThat(issue.resolution()).isEqualTo("REMOVED"); - assertThat(issue.status()).isEqualTo("CLOSED"); + Assertions.assertThat(issue.resolution()).isEqualTo("REMOVED"); + Assertions.assertThat(issue.status()).isEqualTo("CLOSED"); } @Test @@ -369,8 +366,8 @@ public class IssueWorkflowTest { workflow.start(); workflow.doAutomaticTransition(issue, mock(IssueChangeContext.class)); - assertThat(issue.resolution()).isEqualTo("FIXED"); - assertThat(issue.status()).isEqualTo("CLOSED"); + Assertions.assertThat(issue.resolution()).isEqualTo("FIXED"); + Assertions.assertThat(issue.status()).isEqualTo("CLOSED"); } private Collection<String> keys(List<Transition> transitions) { diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/StateTest.java b/sonar-core/src/test/java/org/sonar/core/issue/workflow/StateTest.java index c9ad378df48..ef157b42a15 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/StateTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/workflow/StateTest.java @@ -51,7 +51,7 @@ public class StateTest { @Test public void no_duplicated_out_transitions() { try { - new State("CLOSE", new Transition[]{t1, t1}); + new State("CLOSE", new Transition[] {t1, t1}); fail(); } catch (IllegalArgumentException e) { assertThat(e).hasMessage("Transition 'close' is declared several times from the originating state 'CLOSE'"); diff --git a/sonar-core/src/test/java/org/sonar/core/platform/ComponentContainerTest.java b/sonar-core/src/test/java/org/sonar/core/platform/ComponentContainerTest.java index 2bb3b101e02..ef19ff48434 100644 --- a/sonar-core/src/test/java/org/sonar/core/platform/ComponentContainerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/platform/ComponentContainerTest.java @@ -19,6 +19,7 @@ */ package org.sonar.core.platform; +import java.util.Arrays; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -26,8 +27,6 @@ import org.picocontainer.injectors.ProviderAdapter; import org.sonar.api.Property; import org.sonar.api.config.PropertyDefinitions; -import java.util.Arrays; - import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/component/ModuleTest.java b/sonar-core/src/test/java/org/sonar/core/platform/ModuleTest.java index 5a2f061a7c8..d6b880565e4 100644 --- a/sonar-core/src/test/java/org/sonar/core/component/ModuleTest.java +++ b/sonar-core/src/test/java/org/sonar/core/platform/ModuleTest.java @@ -17,10 +17,9 @@ * 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.component; +package org.sonar.core.platform; import org.junit.Test; -import org.sonar.core.platform.ComponentContainer; import static org.assertj.core.api.Assertions.assertThat; @@ -30,7 +29,7 @@ public class ModuleTest { @Test(expected = NullPointerException.class) public void configure_throws_NPE_if_container_is_empty() { - new Module() { + new Module() { @Override protected void configureModule() { // empty diff --git a/sonar-core/src/test/java/org/sonar/core/platform/PicoUtilsTest.java b/sonar-core/src/test/java/org/sonar/core/platform/PicoUtilsTest.java index 67b488584a9..281105a25ab 100644 --- a/sonar-core/src/test/java/org/sonar/core/platform/PicoUtilsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/platform/PicoUtilsTest.java @@ -19,13 +19,12 @@ */ package org.sonar.core.platform; +import java.io.IOException; import org.junit.Test; import org.picocontainer.Characteristics; import org.picocontainer.MutablePicoContainer; import org.picocontainer.PicoLifecycleException; -import java.io.IOException; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/sonar-core/src/test/java/org/sonar/core/platform/PluginInfoTest.java b/sonar-core/src/test/java/org/sonar/core/platform/PluginInfoTest.java index 22f5e462afe..2b02b48d42f 100644 --- a/sonar-core/src/test/java/org/sonar/core/platform/PluginInfoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/platform/PluginInfoTest.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.List; import javax.annotation.Nullable; import org.apache.commons.io.FileUtils; +import org.assertj.core.api.Assertions; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -67,11 +68,11 @@ public class PluginInfoTest { List<PluginInfo> plugins = Arrays.asList(java1, cobol, javaNoVersion, noVersion, java2); List<PluginInfo> ordered = natural().sortedCopy(plugins); - assertThat(ordered.get(0)).isSameAs(cobol); - assertThat(ordered.get(1)).isSameAs(javaNoVersion); - assertThat(ordered.get(2)).isSameAs(java1); - assertThat(ordered.get(3)).isSameAs(java2); - assertThat(ordered.get(4)).isSameAs(noVersion); + Assertions.assertThat(ordered.get(0)).isSameAs(cobol); + Assertions.assertThat(ordered.get(1)).isSameAs(javaNoVersion); + Assertions.assertThat(ordered.get(2)).isSameAs(java1); + Assertions.assertThat(ordered.get(3)).isSameAs(java2); + Assertions.assertThat(ordered.get(4)).isSameAs(noVersion); } @Test @@ -187,7 +188,7 @@ public class PluginInfoTest { @Test public void create_from_file() { - File checkstyleJar = FileUtils.toFile(getClass().getResource("/org/sonar/core/plugins/sonar-checkstyle-plugin-2.8.jar")); + File checkstyleJar = FileUtils.toFile(getClass().getResource("/org/sonar/core/platform/sonar-checkstyle-plugin-2.8.jar")); PluginInfo checkstyleInfo = PluginInfo.create(checkstyleJar); assertThat(checkstyleInfo.getName()).isEqualTo("Checkstyle"); diff --git a/sonar-core/src/test/java/org/sonar/core/platform/PluginJarExploderTest.java b/sonar-core/src/test/java/org/sonar/core/platform/PluginJarExploderTest.java index 6e760f551e3..bbabf503c75 100644 --- a/sonar-core/src/test/java/org/sonar/core/platform/PluginJarExploderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/platform/PluginJarExploderTest.java @@ -19,14 +19,13 @@ */ package org.sonar.core.platform; +import java.io.File; import org.apache.commons.io.FileUtils; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.sonar.api.utils.ZipUtils; -import java.io.File; - import static org.assertj.core.api.Assertions.assertThat; public class PluginJarExploderTest { @@ -76,6 +75,6 @@ public class PluginJarExploderTest { } private File getFile(String filename) { - return FileUtils.toFile(getClass().getResource("/org/sonar/core/plugins/" + filename)); + return FileUtils.toFile(getClass().getResource("/org/sonar/core/platform/" + filename)); } } diff --git a/sonar-core/src/test/java/org/sonar/core/platform/PluginLoaderTest.java b/sonar-core/src/test/java/org/sonar/core/platform/PluginLoaderTest.java index e16ce16058f..fbeae3a2483 100644 --- a/sonar-core/src/test/java/org/sonar/core/platform/PluginLoaderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/platform/PluginLoaderTest.java @@ -21,7 +21,6 @@ package org.sonar.core.platform; import com.google.common.collect.ImmutableMap; import java.io.File; -import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -32,15 +31,12 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.sonar.api.Plugin; import org.sonar.api.SonarPlugin; -import org.sonar.api.utils.ZipUtils; import org.sonar.updatecenter.common.Version; -import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; public class PluginLoaderTest { @@ -150,8 +146,6 @@ public class PluginLoaderTest { // TODO test mask - require change in sonar-classloader } - - /** * Does not unzip jar file. It directly returns the JAR file defined on PluginInfo. */ diff --git a/sonar-core/src/test/java/org/sonar/core/plugins/RemotePluginTest.java b/sonar-core/src/test/java/org/sonar/core/platform/RemotePluginTest.java index 7649e0e13a1..863468cf689 100644 --- a/sonar-core/src/test/java/org/sonar/core/plugins/RemotePluginTest.java +++ b/sonar-core/src/test/java/org/sonar/core/platform/RemotePluginTest.java @@ -17,7 +17,7 @@ * 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.plugins; +package org.sonar.core.platform; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java index 06667f543fb..8ca54546371 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java @@ -19,6 +19,20 @@ */ package org.sonar.core.util; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.SocketAddress; +import java.net.SocketTimeoutException; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Properties; +import java.util.zip.GZIPOutputStream; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.junit.AfterClass; @@ -38,21 +52,6 @@ import org.sonar.api.config.Settings; import org.sonar.api.platform.Server; import org.sonar.api.utils.SonarException; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.InetSocketAddress; -import java.net.Proxy; -import java.net.ProxySelector; -import java.net.SocketAddress; -import java.net.SocketTimeoutException; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Properties; -import java.util.zip.GZIPOutputStream; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java b/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java index 689c5e36468..e5b98d3b08a 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java @@ -19,13 +19,12 @@ */ package org.sonar.core.util; -import org.junit.Test; - -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.TrustManager; import java.io.IOException; import java.net.URL; import java.security.KeyManagementException; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.TrustManager; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/sonar-core/src/test/java/org/sonar/core/util/MultiSetsTest.java b/sonar-core/src/test/java/org/sonar/core/util/MultiSetsTest.java index 9f5109a36b3..9d4b0ed4614 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/MultiSetsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/MultiSetsTest.java @@ -22,9 +22,8 @@ package org.sonar.core.util; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; -import org.junit.Test; - import java.util.List; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/util/NonNullInputFunctionTest.java b/sonar-core/src/test/java/org/sonar/core/util/NonNullInputFunctionTest.java index 100ab15cce3..090e71414a6 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/NonNullInputFunctionTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/NonNullInputFunctionTest.java @@ -43,7 +43,7 @@ public class NonNullInputFunctionTest { assertThat(sut.apply("foo")).isEqualTo(3); } - private static class TestFunction extends NonNullInputFunction<String,Integer> { + private static class TestFunction extends NonNullInputFunction<String, Integer> { @Override protected Integer doApply(String input) { return input.length(); diff --git a/sonar-core/src/test/java/org/sonar/core/UtcDateUtilsTest.java b/sonar-core/src/test/java/org/sonar/core/util/UtcDateUtilsTest.java index ce1dc931ff6..bf23479069a 100644 --- a/sonar-core/src/test/java/org/sonar/core/UtcDateUtilsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/UtcDateUtilsTest.java @@ -17,11 +17,10 @@ * 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; - -import org.junit.Test; +package org.sonar.core.util; import java.util.Date; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/sonar-core/src/test/projects/base-plugin/src/org/sonar/plugins/base/BasePlugin.java b/sonar-core/src/test/projects/base-plugin/src/org/sonar/plugins/base/BasePlugin.java index e4c41e585e5..6afa10ce96c 100644 --- a/sonar-core/src/test/projects/base-plugin/src/org/sonar/plugins/base/BasePlugin.java +++ b/sonar-core/src/test/projects/base-plugin/src/org/sonar/plugins/base/BasePlugin.java @@ -1,9 +1,8 @@ package org.sonar.plugins.base; -import org.sonar.api.SonarPlugin; - import java.util.Collections; import java.util.List; +import org.sonar.api.SonarPlugin; public class BasePlugin extends SonarPlugin { diff --git a/sonar-core/src/test/projects/dependent-plugin/src/org/sonar/plugins/dependent/DependentPlugin.java b/sonar-core/src/test/projects/dependent-plugin/src/org/sonar/plugins/dependent/DependentPlugin.java index 5d320db62f9..2b7783ae4fe 100644 --- a/sonar-core/src/test/projects/dependent-plugin/src/org/sonar/plugins/dependent/DependentPlugin.java +++ b/sonar-core/src/test/projects/dependent-plugin/src/org/sonar/plugins/dependent/DependentPlugin.java @@ -1,9 +1,9 @@ package org.sonar.plugins.dependent; -import org.sonar.api.SonarPlugin; -import org.sonar.plugins.base.api.BaseApi; import java.util.Collections; import java.util.List; +import org.sonar.api.SonarPlugin; +import org.sonar.plugins.base.api.BaseApi; public class DependentPlugin extends SonarPlugin { diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldGetMaxOrderIndexForNullUser.xml b/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldGetMaxOrderIndexForNullUser.xml deleted file mode 100644 index 2afd93017a3..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldGetMaxOrderIndexForNullUser.xml +++ /dev/null @@ -1,21 +0,0 @@ -<dataset> - - <active_dashboards - id="1" - dashboard_id="1" - user_id="[null]" - order_index="1"/> - - <active_dashboards - id="2" - dashboard_id="2" - user_id="[null]" - order_index="15"/> - - <active_dashboards - id="3" - dashboard_id="3" - user_id="3" - order_index="25"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldInsert-result.xml b/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldInsert-result.xml deleted file mode 100644 index 32c63e7b7c8..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldInsert-result.xml +++ /dev/null @@ -1,9 +0,0 @@ -<dataset> - - <active_dashboards - id="1" - dashboard_id="2" - user_id="3" - order_index="4"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldInsertWithNoUser-result.xml b/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldInsertWithNoUser-result.xml deleted file mode 100644 index 6bdcf4d6182..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldInsertWithNoUser-result.xml +++ /dev/null @@ -1,9 +0,0 @@ -<dataset> - - <active_dashboards - id="1" - dashboard_id="2" - user_id="[null]" - order_index="4"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/shared.xml deleted file mode 100644 index 396db5527f4..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/shared.xml +++ /dev/null @@ -1,5 +0,0 @@ -<dataset> - - <projects id="1" kee="org.sonar.Sample" root_id="[null]" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/shared.xml deleted file mode 100644 index 396db5527f4..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/shared.xml +++ /dev/null @@ -1,5 +0,0 @@ -<dataset> - - <projects id="1" kee="org.sonar.Sample" root_id="[null]" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml deleted file mode 100644 index 574573ee9f7..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml +++ /dev/null @@ -1,81 +0,0 @@ -<dataset> - - <action_plans id="1" kee="ABC" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]" - user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]"/> - - <issues - id="100" - kee="ABCDE" - component_uuid="uuid-400" - project_uuid="uuid-400" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - status="OPEN" - resolution="[null]" - checksum="XXX" - reporter="arthur" - assignee="perceval" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - action_plan_key="ABC" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="1400000000000" - /> - - <issues - id="101" - kee="ABCDF" - component_uuid="uuid-400" - project_uuid="uuid-400" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - status="CLOSED" - resolution="FIXED" - checksum="XXX" - reporter="arthur" - assignee="perceval" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - action_plan_key="ABC" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="1400000000000" - /> - - <issues - id="102" - kee="ABCDG" - component_uuid="uuid-400" - project_uuid="uuid-400" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - status="CLOSED" - resolution="FIXED" - checksum="XXX" - reporter="arthur" - assignee="perceval" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - action_plan_key="ABC" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="1400000000000" - /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml deleted file mode 100644 index d809d01a49d..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml +++ /dev/null @@ -1,182 +0,0 @@ -<dataset> - - <!-- Unresolved. To be included --> - <issues - id="1" - kee="UNRESOLVED_ON_FILE_1" - component_uuid="FILE_1" - project_uuid="PROJECT_1" - resolution="[null]" - status="OPEN" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="[null]" - checksum="[null]" - reporter="user" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - - <!-- diff --> - <issue_changes - id="100" - kee="100" - issue_key="UNRESOLVED_ON_FILE_1" - user_login="arthur" - change_type="diff" - change_data="severity=MAJOR|BLOCKER" - created_at="1410213600000" - updated_at="1410213600000" - issue_change_creation_date="1410213600000" - /> - - <!-- comment --> - <issue_changes - id="102" - kee="102" - issue_key="UNRESOLVED_ON_FILE_1" - user_login="arthur" - change_type="comment" - change_data="recent comment" - created_at="1410213600000" - updated_at="1410213600000" - issue_change_creation_date="[null]" - /> - - <!-- Resolved but not closed. To be included --> - <issues - id="2" - kee="RESOLVED_ON_FILE_1" - component_uuid="FILE_1" - project_uuid="PROJECT_1" - resolution="FIXED" - status="RESOLVED" - rule_id="501" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="120" - effort_to_fix="[null]" - checksum="[null]" - reporter="[null]" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - - <issue_changes - id="103" - kee="103" - issue_key="RESOLVED_ON_FILE_1" - user_login="arthur" - change_type="diff" - change_data="severity=MAJOR|BLOCKER" - created_at="1410213600000" - updated_at="1410213600000" - issue_change_creation_date="1410213600000" - /> - - <!-- Closed. To be excluded --> - <issues - id="3" - kee="CLOSED_ON_FILE_1" - component_uuid="FILE_1" - project_uuid="PROJECT_1" - resolution="FIXED" - status="CLOSED" - rule_id="501" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="120" - effort_to_fix="[null]" - checksum="[null]" - reporter="[null]" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - - <issue_changes - id="104" - kee="104" - issue_key="CLOSED_ON_FILE_1" - user_login="arthur" - change_type="diff" - change_data="severity=MAJOR|BLOCKER" - created_at="1410213600000" - updated_at="1410213600000" - issue_change_creation_date="1410213600000" - /> - - <!-- Unresolved on other file --> - <issues - id="4" - kee="UNRESOLVED_ON_FILE_2" - component_uuid="FILE_2" - project_uuid="PROJECT_1" - resolution="[null]" - status="OPEN" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="[null]" - checksum="[null]" - reporter="user" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - - <!-- diff --> - <issue_changes - id="105" - kee="105" - issue_key="UNRESOLVED_ON_FILE_2" - user_login="arthur" - change_type="diff" - change_data="severity=MAJOR|BLOCKER" - created_at="1410213600000" - updated_at="1410213600000" - issue_change_creation_date="1410213600000" - /> - - <!-- comment --> - <issue_changes - id="106" - kee="106" - issue_key="UNRESOLVED_ON_FILE_2" - user_login="arthur" - change_type="comment" - change_data="recent comment" - created_at="1410213600000" - updated_at="1410213600000" - issue_change_creation_date="[null]" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/shared.xml deleted file mode 100644 index 5367328c57c..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/shared.xml +++ /dev/null @@ -1,63 +0,0 @@ -<dataset> - - <issue_changes - id="100" - kee="ABCDE" - issue_key="1000" - user_login="arthur" - change_type="comment" - change_data="old comment" - created_at="1356994800000" - updated_at="1356994800000" - issue_change_creation_date="[null]" - /> - - <issue_changes - id="101" - kee="[null]" - issue_key="1000" - user_login="arthur" - change_type="diff" - change_data="severity=MAJOR|BLOCKER" - created_at="1359759600000" - updated_at="1359759600000" - issue_change_creation_date="1359759600000" - /> - - <issue_changes - id="102" - kee="FGHIJ" - issue_key="1000" - user_login="arthur" - change_type="comment" - change_data="recent comment" - created_at="1367704800000" - updated_at="1367704800000" - issue_change_creation_date="[null]" - /> - - <issue_changes - id="103" - kee="KLMN" - issue_key="1001" - user_login="arthur" - change_type="diff" - change_data="actionPlan=1.0|1.1" - created_at="1359759600000" - updated_at="1359759600000" - issue_change_creation_date="1359759600000" - /> - - <issue_changes - id="104" - kee="OPQR" - issue_key="1001" - user_login="henry" - change_type="diff" - change_data="severity=MAJOR|BLOCKER" - created_at="1356994800000" - updated_at="1356994800000" - issue_change_creation_date="1356994800000" - /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/update-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/update-result.xml deleted file mode 100644 index 16020534152..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/update-result.xml +++ /dev/null @@ -1,38 +0,0 @@ -<dataset> - - <issue_changes - id="100" - kee="COMMENT-1" - issue_key="ISSUE-1" - user_login="arthur" - change_type="comment" - change_data="old comment" - created_at="1356994800000" - updated_at="1356994800000" - issue_change_creation_date="[null]" - /> - - <issue_changes - id="101" - kee="[null]" - issue_key="1000" - user_login="arthur" - change_type="diff" - change_data="severity=MAJOR|BLOCKER" - created_at="1359759600000" - updated_at="1359759600000" - issue_change_creation_date="1359759600000" - /> - - <issue_changes - id="102" - kee="COMMENT-2" - issue_key="ISSUE-1" - user_login="arthur" - change_type="comment" - change_data="new comment" - created_at="1367704800000" - updated_at="1500000000000" - issue_change_creation_date="[null]" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_comment-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_comment-result.xml deleted file mode 100644 index 0cafa3297f4..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_comment-result.xml +++ /dev/null @@ -1,13 +0,0 @@ -<dataset> - <issue_changes - id="1" - kee="COMMENT-1234" - issue_key="ABCDE" - user_login="emmerik" - change_type="comment" - change_data="the comment" - created_at="1500000000000" - updated_at="1500000000000" - issue_change_creation_date="[null]" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_diff-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_diff-result.xml deleted file mode 100644 index f84e3423e12..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_diff-result.xml +++ /dev/null @@ -1,13 +0,0 @@ -<dataset> - <issue_changes - id="1" - kee="[null]" - issue_key="ABCDE" - user_login="emmerik" - change_type="diff" - change_data="severity=INFO|BLOCKER" - created_at="1500000000000" - updated_at="1500000000000" - issue_change_creation_date="1500000000000" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/find_severities_by_component.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/find_severities_by_component.xml deleted file mode 100644 index 054f2e5b877..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/find_severities_by_component.xml +++ /dev/null @@ -1,80 +0,0 @@ -<dataset> - - <!-- rule 500 --> - <issues - id="100" - kee="ABCDE-1" - component_uuid="CDEF" - project_uuid="ABCD" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="4.2" - status="OPEN" - resolution="[null]" - checksum="XXX" - reporter="arthur" - assignee="perceval" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="1400000000000" - /> - - <issues - id="101" - kee="ABCDE-2" - component_uuid="CDEF" - project_uuid="ABCD" - rule_id="500" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="4.2" - status="OPEN" - resolution="[null]" - checksum="XXX" - reporter="arthur" - assignee="perceval" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - issue_creation_date="1366149600000" - issue_update_date="1366149600000" - issue_close_date="1366149600000" - created_at="1400000000000" - updated_at="1400000000000" - /> - - - <!-- rule 501 --> - <issues - id="102" - kee="ABCDE-3" - component_uuid="CDEF" - project_uuid="ABCD" - rule_id="501" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="4.2" - status="OPEN" - resolution="[null]" - checksum="XXX" - reporter="arthur" - assignee="perceval" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="1400000000000" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml deleted file mode 100644 index 5d5e53e21a7..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml +++ /dev/null @@ -1,18 +0,0 @@ -<dataset> - - <group_roles id="1" group_id="[null]" resource_id="399" role="user"/> - - <projects id="399" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." kee="struts" root_id="[null]" qualifier="TRK" scope="PRJ"/> - <projects id="400" uuid="BCDE" project_uuid="ABCD" module_uuid="[null]" module_uuid_path=".ABCD." kee="struts-core" root_id="399" qualifier="BRC" scope="PRJ"/> - <projects id="401" uuid="CDEF" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path=".ABCD.BCDE." kee="Action.java" root_id="400" qualifier="CLA" scope="PRJ"/> - <projects id="402" uuid="DEFG" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path=".ABCD.BCDE." kee="Filter.java" root_id="400" qualifier="CLA" scope="PRJ"/> - - <snapshots id="100" project_id="399" root_snapshot_id="[null]" parent_snapshot_id="[null]" root_project_id="399" path="" islast="[true]" /> - <snapshots id="101" project_id="400" root_snapshot_id="100" parent_snapshot_id="100" root_project_id="399" path="100." islast="[true]" /> - <snapshots id="102" project_id="401" root_snapshot_id="100" parent_snapshot_id="101" root_project_id="399" path="100.101." islast="[true]" /> - <snapshots id="103" project_id="402" root_snapshot_id="100" parent_snapshot_id="101" root_project_id="399" path="100.101." islast="[true]" /> - - <rules id="500" tags="[null]" system_tags="[null]" plugin_rule_key="AvoidCycle" plugin_name="squid" language="java" /> - <rules id="501" tags="[null]" system_tags="[null]" plugin_rule_key="NullRef" plugin_name="squid" language="xoo" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml deleted file mode 100644 index 014ca75c7d5..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml +++ /dev/null @@ -1,80 +0,0 @@ -<dataset> - - <!-- rule 500 --> - <issues - id="100" - kee="ABCDE-1" - component_uuid="CDEF" - project_uuid="ABCD" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="4.2" - status="OPEN" - resolution="FIXED" - checksum="XXX" - reporter="arthur" - assignee="perceval" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="1400000000000" - /> - - <issues - id="101" - kee="ABCDE-2" - component_uuid="CDEF" - project_uuid="ABCD" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="4.2" - status="OPEN" - resolution="FIXED" - checksum="XXX" - reporter="arthur" - assignee="perceval" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="1400000000000" - /> - - - <!-- rule 501 --> - <issues - id="102" - kee="ABCDE-3" - component_uuid="CDEF" - project_uuid="ABCD" - rule_id="501" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="4.2" - status="OPEN" - resolution="FIXED" - checksum="XXX" - reporter="arthur" - assignee="perceval" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="1400000000000" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_non_closed_issues_by_module.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_non_closed_issues_by_module.xml deleted file mode 100644 index 3a0b7ee023d..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_non_closed_issues_by_module.xml +++ /dev/null @@ -1,133 +0,0 @@ -<dataset> - - <!-- Open Issue on a file --> - <issues - id="100" - kee="100" - component_uuid="CDEF" - project_uuid="ABCD" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="user" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - - <!-- Open Issue on a file --> - <issues - id="101" - kee="101" - component_uuid="DEFG" - project_uuid="ABCD" - rule_id="501" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="120" - effort_to_fix="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="[null]" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - - <!-- Closed Issue on a file --> - <issues - id="102" - kee="102" - component_uuid="DEFG" - project_uuid="ABCD" - rule_id="501" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="120" - effort_to_fix="[null]" - status="CLOSED" - resolution="FIXED" - checksum="[null]" - reporter="[null]" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - - <!-- Open Issue on a sub module --> - <issues - id="103" - kee="103" - component_uuid="BCDE" - project_uuid="ABCD" - rule_id="501" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="[null]" - effort_to_fix="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="[null]" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - - <!-- Open Issue on a root module --> - <issues - id="104" - kee="104" - component_uuid="ABCD" - project_uuid="ABCD" - rule_id="501" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="[null]" - effort_to_fix="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="[null]" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml deleted file mode 100644 index b7b17a65dd3..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml +++ /dev/null @@ -1,127 +0,0 @@ -<!-- - ~ SonarQube, open source software quality management tool. - ~ Copyright (C) 2008-2014 SonarSource - ~ mailto:contact AT sonarsource DOT com - ~ - ~ SonarQube is free software; you can redistribute it and/or - ~ modify it under the terms of the GNU Lesser General Public - ~ License as published by the Free Software Foundation; either - ~ version 3 of the License, or (at your option) any later version. - ~ - ~ SonarQube is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public License - ~ along with this program; if not, write to the Free Software Foundation, - ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - --> - -<dataset> - - <!-- Open Issue on a file --> - <issues - id="100" - kee="100" - component_uuid="CDEF" - project_uuid="uuid-111" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="user" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - - <!-- Open Issue on a file --> - <issues - id="101" - kee="101" - component_uuid="DEFG" - project_uuid="uuid-111" - rule_id="501" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="120" - effort_to_fix="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="[null]" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - - <!-- Closed Issue on a file --> - <issues - id="102" - kee="102" - component_uuid="DEFG" - project_uuid="uuid-111" - rule_id="501" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="120" - effort_to_fix="[null]" - status="CLOSED" - resolution="FIXED" - checksum="[null]" - reporter="[null]" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - - <!-- Open Issue on a sub module --> - <issues - id="103" - kee="103" - component_uuid="BCDE" - project_uuid="uuid-111" - rule_id="501" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="[null]" - effort_to_fix="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="[null]" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="1400000000000" - updated_at="[null]" - /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/shared.xml deleted file mode 100644 index cf3bab11156..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/shared.xml +++ /dev/null @@ -1,23 +0,0 @@ -<dataset> - - <issue_filters - id="1" - name="Sonar Issues" - user_login="stephane" - shared="[true]" - description="All issues of Sonar" - data="componentRoots=org.codehaus.sonar" - created_at="2013-06-10" - updated_at="2013-06-10" /> - - <issue_filters - id="2" - name="Open issues" - user_login="michael" - shared="[false]" - description="All open issues" - data="statuses=OPEN" - created_at="2013-06-10" - updated_at="2013-06-10" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_delete-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_delete-result.xml deleted file mode 100644 index 2e1bae52ba3..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_delete-result.xml +++ /dev/null @@ -1,13 +0,0 @@ -<dataset> - - <issue_filters - id="2" - name="Open issues" - user_login="michael" - shared="[false]" - description="All open issues" - data="statuses=OPEN" - created_at="2013-06-10" - updated_at="2013-06-10" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_insert-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_insert-result.xml deleted file mode 100644 index 4c33338e718..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_insert-result.xml +++ /dev/null @@ -1,34 +0,0 @@ -<dataset> - - <issue_filters - id="1" - name="Sonar Issues" - user_login="stephane" - shared="[true]" - description="All issues of Sonar" - data="componentRoots=org.codehaus.sonar" - created_at="2013-06-10" - updated_at="2013-06-10" /> - - <issue_filters - id="2" - name="Open issues" - user_login="michael" - shared="[false]" - description="All open issues" - data="statuses=OPEN" - created_at="2013-06-10" - updated_at="2013-06-10" /> - - - <issue_filters - id="3" - name="Sonar Open issues" - user_login="michael" - shared="[true]" - description="All open issues on Sonar" - data="statuses=OPEN|componentRoots=org.codehaus.sonar" - created_at="2013-06-10" - updated_at="2013-06-10" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_by_user.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_by_user.xml deleted file mode 100644 index 81741d7d0d0..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_by_user.xml +++ /dev/null @@ -1,33 +0,0 @@ -<dataset> - - <issue_filters - id="1" - name="Sonar Issues" - user_login="stephane" - shared="[true]" - description="All issues of Sonar" - data="componentRoots=org.codehaus.sonar" - created_at="2013-06-10" - updated_at="2013-06-10" /> - - <issue_filters - id="2" - name="Open issues" - user_login="michael" - shared="[false]" - description="All open issues" - data="statuses=OPEN" - created_at="2013-06-10" - updated_at="2013-06-10" /> - - <issue_filters - id="3" - name="Sonar Open issues" - user_login="michael" - shared="[true]" - description="All open issues on Sonar" - data="statuses=OPEN|componentRoots=org.codehaus.sonar" - created_at="2013-06-10" - updated_at="2013-06-10" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_by_user_with_only_favorite_filters.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_by_user_with_only_favorite_filters.xml deleted file mode 100644 index f378fb9b8e8..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_by_user_with_only_favorite_filters.xml +++ /dev/null @@ -1,39 +0,0 @@ -<dataset> - - <issue_filters - id="1" - name="Sonar Issues" - user_login="stephane" - shared="[true]" - description="All issues of Sonar" - data="componentRoots=org.codehaus.sonar" - created_at="2013-06-10" - updated_at="2013-06-10" /> - - <issue_filters - id="2" - name="Open issues" - user_login="michael" - shared="[false]" - description="All open issues" - data="statuses=OPEN" - created_at="2013-06-10" - updated_at="2013-06-10" /> - - <issue_filters - id="3" - name="Sonar Open issues" - user_login="michael" - shared="[true]" - description="All open issues on Sonar" - data="statuses=OPEN|componentRoots=org.codehaus.sonar" - created_at="2013-06-10" - updated_at="2013-06-10" /> - - <issue_filter_favourites - id="10" - user_login="michael" - issue_filter_id="2" - created_at="2013-06-10"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_provided_by_name.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_provided_by_name.xml deleted file mode 100644 index d2b7e3009ed..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_select_provided_by_name.xml +++ /dev/null @@ -1,58 +0,0 @@ -<dataset> - - <!-- This one must be found --> - <issue_filters - id="1" - name="Unresolved Issues" - user_login="[null]" - shared="[true]" - description="[null]" - data="resolved=false" - created_at="2011-04-25 01:15:00" - updated_at="2011-04-25 01:15:00" /> - - <!-- This one must NOT be found: belongs to admin --> - <issue_filters - id="2" - name="Unresolved Issues" - user_login="admin" - shared="[true]" - description="[null]" - data="resolved=false" - created_at="2011-04-25 01:15:00" - updated_at="2011-04-25 01:15:00" /> - - <!-- This one must NOT be found: not shared --> - <issue_filters - id="3" - name="Unresolved Issues" - user_login="[null]" - shared="[false]" - description="[null]" - data="resolved=false" - created_at="2011-04-25 01:15:00" - updated_at="2011-04-25 01:15:00" /> - - <!-- This one must be found --> - <issue_filters - id="4" - name="My Unresolved Issues" - user_login="[null]" - shared="[true]" - description="[null]" - data="resolved=false|assignees=__me__" - created_at="2011-04-25 01:15:00" - updated_at="2011-04-25 01:15:00" /> - - <!-- This one must NOT be found: not shared --> - <issue_filters - id="5" - name="Unknown Filter" - user_login="[null]" - shared="[false]" - description="[null]" - data="resolved=false" - created_at="2011-04-25 01:15:00" - updated_at="2011-04-25 01:15:00" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_update-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_update-result.xml deleted file mode 100644 index 134411beaf4..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterDaoTest/should_update-result.xml +++ /dev/null @@ -1,23 +0,0 @@ -<dataset> - - <issue_filters - id="1" - name="Sonar Issues" - user_login="stephane" - shared="[true]" - description="All issues of Sonar" - data="componentRoots=org.codehaus.sonar" - created_at="2013-06-10" - updated_at="2013-06-10" /> - - <issue_filters - id="2" - name="Closed issues" - user_login="bernard" - shared="[false]" - description="All closed issues" - data="statuses=CLOSED" - created_at="2013-06-10" - updated_at="2013-06-11" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/shared.xml deleted file mode 100644 index e963d10483d..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/shared.xml +++ /dev/null @@ -1,21 +0,0 @@ -<dataset> - - <issue_filter_favourites - id="1" - user_login="stephane" - issue_filter_id="10" - created_at="2013-06-10"/> - - <issue_filter_favourites - id="2" - user_login="stephane" - issue_filter_id="11" - created_at="2013-06-10"/> - - <issue_filter_favourites - id="3" - user_login="arthur" - issue_filter_id="10" - created_at="2013-06-10"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_delete-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_delete-result.xml deleted file mode 100644 index 03670a10ba0..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_delete-result.xml +++ /dev/null @@ -1,15 +0,0 @@ -<dataset> - - <issue_filter_favourites - id="1" - user_login="stephane" - issue_filter_id="10" - created_at="2013-06-10"/> - - <issue_filter_favourites - id="2" - user_login="stephane" - issue_filter_id="11" - created_at="2013-06-10"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_delete_by_issue_filter_id-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_delete_by_issue_filter_id-result.xml deleted file mode 100644 index e1df29f80cb..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_delete_by_issue_filter_id-result.xml +++ /dev/null @@ -1,9 +0,0 @@ -<dataset> - - <issue_filter_favourites - id="2" - user_login="stephane" - issue_filter_id="11" - created_at="2013-06-10"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_insert-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_insert-result.xml deleted file mode 100644 index 7fa5aff1c21..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest/should_insert-result.xml +++ /dev/null @@ -1,27 +0,0 @@ -<dataset> - - <issue_filter_favourites - id="1" - user_login="stephane" - issue_filter_id="10" - created_at="2013-06-10"/> - - <issue_filter_favourites - id="2" - user_login="stephane" - issue_filter_id="11" - created_at="2013-06-10"/> - - <issue_filter_favourites - id="3" - user_login="arthur" - issue_filter_id="10" - created_at="2013-06-10"/> - - <issue_filter_favourites - id="4" - user_login="arthur" - issue_filter_id="11" - created_at="2013-06-18"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml deleted file mode 100644 index 5083212cdc6..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml +++ /dev/null @@ -1,29 +0,0 @@ -<dataset> - <issues - id="100" - kee="ABCDE" - component_uuid="uuid-123" - project_uuid="uuid-100" - rule_id="200" - severity="BLOCKER" - manual_severity="[false]" - message="the message" - line="500" - effort_to_fix="3.14" - technical_debt="10" - status="RESOLVED" - resolution="FIXED" - checksum="123456789" - reporter="emmerik" - author_login="morgan" - assignee="karadoc" - issue_attributes="JIRA=FOO-1234" - tags="[null]" - issue_creation_date="1401000000000" - issue_update_date="1402000000000" - issue_close_date="1403000000000" - created_at="1400000000000" - updated_at="1500000000000" - action_plan_key="current_sprint" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml deleted file mode 100644 index bceb8d3e10b..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml +++ /dev/null @@ -1,29 +0,0 @@ -<dataset> - <issues - id="100" - kee="ABCDE" - component_uuid="uuid-123" - project_uuid="uuid-101" - rule_id="200" - severity="BLOCKER" - manual_severity="[false]" - message="the message" - line="500" - effort_to_fix="3.14" - technical_debt="10" - status="RESOLVED" - resolution="FIXED" - checksum="123456789" - reporter="emmerik" - author_login="morgan" - assignee="karadoc" - issue_attributes="JIRA=FOO-1234" - tags="[null]" - issue_creation_date="1401000000000" - issue_update_date="1402000000000" - issue_close_date="1403000000000" - created_at="1400000000000" - updated_at="1500000000000" - action_plan_key="current_sprint" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml deleted file mode 100644 index 65c1df5a462..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml +++ /dev/null @@ -1,27 +0,0 @@ -<dataset> - <issues - id="100" - kee="ABCDE" - component_uuid="uuid-123" - project_uuid="uuid-100" - rule_id="200" - severity="INFO" - manual_severity="[false]" - message="old" - line="[null]" - effort_to_fix="[null]" - technical_debt="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="[null]" - author_login="[null]" - assignee="[null]" - issue_creation_date="1401000000000" - issue_update_date="1402000000000" - issue_close_date="1403000000000" - created_at="1400000000000" - updated_at="1500000000000" - action_plan_key="[null]" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml deleted file mode 100644 index 8b95b508f1c..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml +++ /dev/null @@ -1,30 +0,0 @@ -<dataset> - <!-- not updated --> - <issues - id="100" - kee="ABCDE" - component_uuid="uuid-123" - project_uuid="uuid-100" - rule_id="200" - severity="INFO" - manual_severity="[false]" - message="old" - line="[null]" - effort_to_fix="[null]" - technical_debt="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="[null]" - author_login="[null]" - assignee="[null]" - issue_attributes="[null]" - tags="[null]" - issue_creation_date="[null]" - issue_update_date="[null]" - issue_close_date="[null]" - created_at="1400000000000" - updated_at="1450000000000" - action_plan_key="[null]" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml deleted file mode 100644 index 3ea44387a57..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml +++ /dev/null @@ -1,28 +0,0 @@ -<dataset> - <issues - id="100" - kee="ABCDE" - component_uuid="uuid-123" - project_uuid="uuid-100" - rule_id="200" - severity="INFO" - manual_severity="[false]" - message="old" - line="[null]" - effort_to_fix="[null]" - technical_debt="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="[null]" - author_login="[null]" - assignee="[null]" - issue_attributes="[null]" - issue_creation_date="[null]" - issue_update_date="[null]" - issue_close_date="[null]" - created_at="1400000000000" - updated_at="1450000000000" - action_plan_key="[null]" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStatsDaoTest/should_select_assignees.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStatsDaoTest/should_select_assignees.xml deleted file mode 100644 index ce76408c323..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStatsDaoTest/should_select_assignees.xml +++ /dev/null @@ -1,80 +0,0 @@ -<dataset> - - <group_roles id="1" group_id="[null]" resource_id="399" role="user"/> - <projects id="399" kee="my.project:kee" root_id="[null]" qualifier="TRK" scope="PRJ"/> - - <issues - id="100" - kee="ABCDE-1" - component_uuid="uuid-401" - project_uuid="uuid-399" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="4.2" - status="OPEN" - resolution="FIXED" - checksum="XXX" - reporter="arthur" - assignee="perceval" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="2013-04-16" - updated_at="2013-04-16" - /> - - <issues - id="101" - kee="ABCDE-2" - component_uuid="uuid-401" - project_uuid="uuid-399" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="4.2" - status="OPEN" - resolution="FIXED" - checksum="XXX" - reporter="arthur" - assignee="[null]" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="2013-04-16" - updated_at="2013-04-16" - /> - - <issues - id="102" - kee="ABCDE-3" - component_uuid="uuid-401" - project_uuid="uuid-399" - rule_id="501" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="4.2" - status="OPEN" - resolution="FIXED" - checksum="XXX" - reporter="arthur" - assignee="perceval" - author_login="[null]" - issue_attributes="JIRA=FOO-1234" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="2013-04-16" - updated_at="2013-04-16" - /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/metric/CacheMetricFinderTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/metric/CacheMetricFinderTest/shared.xml deleted file mode 100644 index dd645d66ec1..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/metric/CacheMetricFinderTest/shared.xml +++ /dev/null @@ -1,12 +0,0 @@ -<dataset> - - <metrics delete_historical_data="[null]" id="1" name="ncloc" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" - enabled="true" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" - hidden="false"/> - - <metrics delete_historical_data="[null]" id="2" name="coverage" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" - enabled="true" worst_value="0" optimized_best_value="true" best_value="100" direction="1" hidden="false"/> - - <metrics delete_historical_data="[null]" id="3" name="disabled" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" - enabled="false" worst_value="0" optimized_best_value="true" best_value="100" direction="1" hidden="false"/> -</dataset>
\ No newline at end of file diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate-result.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate-result.xml deleted file mode 100644 index 68023c5eb8e..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate-result.xml +++ /dev/null @@ -1,3 +0,0 @@ -<dataset> - <permission_templates id="1" name="Môü Gnô Gnèçà ß" kee="mou_gno_gneca_20130102_010405" description="my description" key_pattern="[null]"/> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createPermissionTemplate-result.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createPermissionTemplate-result.xml deleted file mode 100644 index 4e0f6a0565c..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createPermissionTemplate-result.xml +++ /dev/null @@ -1,3 +0,0 @@ -<dataset> - <permission_templates id="1" name="my template" kee="my_template_20130102_010405" description="my description" key_pattern="myregexp"/> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml deleted file mode 100644 index 06f6413de31..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml +++ /dev/null @@ -1,7 +0,0 @@ -<dataset> - <permission_templates id="2" name="other template" kee="my_template_20130102_030405" description="other description" created_at="[null]" updated_at="[null]"/> - - <perm_templates_users/> - - <perm_templates_groups/> -</dataset>
\ No newline at end of file diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml deleted file mode 100644 index 65a68bb4b4b..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml +++ /dev/null @@ -1,5 +0,0 @@ -<dataset> - <permission_templates id="1" name="template1" kee="template1_20130102_030405" description="description1" created_at="[null]" updated_at="[null]"/> - <permission_templates id="2" name="template2" kee="template2_20130102_030405" description="description2" created_at="[null]" updated_at="[null]"/> - <permission_templates id="3" name="template3" kee="template3_20130102_030405" description="description3" created_at="[null]" updated_at="[null]"/> -</dataset>
\ No newline at end of file diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml deleted file mode 100644 index e8360e44924..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml +++ /dev/null @@ -1,9 +0,0 @@ -<dataset> - <permission_templates id="1" name="my template" kee="my_template_20130102_030405" description="my description" created_at="[null]" updated_at="[null]"/> - - <users id="1" login="user1" name="user1" /> - <users id="2" login="user2" name="user2" /> - - <groups id="1" name="group1"/> - <groups id="2" name="group2"/> -</dataset>
\ No newline at end of file diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml deleted file mode 100644 index 864e0c9be19..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml +++ /dev/null @@ -1,4 +0,0 @@ -<dataset> - <permission_templates id="1" name="new_name" kee="template1_20130102_030405" description="new_description" key_pattern="new_regexp" created_at="[null]" updated_at="[null]"/> - <permission_templates id="2" name="template2" kee="template2_20130102_030405" description="description2" key_pattern="barregexp" created_at="[null]" updated_at="[null]"/> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/updatePermissionTemplate.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/updatePermissionTemplate.xml deleted file mode 100644 index b461c1c9c3b..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/updatePermissionTemplate.xml +++ /dev/null @@ -1,4 +0,0 @@ -<dataset> - <permission_templates id="1" name="template1" kee="template1_20130102_030405" description="description1" key_pattern="fooregexp" created_at="[null]" updated_at="[null]"/> - <permission_templates id="2" name="template2" kee="template2_20130102_030405" description="description2" key_pattern="barregexp" created_at="[null]" updated_at="[null]"/> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml deleted file mode 100644 index 07b8de7fe2d..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml +++ /dev/null @@ -1,124 +0,0 @@ -<!-- - ~ SonarQube, open source software quality management tool. - ~ Copyright (C) 2008-2014 SonarSource - ~ mailto:contact AT sonarsource DOT com - ~ - ~ SonarQube is free software; you can redistribute it and/or - ~ modify it under the terms of the GNU Lesser General Public - ~ License as published by the Free Software Foundation; either - ~ version 3 of the License, or (at your option) any later version. - ~ - ~ SonarQube is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public License - ~ along with this program; if not, write to the Free Software Foundation, - ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - --> -<dataset> - <metrics id="1" name="ncloc" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" - enabled="[true]" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" - hidden="[false]" delete_historical_data="[null]"/> - <metrics id="2" name="coverage" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" - enabled="[true]" worst_value="0" optimized_best_value="[true]" best_value="100" direction="1" - hidden="[false]" delete_historical_data="[null]"/> - - <rules_profiles id="1" name="Sonar way with Findbugs" language="java" parent_kee="" kee="sonar_way_with_findbugs" is_default="[false]"/> - - <projects id="300" uuid="A" kee="struts" root_id="[null]" qualifier="TRK" scope="PRJ"/> - <projects id="301" uuid="B" kee="struts-core" root_id="300" qualifier="BRC" scope="PRJ"/> - <projects id="302" uuid="C" kee="struts-el" root_id="300" qualifier="BRC" scope="PRJ"/> - <projects id="303" uuid="D" kee="Action.java" root_id="301" qualifier="CLA" scope="FIL"/> - - <snapshots id="3000" project_id="300" root_project_id="300" root_snapshot_id="[null]" path="" islast="[true]"/> - <snapshots id="3001" project_id="301" root_project_id="300" root_snapshot_id="3000" path="3000." islast="[true]"/> - <snapshots id="3002" project_id="302" root_project_id="300" root_snapshot_id="3000" path="3000." islast="[true]"/> - <snapshots id="3003" project_id="303" root_project_id="300" root_snapshot_id="3000" path="3000.3001." - islast="[true]"/> - - <snapshots id="3010" project_id="300" root_project_id="300" root_snapshot_id="[null]" path="" islast="[false]"/> - <snapshots id="3011" project_id="301" root_project_id="300" root_snapshot_id="3010" path="3010." islast="[false]"/> - <snapshots id="3012" project_id="302" root_project_id="300" root_snapshot_id="3010" path="3010." islast="[false]"/> - <snapshots id="3013" project_id="303" root_project_id="300" root_snapshot_id="3010" path="3010.3011." - islast="[false]"/> - - <project_measures id="1" value="12" metric_id="1" snapshot_id="3000"/> - <project_measures id="2" value="5" metric_id="1" snapshot_id="3001"/> - <project_measures id="3" value="7" metric_id="1" snapshot_id="3002"/> - <project_measures id="4" value="5" metric_id="1" snapshot_id="3003"/> - - <project_measures id="5" value="35" metric_id="2" snapshot_id="3000"/> - <project_measures id="6" value="20" metric_id="2" snapshot_id="3001"/> - <project_measures id="7" value="30" metric_id="2" snapshot_id="3002"/> - <project_measures id="8" value="20" metric_id="2" snapshot_id="3003"/> - - <project_measures id="11" value="112" metric_id="1" snapshot_id="3010"/> - <project_measures id="12" value="15" metric_id="1" snapshot_id="3011"/> - <project_measures id="13" value="17" metric_id="1" snapshot_id="3012"/> - <project_measures id="14" value="15" metric_id="1" snapshot_id="3013"/> - - <project_measures id="15" value="135" metric_id="2" snapshot_id="3010"/> - <project_measures id="16" value="120" metric_id="2" snapshot_id="3011"/> - <project_measures id="17" value="130" metric_id="2" snapshot_id="3012"/> - <project_measures id="18" value="120" metric_id="2" snapshot_id="3013"/> - - - <rules tags="[null]" system_tags="[null]" id="500" plugin_rule_key="AvoidCycle" plugin_name="squid"/> - <rules tags="[null]" system_tags="[null]" id="501" plugin_rule_key="NullRef" plugin_name="squid"/> - - <!-- issues in module --> - <issues - id="100" - kee="ISSUE-100" - component_uuid="D" - project_uuid="A" - - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="user" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="[null]" - updated_at="[null]" - /> - - <issues - id="101" - kee="ISSUE-101" - component_uuid="D" - project_uuid="A" - - rule_id="501" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="120" - effort_to_fix="[null]" - status="CLOSED" - resolution="FIXED" - checksum="[null]" - reporter="[null]" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="[null]" - updated_at="[null]" - /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_copy_permission_templates.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_copy_permission_templates.xml deleted file mode 100644 index 6bead9e07e1..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_copy_permission_templates.xml +++ /dev/null @@ -1,9 +0,0 @@ -<dataset> - - <permission_templates id="1" name="my template" kee="my_template_20130101_010203" description="my description"/> - - <perm_templates_users id="1" template_id="1" user_id="1" permission_reference="codeviewer"/> - - <perm_templates_groups id="1" template_id="1" group_id="1" permission_reference="admin"/> - -</dataset>
\ No newline at end of file diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database.xml deleted file mode 100644 index fde203e6751..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database.xml +++ /dev/null @@ -1,33 +0,0 @@ -<dataset> - <metrics id="1" name="ncloc" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" - enabled="[true]" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="[false]" delete_historical_data="[null]"/> - <metrics id="2" name="coverage" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" - enabled="[true]" worst_value="0" optimized_best_value="[true]" best_value="100" direction="1" hidden="[false]" delete_historical_data="[null]"/> - - <rules_profiles id="1" name="Sonar way with Findbugs" language="java" parent_kee="" kee="sonar_way_with_findbugs" is_default="[false]"/> - - - <projects id="123" uuid="A" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" - description="[null]" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="2013-01-25 02:04:06.00"/> - - <snapshots id="1000" project_id="123" root_project_id="123" root_snapshot_id="1000" parent_snapshot_id="[null]" - scope="PRJ" qualifier="TRK" path="1000." depth="1" - purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" - period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" - period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - created_at="1359075846000" build_date="1359075846000" - version="1.0" status="P" islast="[true]"/> - - <project_measures id="1" value="10" metric_id="1" snapshot_id="1000" /> - - <events id="1" name="1.0-SNAPSHOT" component_uuid="123" event_data="[null]"/> - <events id="2" name="2.0-SNAPSHOT" component_uuid="123" event_data="[null]" /> - <events id="3" name="1.0-SNAPSHOT" component_uuid="456" event_data="[null]" /> - - <users id="1" login="julien" name="Julien" crypted_password="foo" active="1" /> - <users id="2" login="simon" name="Simon" active="1" /> - <users id="3" login="jb" name="JB" active="1" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml deleted file mode 100644 index df18be5f8f2..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml +++ /dev/null @@ -1,72 +0,0 @@ -<dataset> - <metrics id="1" name="ncloc" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" - enabled="[true]" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" - hidden="[false]" delete_historical_data="[null]"/> - <metrics id="2" name="coverage" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" - enabled="[true]" worst_value="0" optimized_best_value="[true]" best_value="100" direction="1" - hidden="[false]" delete_historical_data="[null]"/> - - <rules_profiles id="1" name="Sonar way with Findbugs" language="java" parent_kee="" kee="sonar_way_with_findbugs" is_default="[false]"/> - - <projects id="399" uuid="A" kee="struts" root_id="[null]"/> - <projects id="400" uuid="B" kee="Action.java" root_id="399"/> - <projects id="401" uuid="C" kee="Filter.java" root_id="399"/> - - <snapshots id="100" project_id="399" root_snapshot_id="[null]" path="" islast="[true]"/> - <snapshots id="101" project_id="400" root_snapshot_id="100" path="100." islast="[true]"/> - <snapshots id="102" project_id="401" root_snapshot_id="100" path="100." islast="[true]"/> - - <rules tags="[null]" system_tags="[null]" id="500" plugin_rule_key="AvoidCycle" plugin_name="squid"/> - <rules tags="[null]" system_tags="[null]" id="501" plugin_rule_key="NullRef" plugin_name="squid"/> - - <issues - id="100" - kee="100" - component_uuid="B" - project_uuid="A" - rule_id="500" - severity="BLOCKER" - manual_severity="[false]" - message="[null]" - line="200" - effort_to_fix="[null]" - status="OPEN" - resolution="[null]" - checksum="[null]" - reporter="user" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="[null]" - updated_at="[null]" - /> - - <issues - id="101" - kee="101" - component_uuid="C" - project_uuid="A" - rule_id="501" - severity="MAJOR" - manual_severity="[false]" - message="[null]" - line="120" - effort_to_fix="[null]" - status="CLOSED" - resolution="FIXED" - checksum="[null]" - reporter="[null]" - assignee="user" - author_login="[null]" - issue_attributes="[null]" - issue_creation_date="1366063200000" - issue_update_date="1366063200000" - issue_close_date="1366063200000" - created_at="[null]" - updated_at="[null]" - /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/SemaphoreDaoTest/old_semaphore.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/SemaphoreDaoTest/old_semaphore.xml deleted file mode 100644 index 23a1d4ff67b..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/persistence/SemaphoreDaoTest/old_semaphore.xml +++ /dev/null @@ -1,3 +0,0 @@ -<dataset> - <semaphores id="1" name="foo" checksum="acbd18db4cc2f85cedef654fccc4a4d8" created_at="1264374000000" updated_at="1264374000000" locked_at="1264374000000"/> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/plugins/sonar-checkstyle-plugin-2.8.jar b/sonar-core/src/test/resources/org/sonar/core/platform/sonar-checkstyle-plugin-2.8.jar Binary files differindex f937399bec5..f937399bec5 100644 --- a/sonar-core/src/test/resources/org/sonar/core/plugins/sonar-checkstyle-plugin-2.8.jar +++ b/sonar-core/src/test/resources/org/sonar/core/platform/sonar-checkstyle-plugin-2.8.jar diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/findNotificationSubscribers.xml b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/findNotificationSubscribers.xml deleted file mode 100644 index 92f5da7324d..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/findNotificationSubscribers.xml +++ /dev/null @@ -1,55 +0,0 @@ -<dataset> - - <users - id="1" - login="eric" - /> - - <users - id="2" - login="simon" - /> - - <projects id="42" uuid="PROJECT_A" kee="org.apache:struts"/> - - <!-- global subscription --> - <properties - id="1" - prop_key="notification.DispatcherWithGlobalSubscribers.Email" - text_value="true" - resource_id="[null]" - user_id="2"/> - - <!-- project subscription --> - <properties - id="2" - prop_key="notification.DispatcherWithProjectSubscribers.Email" - text_value="true" - resource_id="42" - user_id="1"/> - - <!-- project subscription --> - <properties - id="3" - prop_key="notification.DispatcherWithGlobalAndProjectSubscribers.Email" - text_value="true" - resource_id="56" - user_id="1"/> - - <!-- project subscription --> - <properties - id="4" - prop_key="notification.DispatcherWithGlobalAndProjectSubscribers.Email" - text_value="true" - resource_id="42" - user_id="1"/> - - <!-- global subscription --> - <properties - id="5" - prop_key="notification.DispatcherWithGlobalAndProjectSubscribers.Email" - text_value="true" - resource_id="[null]" - user_id="2"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/delete-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/delete-result.xml deleted file mode 100644 index 6547653931a..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/delete-result.xml +++ /dev/null @@ -1,8 +0,0 @@ -<dataset> - - <quality_gate_conditions id="2" qgate_id="1" metric_id="3" operator="<" value_warning="10" value_error="20" period="[null]" /> - <quality_gate_conditions id="3" qgate_id="1" metric_id="4" operator="<" value_warning="10" value_error="[null]" period="1" /> - <quality_gate_conditions id="4" qgate_id="2" metric_id="5" operator="<" value_warning="[null]" value_error="20" period="3" /> - <quality_gate_conditions id="5" qgate_id="2" metric_id="6" operator="<" value_warning="[null]" value_error="20" period="[null]" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/selectForQualityGate.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/selectForQualityGate.xml deleted file mode 100644 index 2b5e08055b7..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/selectForQualityGate.xml +++ /dev/null @@ -1,9 +0,0 @@ -<dataset> - - <quality_gate_conditions id="1" qgate_id="1" metric_id="2" operator="<" value_warning="10" value_error="20" period="3" /> - <quality_gate_conditions id="2" qgate_id="1" metric_id="3" operator="<" value_warning="10" value_error="20" period="[null]" /> - <quality_gate_conditions id="3" qgate_id="1" metric_id="4" operator="<" value_warning="10" value_error="[null]" period="1" /> - <quality_gate_conditions id="4" qgate_id="2" metric_id="5" operator="<" value_warning="[null]" value_error="20" period="3" /> - <quality_gate_conditions id="5" qgate_id="2" metric_id="6" operator="<" value_warning="[null]" value_error="20" period="[null]" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml deleted file mode 100644 index 764d97e999c..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml +++ /dev/null @@ -1,19 +0,0 @@ -<dataset> - - <metrics delete_historical_data="false" id="1" name="key1" val_type="INT" description="description" domain="domain" - short_name="name1" qualitative="false" user_managed="false" enabled="true" worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/> - - <metrics delete_historical_data="false" id="2" name="disabledkey2" val_type="INT" description="description" domain="domain" - short_name="name2" qualitative="false" user_managed="false" enabled="false" worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/> - - <!-- ok --> - <quality_gate_conditions id="1" qgate_id="1" metric_id="1" operator="GT" value_error="30" value_warning="[null]" period="[null]"/> - <quality_gate_conditions id="2" qgate_id="2" metric_id="1" operator="GT" value_error="[null]" value_warning="150" period="[null]"/> - - <!-- disabled metric --> - <quality_gate_conditions id="3" qgate_id="1" metric_id="2" operator="GT" value_error="30" value_warning="[null]" period="[null]"/> - - <!-- unknown metric --> - <quality_gate_conditions id="4" qgate_id="1" metric_id="999" operator="GT" value_error="30" value_warning="[null]" period="[null]"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/update-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/update-result.xml deleted file mode 100644 index 503a7ba0c76..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/update-result.xml +++ /dev/null @@ -1,9 +0,0 @@ -<dataset> - - <quality_gate_conditions id="1" qgate_id="1" metric_id="7" operator=">" value_warning="50" value_error="80" period="1" /> - <quality_gate_conditions id="2" qgate_id="1" metric_id="3" operator="<" value_warning="10" value_error="20" period="[null]" /> - <quality_gate_conditions id="3" qgate_id="1" metric_id="4" operator="<" value_warning="10" value_error="[null]" period="1" /> - <quality_gate_conditions id="4" qgate_id="2" metric_id="5" operator="<" value_warning="[null]" value_error="20" period="3" /> - <quality_gate_conditions id="5" qgate_id="2" metric_id="6" operator="<" value_warning="[null]" value_error="20" period="[null]" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/delete-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/delete-result.xml deleted file mode 100644 index af95b43928b..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/delete-result.xml +++ /dev/null @@ -1,6 +0,0 @@ -<dataset> - - <quality_gates id="2" name="Balanced" /> - <quality_gates id="3" name="Lenient" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/insert-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/insert-result.xml deleted file mode 100644 index a4efd15ed49..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/insert-result.xml +++ /dev/null @@ -1,5 +0,0 @@ -<dataset> - - <quality_gates id="1" name="My Quality Gate" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/selectAll.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/selectAll.xml deleted file mode 100644 index 89c74dec7e0..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/selectAll.xml +++ /dev/null @@ -1,7 +0,0 @@ -<dataset> - - <quality_gates id="1" name="Very strict" /> - <quality_gates id="2" name="Balanced" /> - <quality_gates id="3" name="Lenient" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/update-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/update-result.xml deleted file mode 100644 index ea83459b139..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/update-result.xml +++ /dev/null @@ -1,7 +0,0 @@ -<dataset> - - <quality_gates id="1" name="Not so strict" /> - <quality_gates id="2" name="Balanced" /> - <quality_gates id="3" name="Lenient" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml deleted file mode 100644 index a55ec8060f6..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml +++ /dev/null @@ -1,10 +0,0 @@ -<dataset> - <quality_models id="1" name="M1" /> - <quality_models id="2" name="M2" /> - - <characteristics id="1" kee="M1C1" name="M1C1" parent_id="[null]" root_id="[null]" rule_id="[null]" characteristic_order="1" enabled="true" /> - <characteristics id="2" kee="M1C2" name="M1C2" parent_id="[null]" root_id="[null]" ule_id="[null]" characteristic_order="1" enabled="true" /> - <characteristics id="3" kee="M2C1" name="M2C1" parent_id="[null]" root_id="[null]" rule_id="[null]" characteristic_order="1" enabled="true"/> - - <characteristic_edges child_id="2" parent_id="1"/> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/update-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/update-result.xml deleted file mode 100644 index 99f81d6251c..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/update-result.xml +++ /dev/null @@ -1,9 +0,0 @@ -<dataset> - - <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="4" inheritance="[null]"/> - - <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"/> - - <active_rules created_at="[null]" updated_at="[null]" id="3" profile_id="2" rule_id="11" failure_level="1" inheritance="[null]"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole.xml b/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole.xml deleted file mode 100644 index 6a4d9c92410..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole.xml +++ /dev/null @@ -1,4 +0,0 @@ -<dataset> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> -</dataset>
\ No newline at end of file diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone-result.xml deleted file mode 100644 index 4b48bf9e59a..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone-result.xml +++ /dev/null @@ -1,6 +0,0 @@ -<dataset> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> - - <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/> -</dataset>
\ No newline at end of file diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone.xml b/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone.xml deleted file mode 100644 index 6a4d9c92410..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone.xml +++ /dev/null @@ -1,4 +0,0 @@ -<dataset> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> -</dataset>
\ No newline at end of file diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml deleted file mode 100644 index a28333eaa91..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml +++ /dev/null @@ -1,84 +0,0 @@ -<dataset> - - <!-- Struts projects is authorized for all user --> - <group_roles id="1" group_id="[null]" resource_id="1" role="user"/> - - - <!-- root project --> - <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" - uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." - description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" - created_at="2008-12-02" authorization_updated_at="123456789"/> - <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" - status="P" islast="[true]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" - version="[null]" path=""/> - <snapshots id="10" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" - status="P" islast="[false]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228136280000" build_date="1228136280000" - version="[null]" path=""/> - - <!-- module --> - <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" - uuid="BCDE" project_uuid="ABCD" module_uuid="[null]" module_uuid_path=".ABCD." - scope="PRJ" qualifier="BRC" long_name="Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" - created_at="2008-12-02" authorization_updated_at="[null]"/> - <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" - status="P" islast="[true]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="BRC" created_at="1228222680000" build_date="1228222680000" - version="[null]" path="1."/> - - <!-- directory --> - <projects long_name="org.struts" id="3" scope="DIR" qualifier="DIR" kee="org.struts:struts-core:src/org/struts" - uuid="CDEF" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path=".ABCD.BCDE." - name="src/org/struts" root_id="2" - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts" - created_at="2008-12-02" authorization_updated_at="[null]"/> - <snapshots id="3" project_id="3" parent_snapshot_id="2" root_project_id="1" root_snapshot_id="1" - status="P" islast="[true]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="DIR" qualifier="PAC" created_at="1228222680000" build_date="1228222680000" - version="[null]" path="1.2."/> - - <!-- file --> - <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="FIL" kee="org.struts:struts-core:src/org/struts/RequestContext.java" - uuid="DEFG" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path=".ABCD.BCDE." - name="RequestContext.java" root_id="2" - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts/RequestContext.java" - created_at="2008-12-02" authorization_updated_at="[null]"/> - - <snapshots id="4" project_id="4" parent_snapshot_id="3" root_project_id="1" root_snapshot_id="1" - status="P" islast="[true]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="FIL" qualifier="CLA" created_at="1228222680000" build_date="1228222680000" - version="[null]" path="1.2.3."/> - - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/get_last_snapshot_by_component_uuid.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/get_last_snapshot_by_component_uuid.xml deleted file mode 100644 index 5ffea4fe62e..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/get_last_snapshot_by_component_uuid.xml +++ /dev/null @@ -1,80 +0,0 @@ -<dataset> - - <!-- Struts projects is authorized for all user --> - <group_roles id="1" group_id="[null]" resource_id="1" role="user"/> - - - <!-- root project --> - <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" - uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." - description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="[null]"/> - <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" - status="P" islast="[true]" purge_status="[null]" - period1_mode="previous_analysis" period1_param="[null]" period1_date="[null]" - period2_mode="days" period2_param="30" period2_date="1316815200000" - period3_mode="days" period3_param="90" period3_date="1311631200000" - period4_mode="previous_analysis" period4_param="[null]" period4_date="[null]" - period5_mode="previous_version" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" - version="[null]" path=""/> - <snapshots id="10" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" - status="P" islast="[false]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228136280000" build_date="1228136280000" - version="[null]" path=""/> - - <!-- module --> - <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" - uuid="EFGH" project_uuid="ABCD" module_uuid="[null]" module_uuid_path=".ABCD." - scope="PRJ" qualifier="BRC" long_name="Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/> - <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" - status="P" islast="[true]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="BRC" created_at="1228222680000" build_date="1228222680000" - version="[null]" path="1."/> - - <!-- directory --> - <projects long_name="org.struts" id="3" scope="DIR" qualifier="DIR" kee="org.struts:struts-core:src/org/struts" - uuid="GHIJ" project_uuid="ABCD" module_uuid="EFGH" module_uuid_path=".ABCD.EFGH." - name="src/org/struts" root_id="2" - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts" authorization_updated_at="[null]"/> - <snapshots id="3" project_id="3" parent_snapshot_id="2" root_project_id="1" root_snapshot_id="1" - status="P" islast="[true]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="DIR" qualifier="PAC" created_at="1228222680000" build_date="1228222680000" - version="[null]" path="1.2."/> - - <!-- file --> - <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="FIL" kee="org.struts:struts-core:src/org/struts/RequestContext.java" - uuid="KLMN" project_uuid="ABCD" module_uuid="EFGH" module_uuid_path=".ABCD.EFGH." - name="RequestContext.java" root_id="2" - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts/RequestContext.java" authorization_updated_at="[null]"/> - - <snapshots id="4" project_id="4" parent_snapshot_id="3" root_project_id="1" root_snapshot_id="1" - status="P" islast="[true]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="FIL" qualifier="CLA" created_at="1228222680000" build_date="1228222680000" - version="[null]" path="1.2.3."/> - - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml deleted file mode 100644 index 2dbc0f1c3cf..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<dataset> - - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" - note_data="Rule note with accents éèà " note_user_login="polop.palap" note_created_at="2013-12-25" - characteristic_id="100" default_characteristic_id="101" - remediation_function="linear" default_remediation_function="linear_offset" - remediation_coeff="1h" default_remediation_coeff="5d" - remediation_offset="5min" default_remediation_offset="10h" - effort_to_fix_description="squid.S115.effortToFix" - /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectById.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectById.xml deleted file mode 100644 index ee6c7b8a0b8..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectById.xml +++ /dev/null @@ -1,6 +0,0 @@ -<dataset> - - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> - <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectNonManual.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectNonManual.xml deleted file mode 100644 index 53e9a2dfecc..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectNonManual.xml +++ /dev/null @@ -1,6 +0,0 @@ -<dataset> - - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> - <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectParameters.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectParameters.xml deleted file mode 100644 index 9d9c8de2343..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectParameters.xml +++ /dev/null @@ -1,6 +0,0 @@ -<dataset> - - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> - <rules_parameters id="1" rule_id="1" name="myParameter" param_type="plop" default_value="plouf" description="My Parameter"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_name.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_name.xml deleted file mode 100644 index ee6c7b8a0b8..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_name.xml +++ /dev/null @@ -1,6 +0,0 @@ -<dataset> - - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> - <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_rule_key.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_rule_key.xml deleted file mode 100644 index ee6c7b8a0b8..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_rule_key.xml +++ /dev/null @@ -1,6 +0,0 @@ -<dataset> - - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> - <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_id.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_id.xml deleted file mode 100644 index 887fbbcf910..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_id.xml +++ /dev/null @@ -1,8 +0,0 @@ -<dataset> - - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> - <rules_parameters id="1" rule_id="1" name="myParameter" param_type="plop" default_value="plouf" description="My Parameter"/> - <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Unused" plugin_name="unused" name="Unused Rule" description="Not used" status="REMOVED"/> - <rules_parameters id="2" rule_id="2" name="otherParam" param_type="plop" default_value="plouf" description="Other Parameter"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_ids.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_ids.xml deleted file mode 100644 index 5d840d5998d..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_ids.xml +++ /dev/null @@ -1,7 +0,0 @@ -<dataset> - - <rules_parameters id="1" rule_id="1" name="myParameter" param_type="plop" default_value="plouf" description="My Parameter"/> - - <rules_parameters id="2" rule_id="2" name="otherParam" param_type="plop" default_value="plouf" description="Other Parameter"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update-result.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update-result.xml deleted file mode 100644 index 514786e0dc0..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update-result.xml +++ /dev/null @@ -1,21 +0,0 @@ -<dataset> - - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED" - plugin_config_key="NewConfigKey" priority="0" is_template="[true]" language="dart" created_at="2011-04-25 01:05:00" updated_at="2013-12-17" template_id="3" - note_data="My note" note_user_login="admin" note_created_at="2013-12-19" note_updated_at="2013-12-20" - characteristic_id="100" default_characteristic_id="101" - remediation_function="linear" default_remediation_function="linear_offset" - remediation_coeff="1h" default_remediation_coeff="5d" - remediation_offset="5min" default_remediation_offset="10h" - effort_to_fix_description="squid.S115.effortToFix" - /> - - <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" - plugin_config_key="Parent1" priority="2" is_template="[false]" language="golo" created_at="1981-10-24 15:20:00" updated_at="[null]" template_id="[null]" - note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]"/> - - <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" - plugin_config_key="Parent2" priority="2" is_template="[false]" language="dart" created_at="1982-12-14 03:15:00" updated_at="[null]" template_id="[null]" - note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update.xml deleted file mode 100644 index d4979390cdf..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update.xml +++ /dev/null @@ -1,12 +0,0 @@ -<dataset> - - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" - plugin_config_key="AvoidNull" priority="2" is_template="[false]" language="golo" created_at="2011-04-25 01:05:00" template_id="2"/> - - <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" - plugin_config_key="Parent1" priority="2" is_template="[false]" language="golo" created_at="1981-10-24 15:20:00" /> - - <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" - plugin_config_key="Parent2" priority="2" is_template="[false]" language="dart" created_at="1982-12-14 03:15:00" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update_parameter-result.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update_parameter-result.xml deleted file mode 100644 index d61889441d9..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update_parameter-result.xml +++ /dev/null @@ -1,3 +0,0 @@ -<dataset> - <rules_parameters id="1" rule_id="1" name="format" param_type="STRING" default_value="^[a-z]+(\.[a-z][a-z0-9]*)*$" description="Regular expression used to check the package names against."/> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml deleted file mode 100644 index bcf3ed867d3..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/ignore_requirement_on_root_characteristics.xml +++ /dev/null @@ -1,19 +0,0 @@ -<sqale> - <chc> - <key>EFFICIENCY</key> - <name>Efficiency</name> - <chc> - <rule-repo>checkstyle</rule-repo> - <rule-key>Regexp</rule-key> - <prop> - <key>remediationFactor</key> - <val>3.0</val> - <txt>h</txt> - </prop> - <prop> - <key>remediationFunction</key> - <txt>linear</txt> - </prop> - </chc> - </chc> -</sqale> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/import_characteristics.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/import_characteristics.xml deleted file mode 100644 index bc7f7569560..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/import_characteristics.xml +++ /dev/null @@ -1,22 +0,0 @@ -<sqale> - <chc> - <key>PORTABILITY</key> - <name>Portability</name> - <chc> - <key>COMPILER_RELATED_PORTABILITY</key> - <name>Compiler related portability</name> - </chc> - <chc> - <key>HARDWARE_RELATED_PORTABILITY</key> - <name>Hardware related portability</name> - </chc> - </chc> - <chc> - <key>MAINTAINABILITY</key> - <name>Maintainability</name> - <chc> - <key>READABILITY</key> - <name>Readability</name> - </chc> - </chc> -</sqale> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml deleted file mode 100644 index 6c7d153992c..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_badly-formatted.xml +++ /dev/null @@ -1,43 +0,0 @@ -<sqale> - <chc> - <key>USABILITY - </key> - <name>Usability - </name> - <desc>Estimate usability - </desc> - </chc> - <chc> - <key>EFFICIENCY - </key> - <name>Efficiency - </name> - <chc> - <key>MEMORY_EFFICIENCY - </key> - <name>Memory use - </name> - <chc> - <rule-repo>checkstyle - </rule-repo> - <rule-key>Regexp - </rule-key> - <prop> - <key>remediationFactor - </key> - <val>3.0 - </val> - <txt>h - </txt> - </prop> - <prop> - <key>remediationFunction - </key> - <txt>linear - </txt> - </prop> - </chc> - </chc> - </chc> - -</sqale> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml deleted file mode 100644 index 4b8ae3f6475..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_constant_per_file.xml +++ /dev/null @@ -1,25 +0,0 @@ -<sqale> - <chc> - <key>EFFICIENCY</key> - <name>Efficiency</name> - <chc> - <key>MEMORY_EFFICIENCY</key> - <name>Memory use</name> - <!-- Should be ignored --> - <chc> - <rule-repo>checkstyle</rule-repo> - <rule-key>Regexp</rule-key> - <prop> - <key>remediationFactor</key> - <val>3.0</val> - <txt>h</txt> - </prop> - <prop> - <key>remediationFunction</key> - <txt>constant_resource</txt> - </prop> - </chc> - </chc> - </chc> - -</sqale> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml deleted file mode 100644 index 9ebc69b94a6..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_deprecated_linear_with_threshold.xml +++ /dev/null @@ -1,36 +0,0 @@ -<sqale> - <chc> - <key>USABILITY</key> - <name>Usability</name> - <desc>Estimate usability</desc> - </chc> - <chc> - <key>EFFICIENCY</key> - <name>Efficiency</name> - <chc> - <key>MEMORY_EFFICIENCY</key> - <name>Memory use</name> - <chc> - <rule-repo>checkstyle</rule-repo> - <rule-key>Regexp</rule-key> - <prop> - <key>remediationFunction</key> - <!-- Should be replaced by linear --> - <txt>linear_threshold</txt> - </prop> - <prop> - <key>remediationFactor</key> - <val>3.0</val> - <txt>h</txt> - </prop> - <!-- Should be ignored --> - <prop> - <key>offset</key> - <val>1.0</val> - <txt>h</txt> - </prop> - </chc> - </chc> - </chc> - -</sqale> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml deleted file mode 100644 index f641a5185ec..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear.xml +++ /dev/null @@ -1,29 +0,0 @@ -<sqale> - <chc> - <key>USABILITY</key> - <name>Usability</name> - <desc>Estimate usability</desc> - </chc> - <chc> - <key>EFFICIENCY</key> - <name>Efficiency</name> - <chc> - <key>MEMORY_EFFICIENCY</key> - <name>Memory use</name> - <chc> - <rule-repo>checkstyle</rule-repo> - <rule-key>Regexp</rule-key> - <prop> - <key>remediationFactor</key> - <val>3.0</val> - <txt>h</txt> - </prop> - <prop> - <key>remediationFunction</key> - <txt>linear</txt> - </prop> - </chc> - </chc> - </chc> - -</sqale> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml deleted file mode 100644 index d12f70d0e2d..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldImportXML_with_linear_with_offset.xml +++ /dev/null @@ -1,34 +0,0 @@ -<sqale> - <chc> - <key>USABILITY</key> - <name>Usability</name> - <desc>Estimate usability</desc> - </chc> - <chc> - <key>EFFICIENCY</key> - <name>Efficiency</name> - <chc> - <key>MEMORY_EFFICIENCY</key> - <name>Memory use</name> - <chc> - <rule-repo>checkstyle</rule-repo> - <rule-key>Regexp</rule-key> - <prop> - <key>remediationFactor</key> - <val>3.0</val> - <txt>h</txt> - </prop> - <prop> - <key>remediationFunction</key> - <txt>linear</txt> - </prop> - <prop> - <key>offset</key> - <val>1.0</val> - <txt>h</txt> - </prop> - </chc> - </chc> - </chc> - -</sqale> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml deleted file mode 100644 index 2898f458e3f..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldLogWarningIfRuleNotFound.xml +++ /dev/null @@ -1,23 +0,0 @@ -<sqale> - <chc> - <key>EFFICIENCY</key> - <name>Efficiency</name> - <chc> - <key>MEMORY_EFFICIENCY</key> - <name>Memory use</name> - <chc> - <rule-repo>findbugs</rule-repo> - <rule-key>Foo</rule-key> - <prop> - <key>remediationFactor</key> - <val>3.0</val> - <txt>h</txt> - </prop> - <prop> - <key>remediationFunction</key> - <txt>linear</txt> - </prop> - </chc> - </chc> - </chc> -</sqale> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml deleted file mode 100644 index bb6bdbb4afb..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/shouldRejectXML_with_invalid_value.xml +++ /dev/null @@ -1,28 +0,0 @@ -<sqale> - <chc> - <key>USABILITY</key> - <name>Usability</name> - <desc>Estimate usability</desc> - </chc> - <chc> - <key>EFFICIENCY</key> - <name>Efficiency</name> - <chc> - <key>MEMORY_EFFICIENCY</key> - <name>Memory use</name> - <chc> - <rule-repo>checkstyle</rule-repo> - <rule-key>Regexp</rule-key> - <prop> - <key>factor</key> - <val>abc</val> - </prop> - <prop> - <key>function</key> - <txt>linear</txt> - </prop> - </chc> - </chc> - </chc> - -</sqale> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml b/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml deleted file mode 100644 index 9efc6da0a29..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/TechnicalDebtXMLImporterTest/use_default_unit_when_no_unit.xml +++ /dev/null @@ -1,52 +0,0 @@ -<!-- - ~ SonarQube, open source software quality management tool. - ~ Copyright (C) 2008-2014 SonarSource - ~ mailto:contact AT sonarsource DOT com - ~ - ~ SonarQube is free software; you can redistribute it and/or - ~ modify it under the terms of the GNU Lesser General Public - ~ License as published by the Free Software Foundation; either - ~ version 3 of the License, or (at your option) any later version. - ~ - ~ SonarQube is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public License - ~ along with this program; if not, write to the Free Software Foundation, - ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - --> - -<sqale> - <chc> - <key>USABILITY</key> - <name>Usability</name> - <desc>Estimate usability</desc> - </chc> - <chc> - <key>EFFICIENCY</key> - <name>Efficiency</name> - <chc> - <key>MEMORY_EFFICIENCY</key> - <name>Memory use</name> - <chc> - <rule-repo>checkstyle</rule-repo> - <rule-key>Regexp</rule-key> - <prop> - <key>remediationFactor</key> - <val>3.0</val> - </prop> - <prop> - <key>remediationFunction</key> - <txt>linear</txt> - </prop> - <prop> - <key>offset</key> - <val>1.0</val> - </prop> - </chc> - </chc> - </chc> - -</sqale> diff --git a/sonar-core/src/test/resources/org/sonar/core/template/LoadedTemplateDaoTest/shouldInsert-result.xml b/sonar-core/src/test/resources/org/sonar/core/template/LoadedTemplateDaoTest/shouldInsert-result.xml deleted file mode 100644 index 020f9ed466a..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/template/LoadedTemplateDaoTest/shouldInsert-result.xml +++ /dev/null @@ -1,8 +0,0 @@ -<dataset> - - <loaded_templates - id="1" - kee="SQALE" - template_type="DASHBOARD"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/countDeveloperLogins.xml b/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/countDeveloperLogins.xml deleted file mode 100644 index 0d932ebcdf7..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/countDeveloperLogins.xml +++ /dev/null @@ -1,7 +0,0 @@ -<dataset> - - <authors id="1" person_id="1" login="godin" /> - <authors id="2" person_id="1" login="evgeny" /> - <authors id="3" person_id="2" login="simon" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper-result.xml b/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper-result.xml deleted file mode 100644 index 3694b2e378d..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper-result.xml +++ /dev/null @@ -1,4 +0,0 @@ -<dataset> - <projects id="1" name="developer@company.net" qualifier="DEV" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="."/> - <authors id="1" person_id="1" login="developer@company.net" /> -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication-result.xml b/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication-result.xml deleted file mode 100644 index 1ca73f3dcf3..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication-result.xml +++ /dev/null @@ -1,7 +0,0 @@ -<dataset> - - <projects id="1" name="developer@company.net" qualifier="DEV" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="."/> - - <authors id="1" person_id="1" login="developer@company.net" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication.xml b/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication.xml deleted file mode 100644 index 1ca73f3dcf3..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication.xml +++ /dev/null @@ -1,7 +0,0 @@ -<dataset> - - <projects id="1" name="developer@company.net" qualifier="DEV" uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="."/> - - <authors id="1" person_id="1" login="developer@company.net" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsDuplication-result.xml b/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsDuplication-result.xml deleted file mode 100644 index c9cbb085a40..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsDuplication-result.xml +++ /dev/null @@ -1,5 +0,0 @@ -<dataset> - - <authors id="1" person_id="10" login="godin" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsDuplication.xml b/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsDuplication.xml deleted file mode 100644 index c9cbb085a40..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldPreventAuthorsDuplication.xml +++ /dev/null @@ -1,5 +0,0 @@ -<dataset> - - <authors id="1" person_id="10" login="godin" /> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectActiveUserByLogin.xml b/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectActiveUserByLogin.xml deleted file mode 100644 index 1927eda7d63..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectActiveUserByLogin.xml +++ /dev/null @@ -1,11 +0,0 @@ -<dataset> - <!-- inactive --> - <users id="50" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[false]"/> - - <!-- active --> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[true]"/> - - <users id="102" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[true]"/> - - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByLogins.xml b/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByLogins.xml deleted file mode 100644 index 3e671162c58..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByLogins.xml +++ /dev/null @@ -1,6 +0,0 @@ -<dataset> - <users id="100" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[false]"/> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[true]"/> - <users id="102" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[true]"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByQuery.xml b/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByQuery.xml deleted file mode 100644 index 52a2421ea31..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByQuery.xml +++ /dev/null @@ -1,5 +0,0 @@ -<dataset> - <users id="100" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[false]"/> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[true]"/> - -</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByText.xml b/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByText.xml deleted file mode 100644 index 6f5237422f9..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectUsersByText.xml +++ /dev/null @@ -1,5 +0,0 @@ -<dataset> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[true]"/> - <users id="102" login="sbrandhof" name="Simon Brandhof" email="marius@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[true]"/> - -</dataset> diff --git a/sonar-db/pom.xml b/sonar-db/pom.xml new file mode 100644 index 00000000000..422677b6342 --- /dev/null +++ b/sonar-db/pom.xml @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.codehaus.sonar</groupId> + <artifactId>sonar</artifactId> + <version>5.2-SNAPSHOT</version> + </parent> + + <artifactId>sonar-db</artifactId> + + <name>SonarQube :: Database</name> + <description>Create and request SonarQube schema</description> + + <dependencies> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.sonar</groupId> + <artifactId>sonar-batch-protocol</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.sonar</groupId> + <artifactId>sonar-core</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sonar-plugin-api</artifactId> + </dependency> + <dependency> + <groupId>org.mybatis</groupId> + <artifactId>mybatis</artifactId> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + </dependency> + <dependency> + <groupId>commons-dbutils</groupId> + <artifactId>commons-dbutils</artifactId> + </dependency> + <dependency> + <groupId>net.jpountz.lz4</groupId> + <artifactId>lz4</artifactId> + </dependency> + + <!-- logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </dependency> + + <!-- tests --> + <dependency> + <groupId>org.codehaus.sonar</groupId> + <artifactId>sonar-testing-harness</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.dbunit</groupId> + <artifactId>dbunit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.code.bean-matchers</groupId> + <artifactId>bean-matchers</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.simpleframework</groupId> + <artifactId>simple</artifactId> + <version>4.1.21</version> + <scope>test</scope> + </dependency> + + + <!-- + JDBC drivers for MyBatis integration tests. + They can't be moved to the profile run-mybatis-its because + --> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>net.sourceforge.jtds</groupId> + <artifactId>jtds</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/sonar-core/src/main/java/org/sonar/batch/index/ResourceCopy.java b/sonar-db/src/main/java/org/sonar/batch/index/ResourceCopy.java index 6a3ccd83029..6a3ccd83029 100644 --- a/sonar-core/src/main/java/org/sonar/batch/index/ResourceCopy.java +++ b/sonar-db/src/main/java/org/sonar/batch/index/ResourceCopy.java diff --git a/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanStats.java b/sonar-db/src/main/java/org/sonar/core/issue/ActionPlanStats.java index cc4eba49a18..593ec0d63ca 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanStats.java +++ b/sonar-db/src/main/java/org/sonar/core/issue/ActionPlanStats.java @@ -20,11 +20,10 @@ package org.sonar.core.issue; +import java.util.Date; import org.sonar.api.issue.ActionPlan; import org.sonar.api.utils.internal.Uuids; -import java.util.Date; - public class ActionPlanStats extends DefaultActionPlan { private int totalIssues; @@ -66,11 +65,11 @@ public class ActionPlanStats extends DefaultActionPlan { return totalIssues - unresolvedIssues; } - public boolean isOpen(){ + public boolean isOpen() { return ActionPlan.STATUS_OPEN.equals(status()); } - public boolean overDue(){ + public boolean overDue() { Date deadline = deadLine(); return isOpen() && deadline != null && new Date().after(deadline); } diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/package-info.java b/sonar-db/src/main/java/org/sonar/core/issue/db/package-info.java index e9e18a27430..55dc4912649 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/package-info.java +++ b/sonar-db/src/main/java/org/sonar/core/issue/db/package-info.java @@ -21,3 +21,4 @@ package org.sonar.core.issue.db; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/issue/package-info.java b/sonar-db/src/main/java/org/sonar/core/issue/package-info.java index c3dc3f2fe4b..0b6aa438498 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/package-info.java +++ b/sonar-db/src/main/java/org/sonar/core/issue/package-info.java @@ -21,3 +21,4 @@ package org.sonar.core.issue; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/permission/ComponentPermissions.java b/sonar-db/src/main/java/org/sonar/core/permission/ComponentPermissions.java index 14956457001..4d2522cae47 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/ComponentPermissions.java +++ b/sonar-db/src/main/java/org/sonar/core/permission/ComponentPermissions.java @@ -21,9 +21,8 @@ package org.sonar.core.permission; import com.google.common.collect.ImmutableList; -import org.sonar.api.web.UserRole; - import java.util.List; +import org.sonar.api.web.UserRole; /** * Holds the constants representing the various component permissions that can be assigned to users & groups diff --git a/sonar-core/src/main/java/org/sonar/core/permission/GlobalPermissions.java b/sonar-db/src/main/java/org/sonar/core/permission/GlobalPermissions.java index b9893ad1c50..9f671e16794 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/GlobalPermissions.java +++ b/sonar-db/src/main/java/org/sonar/core/permission/GlobalPermissions.java @@ -21,7 +21,6 @@ package org.sonar.core.permission; import com.google.common.collect.ImmutableList; - import java.util.List; /** diff --git a/sonar-core/src/main/java/org/sonar/core/permission/GroupWithPermission.java b/sonar-db/src/main/java/org/sonar/core/permission/GroupWithPermission.java index 4ab0791a07a..0dcc1d7ce1d 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/GroupWithPermission.java +++ b/sonar-db/src/main/java/org/sonar/core/permission/GroupWithPermission.java @@ -20,11 +20,10 @@ package org.sonar.core.permission; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; public class GroupWithPermission { diff --git a/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermission.java b/sonar-db/src/main/java/org/sonar/core/permission/UserWithPermission.java index 69a2f77a28a..69a2f77a28a 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermission.java +++ b/sonar-db/src/main/java/org/sonar/core/permission/UserWithPermission.java diff --git a/sonar-core/src/main/java/org/sonar/core/permission/package-info.java b/sonar-db/src/main/java/org/sonar/core/permission/package-info.java index 2da7d79ab63..7e8c924d2ca 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/package-info.java +++ b/sonar-db/src/main/java/org/sonar/core/permission/package-info.java @@ -22,3 +22,4 @@ package org.sonar.core.permission; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/timemachine/Periods.java b/sonar-db/src/main/java/org/sonar/core/timemachine/Periods.java index 2d16c7137d0..2d16c7137d0 100644 --- a/sonar-core/src/main/java/org/sonar/core/timemachine/Periods.java +++ b/sonar-db/src/main/java/org/sonar/core/timemachine/Periods.java diff --git a/sonar-core/src/main/java/org/sonar/core/activity/db/package-info.java b/sonar-db/src/main/java/org/sonar/core/timemachine/package-info.java index ddc4a6d20fb..039fb6393df 100644 --- a/sonar-core/src/main/java/org/sonar/core/activity/db/package-info.java +++ b/sonar-db/src/main/java/org/sonar/core/timemachine/package-info.java @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - @ParametersAreNonnullByDefault -package org.sonar.core.activity.db; +package org.sonar.core.timemachine; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/user/DefaultUserFinder.java b/sonar-db/src/main/java/org/sonar/core/user/DefaultUserFinder.java index fcd71a7ddba..16d2867c6c0 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/DefaultUserFinder.java +++ b/sonar-db/src/main/java/org/sonar/core/user/DefaultUserFinder.java @@ -20,13 +20,14 @@ package org.sonar.core.user; import com.google.common.collect.Lists; +import java.util.Collection; +import java.util.List; +import javax.annotation.CheckForNull; import org.sonar.api.user.User; import org.sonar.api.user.UserFinder; import org.sonar.api.user.UserQuery; - -import javax.annotation.CheckForNull; -import java.util.Collection; -import java.util.List; +import org.sonar.db.user.UserDao; +import org.sonar.db.user.UserDto; /** * @since 3.6 diff --git a/sonar-core/src/main/java/org/sonar/core/user/DeprecatedUserFinder.java b/sonar-db/src/main/java/org/sonar/core/user/DeprecatedUserFinder.java index 7a180bb7d54..2413ce4babc 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/DeprecatedUserFinder.java +++ b/sonar-db/src/main/java/org/sonar/core/user/DeprecatedUserFinder.java @@ -22,6 +22,8 @@ package org.sonar.core.user; import javax.annotation.Nullable; import org.sonar.api.database.model.User; import org.sonar.api.security.UserFinder; +import org.sonar.db.user.UserDao; +import org.sonar.db.user.UserDto; /** * @since 2.10 diff --git a/sonar-core/src/main/java/org/sonar/core/user/GroupMembership.java b/sonar-db/src/main/java/org/sonar/core/user/GroupMembership.java index 6c12ed4524c..1e8715dead4 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/GroupMembership.java +++ b/sonar-db/src/main/java/org/sonar/core/user/GroupMembership.java @@ -19,11 +19,10 @@ */ package org.sonar.core.user; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; public class GroupMembership { diff --git a/sonar-core/src/main/java/org/sonar/core/user/package-info.java b/sonar-db/src/main/java/org/sonar/core/user/package-info.java index 73bfef46c33..73bfef46c33 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/package-info.java +++ b/sonar-db/src/main/java/org/sonar/core/user/package-info.java diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/BatchSession.java b/sonar-db/src/main/java/org/sonar/db/BatchSession.java index f4603ade974..3e6d0b89867 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/BatchSession.java +++ b/sonar-db/src/main/java/org/sonar/db/BatchSession.java @@ -17,8 +17,10 @@ * 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.persistence; +package org.sonar.db; +import java.util.List; +import java.util.Map; import org.apache.ibatis.executor.BatchResult; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; import org.apache.ibatis.executor.keygen.KeyGenerator; @@ -27,11 +29,8 @@ import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.ResultHandler; import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.SqlSession; -import org.sonar.core.cluster.ClusterAction; -import org.sonar.core.cluster.WorkQueue; - -import java.util.List; -import java.util.Map; +import org.sonar.db.deprecated.ClusterAction; +import org.sonar.db.deprecated.WorkQueue; public class BatchSession extends DbSession { diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DaoComponent.java b/sonar-db/src/main/java/org/sonar/db/Dao.java index 09849be20fb..99bd33d1eb5 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DaoComponent.java +++ b/sonar-db/src/main/java/org/sonar/db/Dao.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.db; -public interface DaoComponent { +public interface Dao { } diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java b/sonar-db/src/main/java/org/sonar/db/DaoUtils.java index 23f00843f34..5c0d3269e3c 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java +++ b/sonar-db/src/main/java/org/sonar/db/DaoUtils.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.db; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; @@ -25,34 +25,35 @@ import com.google.common.collect.Lists; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.sonar.core.dashboard.ActiveDashboardDao; -import org.sonar.core.dashboard.DashboardDao; -import org.sonar.core.duplication.DuplicationDao; -import org.sonar.core.issue.db.ActionPlanDao; -import org.sonar.core.issue.db.ActionPlanStatsDao; -import org.sonar.core.issue.db.IssueChangeDao; -import org.sonar.core.issue.db.IssueDao; -import org.sonar.core.issue.db.IssueFilterDao; -import org.sonar.core.issue.db.IssueFilterFavouriteDao; -import org.sonar.core.notification.db.NotificationQueueDao; -import org.sonar.core.permission.PermissionDao; -import org.sonar.core.permission.PermissionTemplateDao; -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.ActiveRuleDao; -import org.sonar.core.qualityprofile.db.QualityProfileDao; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceIndexerDao; -import org.sonar.core.resource.ResourceKeyUpdaterDao; -import org.sonar.core.rule.RuleDao; -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.core.user.UserDao; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceIndexerDao; +import org.sonar.db.component.ResourceKeyUpdaterDao; +import org.sonar.db.dashboard.ActiveDashboardDao; +import org.sonar.db.dashboard.DashboardDao; +import org.sonar.db.debt.CharacteristicDao; +import org.sonar.db.duplication.DuplicationDao; +import org.sonar.db.issue.ActionPlanDao; +import org.sonar.db.issue.ActionPlanStatsDao; +import org.sonar.db.issue.IssueChangeDao; +import org.sonar.db.issue.IssueDao; +import org.sonar.db.issue.IssueFilterDao; +import org.sonar.db.issue.IssueFilterFavouriteDao; +import org.sonar.db.loadedtemplate.LoadedTemplateDao; +import org.sonar.db.notification.NotificationQueueDao; +import org.sonar.db.permission.PermissionDao; +import org.sonar.db.permission.PermissionTemplateDao; +import org.sonar.db.property.PropertiesDao; +import org.sonar.db.purge.PurgeDao; +import org.sonar.db.qualitygate.QualityGateConditionDao; +import org.sonar.db.qualityprofile.ActiveRuleDao; +import org.sonar.db.qualityprofile.QualityProfileDao; +import org.sonar.db.rule.RuleDao; +import org.sonar.db.semaphore.SemaphoreDao; +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.db.user.UserDao; import static com.google.common.collect.Lists.newArrayList; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/Database.java b/sonar-db/src/main/java/org/sonar/db/Database.java index 27b03f01c63..6b747edee76 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/Database.java +++ b/sonar-db/src/main/java/org/sonar/db/Database.java @@ -17,11 +17,11 @@ * 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.persistence; +package org.sonar.db; import javax.sql.DataSource; import org.picocontainer.Startable; -import org.sonar.core.persistence.dialect.Dialect; +import org.sonar.db.dialect.Dialect; /** * @since 2.12 diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseUtils.java b/sonar-db/src/main/java/org/sonar/db/DatabaseUtils.java index e0119bf5322..28ac5923b72 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseUtils.java +++ b/sonar-db/src/main/java/org/sonar/db/DatabaseUtils.java @@ -17,16 +17,14 @@ * 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.persistence; - -import org.slf4j.LoggerFactory; - -import javax.annotation.Nullable; +package org.sonar.db; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import javax.annotation.Nullable; +import org.slf4j.LoggerFactory; /** * @since 2.13 diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java b/sonar-db/src/main/java/org/sonar/db/DbSession.java index 63a7f6b856d..d5760462d52 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java +++ b/sonar-db/src/main/java/org/sonar/db/DbSession.java @@ -17,20 +17,19 @@ * 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.persistence; +package org.sonar.db; +import java.sql.Connection; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import org.apache.ibatis.executor.BatchResult; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.ResultHandler; import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.SqlSession; -import org.sonar.core.cluster.ClusterAction; -import org.sonar.core.cluster.WorkQueue; - -import java.sql.Connection; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import org.sonar.db.deprecated.ClusterAction; +import org.sonar.db.deprecated.WorkQueue; public class DbSession implements SqlSession { diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DdlUtils.java b/sonar-db/src/main/java/org/sonar/db/DdlUtils.java index 632102f696a..52e64e59728 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DdlUtils.java +++ b/sonar-db/src/main/java/org/sonar/db/DdlUtils.java @@ -17,15 +17,14 @@ * 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.persistence; +package org.sonar.db; +import java.io.PrintWriter; +import java.sql.Connection; import org.apache.commons.io.output.NullWriter; import org.apache.ibatis.io.Resources; import org.apache.ibatis.jdbc.ScriptRunner; -import java.io.PrintWriter; -import java.sql.Connection; - /** * Util class to create Sonar database tables * @@ -44,8 +43,8 @@ public final class DdlUtils { * The connection is commited in this method but not closed. */ public static void createSchema(Connection connection, String dialect) { - executeScript(connection, "org/sonar/core/persistence/schema-" + dialect + ".ddl"); - executeScript(connection, "org/sonar/core/persistence/rows-" + dialect + ".sql"); + executeScript(connection, "org/sonar/db/version/schema-" + dialect + ".ddl"); + executeScript(connection, "org/sonar/db/version/rows-" + dialect + ".sql"); } public static void executeScript(Connection connection, String path) { diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DefaultDatabase.java b/sonar-db/src/main/java/org/sonar/db/DefaultDatabase.java index f585eafbacc..c5e5e1c12b8 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DefaultDatabase.java +++ b/sonar-db/src/main/java/org/sonar/db/DefaultDatabase.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.db; import com.google.common.annotations.VisibleForTesting; import java.sql.Connection; @@ -34,9 +34,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.config.Settings; import org.sonar.api.database.DatabaseProperties; -import org.sonar.core.persistence.dialect.Dialect; -import org.sonar.core.persistence.dialect.DialectUtils; -import org.sonar.core.persistence.profiling.ProfiledDataSource; +import org.sonar.db.dialect.Dialect; +import org.sonar.db.dialect.DialectUtils; +import org.sonar.db.profiling.ProfiledDataSource; /** * @since 2.12 diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/Dto.java b/sonar-db/src/main/java/org/sonar/db/Dto.java index e5cfec6109b..e5b9c494e97 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/Dto.java +++ b/sonar-db/src/main/java/org/sonar/db/Dto.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.db; import java.io.Serializable; import java.util.Date; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/IsAliveMapper.java b/sonar-db/src/main/java/org/sonar/db/IsAliveMapper.java index f557172f4be..75c63cf70a1 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/IsAliveMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/IsAliveMapper.java @@ -17,10 +17,11 @@ * 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.persistence; +package org.sonar.db; public interface IsAliveMapper { int IS_ALIVE_RETURNED_VALUE = 1; + /** * Always return {@link #IS_ALIVE_RETURNED_VALUE} unless a database or connection error occurs. */ diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java b/sonar-db/src/main/java/org/sonar/db/MyBatis.java index d8234e01910..a6aa01cbc4f 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java +++ b/sonar-db/src/main/java/org/sonar/db/MyBatis.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.persistence; +package org.sonar.db; import ch.qos.logback.classic.Level; import com.google.common.io.Closeables; @@ -35,124 +35,121 @@ import org.apache.ibatis.session.SqlSessionFactoryBuilder; import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory; import org.apache.ibatis.type.JdbcType; import org.slf4j.LoggerFactory; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.activity.db.ActivityDto; -import org.sonar.core.activity.db.ActivityMapper; -import org.sonar.core.cluster.WorkQueue; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.ComponentLinkDto; -import org.sonar.core.component.FilePathWithHashDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.component.UuidWithProjectUuidDto; -import org.sonar.core.component.db.ComponentIndexMapper; -import org.sonar.core.component.db.ComponentLinkMapper; -import org.sonar.core.component.db.ComponentMapper; -import org.sonar.core.component.db.SnapshotMapper; -import org.sonar.core.computation.db.AnalysisReportDto; -import org.sonar.core.computation.db.AnalysisReportMapper; -import org.sonar.core.config.Logback; -import org.sonar.core.dashboard.ActiveDashboardDto; -import org.sonar.core.dashboard.ActiveDashboardMapper; -import org.sonar.core.dashboard.DashboardDto; -import org.sonar.core.dashboard.DashboardMapper; -import org.sonar.core.dashboard.WidgetDto; -import org.sonar.core.dashboard.WidgetMapper; -import org.sonar.core.dashboard.WidgetPropertyDto; -import org.sonar.core.dashboard.WidgetPropertyMapper; -import org.sonar.core.duplication.DuplicationMapper; -import org.sonar.core.duplication.DuplicationUnitDto; -import org.sonar.core.event.EventDto; -import org.sonar.core.event.db.EventMapper; -import org.sonar.core.issue.db.ActionPlanDto; -import org.sonar.core.issue.db.ActionPlanMapper; -import org.sonar.core.issue.db.ActionPlanStatsDto; -import org.sonar.core.issue.db.ActionPlanStatsMapper; -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.IssueFilterDto; -import org.sonar.core.issue.db.IssueFilterFavouriteDto; -import org.sonar.core.issue.db.IssueFilterFavouriteMapper; -import org.sonar.core.issue.db.IssueFilterMapper; -import org.sonar.core.issue.db.IssueMapper; -import org.sonar.core.measure.custom.db.CustomMeasureDto; -import org.sonar.core.measure.custom.db.CustomMeasureMapper; -import org.sonar.core.measure.db.MeasureDto; -import org.sonar.core.measure.db.MeasureFilterDto; -import org.sonar.core.measure.db.MeasureFilterMapper; -import org.sonar.core.measure.db.MeasureMapper; -import org.sonar.core.metric.db.MetricMapper; -import org.sonar.core.notification.db.NotificationQueueDto; -import org.sonar.core.notification.db.NotificationQueueMapper; -import org.sonar.core.permission.GroupWithPermissionDto; -import org.sonar.core.permission.PermissionTemplateDto; -import org.sonar.core.permission.PermissionTemplateGroupDto; -import org.sonar.core.permission.PermissionTemplateMapper; -import org.sonar.core.permission.PermissionTemplateUserDto; -import org.sonar.core.permission.UserWithPermissionDto; -import org.sonar.core.persistence.dialect.Dialect; -import org.sonar.core.persistence.migration.v44.Migration44Mapper; -import org.sonar.core.persistence.migration.v45.Migration45Mapper; -import org.sonar.core.persistence.migration.v50.Migration50Mapper; -import org.sonar.core.properties.PropertiesMapper; -import org.sonar.core.properties.PropertyDto; -import org.sonar.core.purge.IdUuidPair; -import org.sonar.core.purge.PurgeMapper; -import org.sonar.core.purge.PurgeableSnapshotDto; -import org.sonar.core.qualitygate.db.ProjectQgateAssociationDto; -import org.sonar.core.qualitygate.db.ProjectQgateAssociationMapper; -import org.sonar.core.qualitygate.db.QualityGateConditionDto; -import org.sonar.core.qualitygate.db.QualityGateConditionMapper; -import org.sonar.core.qualitygate.db.QualityGateDto; -import org.sonar.core.qualitygate.db.QualityGateMapper; -import org.sonar.core.qualityprofile.db.ActiveRuleDto; -import org.sonar.core.qualityprofile.db.ActiveRuleMapper; -import org.sonar.core.qualityprofile.db.ActiveRuleParamDto; -import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.core.qualityprofile.db.QualityProfileMapper; -import org.sonar.core.resource.ResourceDto; -import org.sonar.core.resource.ResourceIndexDto; -import org.sonar.core.resource.ResourceIndexerMapper; -import org.sonar.core.resource.ResourceKeyUpdaterMapper; -import org.sonar.core.resource.ResourceMapper; -import org.sonar.core.rule.RuleDto; -import org.sonar.core.rule.RuleMapper; -import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.source.db.FileSourceMapper; -import org.sonar.core.technicaldebt.db.CharacteristicDto; -import org.sonar.core.technicaldebt.db.CharacteristicMapper; -import org.sonar.core.technicaldebt.db.RequirementMigrationDto; -import org.sonar.core.template.LoadedTemplateDto; -import org.sonar.core.template.LoadedTemplateMapper; -import org.sonar.core.user.AuthorDto; -import org.sonar.core.user.AuthorMapper; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupMapper; -import org.sonar.core.user.GroupMembershipDto; -import org.sonar.core.user.GroupMembershipMapper; -import org.sonar.core.user.GroupRoleDto; -import org.sonar.core.user.RoleMapper; -import org.sonar.core.user.UserDto; -import org.sonar.core.user.UserGroupDto; -import org.sonar.core.user.UserGroupMapper; -import org.sonar.core.user.UserMapper; -import org.sonar.core.user.UserRoleDto; +import org.sonar.db.activity.ActivityDto; +import org.sonar.db.activity.ActivityMapper; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.ComponentIndexMapper; +import org.sonar.db.component.ComponentLinkDto; +import org.sonar.db.component.ComponentLinkMapper; +import org.sonar.db.component.ComponentMapper; +import org.sonar.db.component.FilePathWithHashDto; +import org.sonar.db.component.ResourceDto; +import org.sonar.db.component.ResourceIndexDto; +import org.sonar.db.component.ResourceIndexerMapper; +import org.sonar.db.component.ResourceKeyUpdaterMapper; +import org.sonar.db.component.ResourceMapper; +import org.sonar.db.component.SnapshotDto; +import org.sonar.db.component.SnapshotMapper; +import org.sonar.db.component.UuidWithProjectUuidDto; +import org.sonar.db.compute.AnalysisReportDto; +import org.sonar.db.compute.AnalysisReportMapper; +import org.sonar.db.dashboard.ActiveDashboardDto; +import org.sonar.db.dashboard.ActiveDashboardMapper; +import org.sonar.db.dashboard.DashboardDto; +import org.sonar.db.dashboard.DashboardMapper; +import org.sonar.db.dashboard.WidgetDto; +import org.sonar.db.dashboard.WidgetMapper; +import org.sonar.db.dashboard.WidgetPropertyDto; +import org.sonar.db.dashboard.WidgetPropertyMapper; +import org.sonar.db.debt.CharacteristicDto; +import org.sonar.db.debt.CharacteristicMapper; +import org.sonar.db.debt.RequirementMigrationDto; +import org.sonar.db.deprecated.WorkQueue; +import org.sonar.db.dialect.Dialect; +import org.sonar.db.duplication.DuplicationMapper; +import org.sonar.db.duplication.DuplicationUnitDto; +import org.sonar.db.event.EventDto; +import org.sonar.db.event.EventMapper; +import org.sonar.db.issue.ActionPlanDto; +import org.sonar.db.issue.ActionPlanMapper; +import org.sonar.db.issue.ActionPlanStatsDto; +import org.sonar.db.issue.ActionPlanStatsMapper; +import org.sonar.db.issue.IssueChangeDto; +import org.sonar.db.issue.IssueChangeMapper; +import org.sonar.db.issue.IssueDto; +import org.sonar.db.issue.IssueFilterDto; +import org.sonar.db.issue.IssueFilterFavouriteDto; +import org.sonar.db.issue.IssueFilterFavouriteMapper; +import org.sonar.db.issue.IssueFilterMapper; +import org.sonar.db.issue.IssueMapper; +import org.sonar.db.loadedtemplate.LoadedTemplateDto; +import org.sonar.db.loadedtemplate.LoadedTemplateMapper; +import org.sonar.db.measure.CustomMeasureDto; +import org.sonar.db.measure.CustomMeasureMapper; +import org.sonar.db.measure.MeasureDto; +import org.sonar.db.measure.MeasureFilterDto; +import org.sonar.db.measure.MeasureFilterMapper; +import org.sonar.db.measure.MeasureMapper; +import org.sonar.db.metric.MetricMapper; +import org.sonar.db.notification.NotificationQueueDto; +import org.sonar.db.notification.NotificationQueueMapper; +import org.sonar.db.permission.GroupWithPermissionDto; +import org.sonar.db.permission.PermissionTemplateDto; +import org.sonar.db.permission.PermissionTemplateGroupDto; +import org.sonar.db.permission.PermissionTemplateMapper; +import org.sonar.db.permission.PermissionTemplateUserDto; +import org.sonar.db.permission.UserWithPermissionDto; +import org.sonar.db.property.PropertiesMapper; +import org.sonar.db.property.PropertyDto; +import org.sonar.db.purge.IdUuidPair; +import org.sonar.db.purge.PurgeMapper; +import org.sonar.db.purge.PurgeableSnapshotDto; +import org.sonar.db.qualitygate.ProjectQgateAssociationDto; +import org.sonar.db.qualitygate.ProjectQgateAssociationMapper; +import org.sonar.db.qualitygate.QualityGateConditionDto; +import org.sonar.db.qualitygate.QualityGateConditionMapper; +import org.sonar.db.qualitygate.QualityGateDto; +import org.sonar.db.qualitygate.QualityGateMapper; +import org.sonar.db.qualityprofile.ActiveRuleDto; +import org.sonar.db.qualityprofile.ActiveRuleMapper; +import org.sonar.db.qualityprofile.ActiveRuleParamDto; +import org.sonar.db.qualityprofile.QualityProfileDto; +import org.sonar.db.qualityprofile.QualityProfileMapper; +import org.sonar.db.rule.RuleDto; +import org.sonar.db.rule.RuleMapper; +import org.sonar.db.rule.RuleParamDto; +import org.sonar.db.semaphore.SemaphoreDto; +import org.sonar.db.semaphore.SemaphoreMapper; +import org.sonar.db.source.FileSourceMapper; +import org.sonar.db.user.AuthorDto; +import org.sonar.db.user.AuthorMapper; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupMapper; +import org.sonar.db.user.GroupMembershipDto; +import org.sonar.db.user.GroupMembershipMapper; +import org.sonar.db.user.GroupRoleDto; +import org.sonar.db.user.RoleMapper; +import org.sonar.db.user.UserDto; +import org.sonar.db.user.UserGroupDto; +import org.sonar.db.user.UserGroupMapper; +import org.sonar.db.user.UserMapper; +import org.sonar.db.user.UserRoleDto; +import org.sonar.db.version.SchemaMigrationDto; +import org.sonar.db.version.SchemaMigrationMapper; +import org.sonar.db.version.v44.Migration44Mapper; +import org.sonar.db.version.v45.Migration45Mapper; +import org.sonar.db.version.v50.Migration50Mapper; -@BatchSide -@ServerSide public class MyBatis { private final Database database; - private final Logback logback; private SqlSessionFactory sessionFactory; // TODO this queue should directly be an IndexQueue. Pending move of persistence to sonar-server private WorkQueue<?> queue; - public MyBatis(Database database, Logback logback, WorkQueue<?> queue) { + public MyBatis(Database database, WorkQueue<?> queue) { this.database = database; - this.logback = logback; this.queue = queue; } @@ -240,11 +237,11 @@ public class MyBatis { loadAlias(conf, "CustomMeasure", CustomMeasureDto.class); // AuthorizationMapper has to be loaded before IssueMapper because this last one used it - loadMapper(conf, "org.sonar.core.user.AuthorizationMapper"); + loadMapper(conf, "org.sonar.db.user.AuthorizationMapper"); // ResourceMapper has to be loaded before IssueMapper because this last one used it loadMapper(conf, ResourceMapper.class); - loadMapper(conf, "org.sonar.core.permission.PermissionMapper"); + loadMapper(conf, "org.sonar.db.permission.PermissionMapper"); Class<?>[] mappers = {ActivityMapper.class, ActiveDashboardMapper.class, AuthorMapper.class, DashboardMapper.class, DuplicationMapper.class, IssueMapper.class, IssueChangeMapper.class, IssueFilterMapper.class, IssueFilterFavouriteMapper.class, @@ -315,7 +312,7 @@ public class MyBatis { input = getClass().getResourceAsStream("/" + mapperName.replace('.', '/') + ".xml"); new XMLMapperBuilder(input, configuration, mapperName, configuration.getSqlFragments()).parse(); configuration.addLoadedResource(mapperName); - logback.setLoggerLevel(mapperName, Level.INFO); + ((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(mapperName)).setLevel(Level.INFO); } catch (Exception e) { throw new IllegalArgumentException("Unable to load mapper " + mapperName, e); } finally { diff --git a/sonar-core/src/main/java/org/sonar/core/activity/db/ActivityDto.java b/sonar-db/src/main/java/org/sonar/db/activity/ActivityDto.java index 81454b05421..2f0b91aabb1 100644 --- a/sonar-core/src/main/java/org/sonar/core/activity/db/ActivityDto.java +++ b/sonar-db/src/main/java/org/sonar/db/activity/ActivityDto.java @@ -17,15 +17,13 @@ * 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.activity.db; +package org.sonar.db.activity; +import java.util.Date; +import javax.annotation.Nullable; import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import javax.annotation.Nullable; - -import java.util.Date; - public class ActivityDto { private String key; diff --git a/sonar-core/src/main/java/org/sonar/core/activity/db/ActivityMapper.java b/sonar-db/src/main/java/org/sonar/db/activity/ActivityMapper.java index 175bef8bc30..467db557e8e 100644 --- a/sonar-core/src/main/java/org/sonar/core/activity/db/ActivityMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/activity/ActivityMapper.java @@ -17,7 +17,7 @@ * 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.activity.db; +package org.sonar.db.activity; public interface ActivityMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/cluster/package-info.java b/sonar-db/src/main/java/org/sonar/db/activity/package-info.java index 404b0c30ca4..10134a6fce2 100644 --- a/sonar-core/src/main/java/org/sonar/core/cluster/package-info.java +++ b/sonar-db/src/main/java/org/sonar/db/activity/package-info.java @@ -19,6 +19,7 @@ */ @ParametersAreNonnullByDefault -package org.sonar.core.cluster; +package org.sonar.db.activity; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentDto.java index 1e64ff9e9ed..4e034e4a19b 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentDto.java @@ -17,17 +17,15 @@ * 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.component; +package org.sonar.db.component; +import java.util.Date; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import org.apache.commons.lang.builder.ToStringBuilder; import org.sonar.api.component.Component; import org.sonar.api.resources.Scopes; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - -import java.util.Date; - public class ComponentDto implements Component { public static final String MODULE_UUID_PATH_SEP = "."; diff --git a/sonar-core/src/main/java/org/sonar/core/component/db/ComponentIndexMapper.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentIndexMapper.java index 694d0c752a6..44eafac3a24 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/db/ComponentIndexMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentIndexMapper.java @@ -18,11 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component.db; - -import org.apache.ibatis.annotations.Param; +package org.sonar.db.component; import java.util.List; +import org.apache.ibatis.annotations.Param; public interface ComponentIndexMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/component/ComponentLinkDto.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentLinkDto.java index e8c416b9332..62cc435966b 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/ComponentLinkDto.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentLinkDto.java @@ -18,10 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component; +package org.sonar.db.component; import com.google.common.collect.ImmutableList; - import java.util.List; /** diff --git a/sonar-core/src/main/java/org/sonar/core/component/db/ComponentLinkMapper.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentLinkMapper.java index 464a998fc7f..2b7fe818914 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/db/ComponentLinkMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentLinkMapper.java @@ -18,9 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component.db; - -import org.sonar.core.component.ComponentLinkDto; +package org.sonar.db.component; import java.util.List; diff --git a/sonar-core/src/main/java/org/sonar/core/component/db/ComponentMapper.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentMapper.java index 7eac6cd994c..ac38353e9a6 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/db/ComponentMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentMapper.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component.db; +package org.sonar.db.component; import java.util.Collection; import java.util.List; @@ -27,9 +27,6 @@ import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.session.RowBounds; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.FilePathWithHashDto; -import org.sonar.core.component.UuidWithProjectUuidDto; /** * @since 4.3 diff --git a/sonar-core/src/main/java/org/sonar/core/component/FilePathWithHashDto.java b/sonar-db/src/main/java/org/sonar/db/component/FilePathWithHashDto.java index 0cc55dc1607..85e3c45ceb6 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/FilePathWithHashDto.java +++ b/sonar-db/src/main/java/org/sonar/db/component/FilePathWithHashDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component; +package org.sonar.db.component; public class FilePathWithHashDto { diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceDao.java index 49ee6b18d38..2ebd03ec015 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceDao.java @@ -17,7 +17,7 @@ * 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.resource; +package org.sonar.db.component; import com.google.common.base.Function; import com.google.common.collect.Iterables; @@ -32,15 +32,13 @@ import org.sonar.api.component.Component; import org.sonar.api.resources.Scopes; import org.sonar.api.utils.System2; import org.sonar.api.utils.internal.Uuids; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import static com.google.common.collect.Lists.newArrayList; -public class ResourceDao implements DaoComponent { +public class ResourceDao implements Dao { private MyBatis mybatis; private System2 system2; diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceDto.java index 3fef645f9ee..769ee2376fc 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceDto.java @@ -17,7 +17,7 @@ * 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.resource; +package org.sonar.db.component; import java.util.Date; diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexDto.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexDto.java index d680d3772eb..90ac0944274 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexDto.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexDto.java @@ -17,7 +17,7 @@ * 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.resource; +package org.sonar.db.component; public final class ResourceIndexDto { private Long id; diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerDao.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexerDao.java index b04a4256378..6a61ef714e6 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerDao.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexerDao.java @@ -17,7 +17,7 @@ * 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.resource; +package org.sonar.db.component; import org.apache.commons.lang.StringUtils; import org.apache.ibatis.session.ResultContext; @@ -25,12 +25,12 @@ import org.apache.ibatis.session.ResultHandler; import org.apache.ibatis.session.SqlSession; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; public class ResourceIndexerDao { - private static final String SELECT_RESOURCES = "org.sonar.core.resource.ResourceIndexerMapper.selectResources"; + private static final String SELECT_RESOURCES = "org.sonar.db.component.ResourceIndexerMapper.selectResources"; public static final int MINIMUM_KEY_SIZE = 3; public static final int SINGLE_INDEX_SIZE = 2; @@ -74,7 +74,7 @@ public class ResourceIndexerDao { final DbSession session = mybatis.openSession(true); try { final ResourceIndexerMapper mapper = session.getMapper(ResourceIndexerMapper.class); - session.select("org.sonar.core.resource.ResourceIndexerMapper.selectRootProjectIds", /* workaround to get booleans */ResourceIndexerQuery.create(), new ResultHandler() { + session.select("org.sonar.db.component.ResourceIndexerMapper.selectRootProjectIds", /* workaround to get booleans */ResourceIndexerQuery.create(), new ResultHandler() { @Override public void handleResult(ResultContext context) { Integer rootProjectId = (Integer) context.getResultObject(); diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerMapper.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexerMapper.java index 3849055f81c..ecbacc7da82 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexerMapper.java @@ -17,7 +17,7 @@ * 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.resource; +package org.sonar.db.component; public interface ResourceIndexerMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerQuery.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexerQuery.java index 7d443170380..f05204aa130 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceIndexerQuery.java @@ -17,13 +17,13 @@ * 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.resource; +package org.sonar.db.component; final class ResourceIndexerQuery { private long rootProjectId; private String[] scopes = null; private String[] qualifiers = null; - private boolean nonIndexedOnly=false; + private boolean nonIndexedOnly = false; private ResourceIndexerQuery() { } diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceKeyUpdaterDao.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceKeyUpdaterDao.java index 34aa6008dee..6441c88df37 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceKeyUpdaterDao.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceKeyUpdaterDao.java @@ -17,7 +17,7 @@ * 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.resource; +package org.sonar.db.component; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -28,8 +28,8 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang.StringUtils; import org.apache.ibatis.session.SqlSession; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; /** * Class used to rename the key of a project and its resources. diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceKeyUpdaterMapper.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceKeyUpdaterMapper.java index 8c09b7dd49b..de5b61e2af0 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceKeyUpdaterMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceKeyUpdaterMapper.java @@ -17,7 +17,7 @@ * 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.resource; +package org.sonar.db.component; import java.util.List; diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceMapper.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceMapper.java index be3371b2c25..885527065fb 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceMapper.java @@ -17,14 +17,12 @@ * 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.resource; - -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.session.ResultHandler; -import org.sonar.core.component.SnapshotDto; +package org.sonar.db.component; import java.util.Collection; import java.util.List; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.session.ResultHandler; public interface ResourceMapper { SnapshotDto selectSnapshot(Long snapshotId); diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceQuery.java b/sonar-db/src/main/java/org/sonar/db/component/ResourceQuery.java index 5b1c603adfd..898c5b0b528 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ResourceQuery.java @@ -17,7 +17,7 @@ * 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.resource; +package org.sonar.db.component; /** * @since 3.0 diff --git a/sonar-core/src/main/java/org/sonar/core/component/SnapshotDto.java b/sonar-db/src/main/java/org/sonar/db/component/SnapshotDto.java index f2735478980..c421ce1b51f 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/SnapshotDto.java +++ b/sonar-db/src/main/java/org/sonar/db/component/SnapshotDto.java @@ -17,7 +17,7 @@ * 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.component; +package org.sonar.db.component; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/component/db/SnapshotMapper.java b/sonar-db/src/main/java/org/sonar/db/component/SnapshotMapper.java index 8abac141a46..d9f29d97d0c 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/db/SnapshotMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/component/SnapshotMapper.java @@ -18,12 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component.db; +package org.sonar.db.component; import java.util.List; import javax.annotation.CheckForNull; import org.apache.ibatis.annotations.Param; -import org.sonar.core.component.SnapshotDto; public interface SnapshotMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/component/db/SnapshotQuery.java b/sonar-db/src/main/java/org/sonar/db/component/SnapshotQuery.java index db8c996d970..fd03cfeb9de 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/db/SnapshotQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/component/SnapshotQuery.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component.db; +package org.sonar.db.component; import javax.annotation.CheckForNull; import javax.annotation.Nullable; @@ -118,7 +118,7 @@ public final class SnapshotQuery { return this; } - public SnapshotQuery setSort(SORT_FIELD sortField, SORT_ORDER sortOrder){ + public SnapshotQuery setSort(SORT_FIELD sortField, SORT_ORDER sortOrder) { this.sortField = sortField.fieldName; this.sortOrder = sortOrder.order; return this; diff --git a/sonar-core/src/main/java/org/sonar/core/component/UuidWithProjectUuidDto.java b/sonar-db/src/main/java/org/sonar/db/component/UuidWithProjectUuidDto.java index 82fe44a82dd..d8667623b01 100644 --- a/sonar-core/src/main/java/org/sonar/core/component/UuidWithProjectUuidDto.java +++ b/sonar-db/src/main/java/org/sonar/db/component/UuidWithProjectUuidDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component; +package org.sonar.db.component; public class UuidWithProjectUuidDto { diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/package-info.java b/sonar-db/src/main/java/org/sonar/db/component/package-info.java index e95a48da83b..ccaf374bc27 100644 --- a/sonar-core/src/main/java/org/sonar/core/plugins/package-info.java +++ b/sonar-db/src/main/java/org/sonar/db/component/package-info.java @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - @ParametersAreNonnullByDefault -package org.sonar.core.plugins; +package org.sonar.db.component; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportDto.java b/sonar-db/src/main/java/org/sonar/db/compute/AnalysisReportDto.java index e09270fa4f5..010afe179e7 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportDto.java +++ b/sonar-db/src/main/java/org/sonar/db/compute/AnalysisReportDto.java @@ -17,11 +17,10 @@ * 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.computation.db; +package org.sonar.db.compute; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; - import javax.annotation.CheckForNull; public class AnalysisReportDto { diff --git a/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportMapper.java b/sonar-db/src/main/java/org/sonar/db/compute/AnalysisReportMapper.java index f9995986a24..daa9e465a89 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/compute/AnalysisReportMapper.java @@ -17,11 +17,10 @@ * 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.computation.db; - -import org.apache.ibatis.annotations.Param; +package org.sonar.db.compute; import java.util.List; +import org.apache.ibatis.annotations.Param; public interface AnalysisReportMapper { List<AnalysisReportDto> selectByProjectKey(String projectKey); diff --git a/sonar-db/src/main/java/org/sonar/db/compute/package-info.java b/sonar-db/src/main/java/org/sonar/db/compute/package-info.java new file mode 100644 index 00000000000..240f322233d --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/compute/package-info.java @@ -0,0 +1,25 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +@ParametersAreNonnullByDefault +package org.sonar.db.compute; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardDao.java b/sonar-db/src/main/java/org/sonar/db/dashboard/ActiveDashboardDao.java index cfacc608706..8463da58cfa 100644 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardDao.java +++ b/sonar-db/src/main/java/org/sonar/db/dashboard/ActiveDashboardDao.java @@ -17,17 +17,17 @@ * 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.dashboard; +package org.sonar.db.dashboard; import java.util.List; import javax.annotation.Nullable; import org.apache.ibatis.session.SqlSession; import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.Dao; +import org.sonar.db.MyBatis; @ServerSide -public class ActiveDashboardDao implements DaoComponent { +public class ActiveDashboardDao implements Dao { private MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardDto.java b/sonar-db/src/main/java/org/sonar/db/dashboard/ActiveDashboardDto.java index c0ac5dd6f63..7bdb6fcaa58 100644 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardDto.java +++ b/sonar-db/src/main/java/org/sonar/db/dashboard/ActiveDashboardDto.java @@ -17,7 +17,7 @@ * 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.dashboard; +package org.sonar.db.dashboard; import com.google.common.base.Objects; diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardMapper.java b/sonar-db/src/main/java/org/sonar/db/dashboard/ActiveDashboardMapper.java index b7f951a9a94..83c1ef4e08b 100644 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/dashboard/ActiveDashboardMapper.java @@ -17,15 +17,12 @@ * 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.dashboard; - - -import org.apache.ibatis.annotations.Param; +package org.sonar.db.dashboard; +import java.util.List; import javax.annotation.CheckForNull; import javax.annotation.Nullable; - -import java.util.List; +import org.apache.ibatis.annotations.Param; public interface ActiveDashboardMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/DashboardDao.java b/sonar-db/src/main/java/org/sonar/db/dashboard/DashboardDao.java index ef03d149021..40b151e7ec9 100644 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/DashboardDao.java +++ b/sonar-db/src/main/java/org/sonar/db/dashboard/DashboardDao.java @@ -17,17 +17,13 @@ * 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.dashboard; +package org.sonar.db.dashboard; import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.Dao; +import org.sonar.db.MyBatis; -@BatchSide -@ServerSide -public class DashboardDao implements DaoComponent { +public class DashboardDao implements Dao { private MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/DashboardDto.java b/sonar-db/src/main/java/org/sonar/db/dashboard/DashboardDto.java index d0f05ba3f52..4b56a8937b6 100644 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/DashboardDto.java +++ b/sonar-db/src/main/java/org/sonar/db/dashboard/DashboardDto.java @@ -17,13 +17,12 @@ * 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.dashboard; +package org.sonar.db.dashboard; import com.google.common.collect.Lists; -import org.sonar.core.persistence.Dto; - import java.util.Collection; import java.util.List; +import org.sonar.db.Dto; public final class DashboardDto extends Dto<Long> { diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/DashboardMapper.java b/sonar-db/src/main/java/org/sonar/db/dashboard/DashboardMapper.java index 52e69a16816..a6222c6fcb8 100644 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/DashboardMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/dashboard/DashboardMapper.java @@ -17,15 +17,14 @@ * 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.dashboard; +package org.sonar.db.dashboard; +import javax.annotation.CheckForNull; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Options; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import javax.annotation.CheckForNull; - public interface DashboardMapper { String COLUMNS = "id, user_id as \"userId\", name, description, column_layout as \"columnLayout\", " + diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetDto.java b/sonar-db/src/main/java/org/sonar/db/dashboard/WidgetDto.java index d3f6445ed1d..02e0a428163 100644 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetDto.java +++ b/sonar-db/src/main/java/org/sonar/db/dashboard/WidgetDto.java @@ -17,10 +17,9 @@ * 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.dashboard; +package org.sonar.db.dashboard; import com.google.common.collect.Lists; - import java.util.Collection; import java.util.Date; import java.util.List; diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetMapper.java b/sonar-db/src/main/java/org/sonar/db/dashboard/WidgetMapper.java index c5d76c55cc2..c82e1b4c924 100644 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/dashboard/WidgetMapper.java @@ -17,14 +17,13 @@ * 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.dashboard; +package org.sonar.db.dashboard; +import java.util.Collection; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Options; import org.apache.ibatis.annotations.Update; -import java.util.Collection; - public interface WidgetMapper { @Insert("insert into widgets (dashboard_id, widget_key, name, description, column_index, " + diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetPropertyDto.java b/sonar-db/src/main/java/org/sonar/db/dashboard/WidgetPropertyDto.java index 501e179b620..0cbf5caa77c 100644 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetPropertyDto.java +++ b/sonar-db/src/main/java/org/sonar/db/dashboard/WidgetPropertyDto.java @@ -17,11 +17,10 @@ * 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.dashboard; +package org.sonar.db.dashboard; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; - import java.util.Collection; public class WidgetPropertyDto { diff --git a/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetPropertyMapper.java b/sonar-db/src/main/java/org/sonar/db/dashboard/WidgetPropertyMapper.java index 43a473f1ff6..46432fba6b8 100644 --- a/sonar-core/src/main/java/org/sonar/core/dashboard/WidgetPropertyMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/dashboard/WidgetPropertyMapper.java @@ -17,17 +17,15 @@ * 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.dashboard; +package org.sonar.db.dashboard; +import java.util.Collection; +import java.util.List; +import javax.annotation.CheckForNull; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Options; import org.apache.ibatis.annotations.Select; -import javax.annotation.CheckForNull; - -import java.util.Collection; -import java.util.List; - public interface WidgetPropertyMapper { String COLUMNS = "wp.id, wp.widget_id as \"widgetId\", wp.kee as \"propertyKey\", wp.text_value as \"textValue\""; diff --git a/sonar-db/src/main/java/org/sonar/db/dashboard/package-info.java b/sonar-db/src/main/java/org/sonar/db/dashboard/package-info.java new file mode 100644 index 00000000000..389a1fac572 --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/dashboard/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.dashboard; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDao.java b/sonar-db/src/main/java/org/sonar/db/debt/CharacteristicDao.java index a23a4efdcf2..789c94a1f12 100644 --- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDao.java +++ b/sonar-db/src/main/java/org/sonar/db/debt/CharacteristicDao.java @@ -18,24 +18,20 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.technicaldebt.db; +package org.sonar.db.debt; import com.google.common.collect.Lists; import java.util.Collection; import java.util.List; import javax.annotation.CheckForNull; import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import static com.google.common.collect.Lists.newArrayList; -@BatchSide -@ServerSide -public class CharacteristicDao implements DaoComponent { +public class CharacteristicDao implements Dao { private final MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java b/sonar-db/src/main/java/org/sonar/db/debt/CharacteristicDto.java index 88889d8af79..3cbaff45e81 100644 --- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicDto.java +++ b/sonar-db/src/main/java/org/sonar/db/debt/CharacteristicDto.java @@ -18,15 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.technicaldebt.db; - -import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; +package org.sonar.db.debt; import java.io.Serializable; import java.util.Date; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; +import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; public class CharacteristicDto implements Serializable { diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicMapper.java b/sonar-db/src/main/java/org/sonar/db/debt/CharacteristicMapper.java index ea734f081f8..20feb8641ab 100644 --- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/CharacteristicMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/debt/CharacteristicMapper.java @@ -18,11 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.technicaldebt.db; - -import org.apache.ibatis.annotations.Param; +package org.sonar.db.debt; import java.util.List; +import org.apache.ibatis.annotations.Param; public interface CharacteristicMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/RequirementMigrationDto.java b/sonar-db/src/main/java/org/sonar/db/debt/RequirementMigrationDto.java index ac4cb026c0d..f2dfe90d85d 100644 --- a/sonar-core/src/main/java/org/sonar/core/technicaldebt/db/RequirementMigrationDto.java +++ b/sonar-db/src/main/java/org/sonar/db/debt/RequirementMigrationDto.java @@ -18,13 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.technicaldebt.db; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; +package org.sonar.db.debt; import java.io.Serializable; import java.util.Date; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; /** * Only used in {@link org.sonar.server.startup.CopyRequirementsFromCharacteristicsToRules} diff --git a/sonar-core/src/main/java/org/sonar/core/purge/package-info.java b/sonar-db/src/main/java/org/sonar/db/debt/package-info.java index 11e94c26164..b1e34d83234 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/package-info.java +++ b/sonar-db/src/main/java/org/sonar/db/debt/package-info.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.core.purge; +package org.sonar.db.debt; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/cluster/ClusterAction.java b/sonar-db/src/main/java/org/sonar/db/deprecated/ClusterAction.java index bac9518865f..d6bfb3b30ab 100644 --- a/sonar-core/src/main/java/org/sonar/core/cluster/ClusterAction.java +++ b/sonar-db/src/main/java/org/sonar/db/deprecated/ClusterAction.java @@ -17,7 +17,7 @@ * 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.cluster; +package org.sonar.db.deprecated; import java.util.concurrent.Callable; diff --git a/sonar-core/src/main/java/org/sonar/core/cluster/NullQueue.java b/sonar-db/src/main/java/org/sonar/db/deprecated/NullQueue.java index cccdf7033bc..db002f476c0 100644 --- a/sonar-core/src/main/java/org/sonar/core/cluster/NullQueue.java +++ b/sonar-db/src/main/java/org/sonar/db/deprecated/NullQueue.java @@ -17,7 +17,7 @@ * 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.cluster; +package org.sonar.db.deprecated; import java.util.List; diff --git a/sonar-core/src/main/java/org/sonar/core/cluster/WorkQueue.java b/sonar-db/src/main/java/org/sonar/db/deprecated/WorkQueue.java index 9d5cf998564..3b4e2077771 100644 --- a/sonar-core/src/main/java/org/sonar/core/cluster/WorkQueue.java +++ b/sonar-db/src/main/java/org/sonar/db/deprecated/WorkQueue.java @@ -17,7 +17,7 @@ * 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.cluster; +package org.sonar.db.deprecated; import java.util.List; import java.util.concurrent.Callable; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/AbstractDialect.java b/sonar-db/src/main/java/org/sonar/db/dialect/AbstractDialect.java index f8225b142be..236c90acd1b 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/AbstractDialect.java +++ b/sonar-db/src/main/java/org/sonar/db/dialect/AbstractDialect.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import java.util.Collections; import java.util.List; @@ -34,7 +34,7 @@ abstract class AbstractDialect implements Dialect { private final String validationQuery; protected AbstractDialect(String id, String activeRecordDialectCode, String defaultDriverClassName, String trueSqlValue, String falseSqlValue, - String validationQuery) { + String validationQuery) { this.id = id; this.activeRecordDialectCode = activeRecordDialectCode; this.defaultDriverClassName = defaultDriverClassName; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/Dialect.java b/sonar-db/src/main/java/org/sonar/db/dialect/Dialect.java index 7ab00f27ce8..3d0a0f6e730 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/Dialect.java +++ b/sonar-db/src/main/java/org/sonar/db/dialect/Dialect.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import java.util.List; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/DialectUtils.java b/sonar-db/src/main/java/org/sonar/db/dialect/DialectUtils.java index dbcd4e91b19..d000cc78151 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/DialectUtils.java +++ b/sonar-db/src/main/java/org/sonar/db/dialect/DialectUtils.java @@ -17,17 +17,15 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import com.google.common.base.Predicate; import com.google.common.collect.Iterators; -import org.apache.commons.lang.StringUtils; -import org.sonar.api.utils.MessageException; - +import java.util.NoSuchElementException; import javax.annotation.CheckForNull; import javax.annotation.Nullable; - -import java.util.NoSuchElementException; +import org.apache.commons.lang.StringUtils; +import org.sonar.api.utils.MessageException; public final class DialectUtils { diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/H2.java b/sonar-db/src/main/java/org/sonar/db/dialect/H2.java index ef2812c4e87..aa9bd6fb881 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/H2.java +++ b/sonar-db/src/main/java/org/sonar/db/dialect/H2.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import org.apache.commons.lang.StringUtils; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/MsSql.java b/sonar-db/src/main/java/org/sonar/db/dialect/MsSql.java index dbf98f2c319..d55139113c2 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/MsSql.java +++ b/sonar-db/src/main/java/org/sonar/db/dialect/MsSql.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import org.apache.commons.lang.StringUtils; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/MySql.java b/sonar-db/src/main/java/org/sonar/db/dialect/MySql.java index 01518fe1e86..66019cb785f 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/MySql.java +++ b/sonar-db/src/main/java/org/sonar/db/dialect/MySql.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import org.apache.commons.lang.StringUtils; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/Oracle.java b/sonar-db/src/main/java/org/sonar/db/dialect/Oracle.java index 03aac3c2c8e..dd5fccadf4b 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/Oracle.java +++ b/sonar-db/src/main/java/org/sonar/db/dialect/Oracle.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import org.apache.commons.lang.StringUtils; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/PostgreSql.java b/sonar-db/src/main/java/org/sonar/db/dialect/PostgreSql.java index bf6d01d4871..d3aaadb92cb 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/PostgreSql.java +++ b/sonar-db/src/main/java/org/sonar/db/dialect/PostgreSql.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import com.google.common.collect.ImmutableList; import java.util.List; diff --git a/sonar-db/src/main/java/org/sonar/db/dialect/package-info.java b/sonar-db/src/main/java/org/sonar/db/dialect/package-info.java new file mode 100644 index 00000000000..a28f4911544 --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/dialect/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.dialect; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/duplication/DuplicationDao.java b/sonar-db/src/main/java/org/sonar/db/duplication/DuplicationDao.java index 7721b8d95f4..25690f35569 100644 --- a/sonar-core/src/main/java/org/sonar/core/duplication/DuplicationDao.java +++ b/sonar-db/src/main/java/org/sonar/db/duplication/DuplicationDao.java @@ -17,19 +17,14 @@ * 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.duplication; - -import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +package org.sonar.db.duplication; import java.util.Collection; import java.util.List; +import org.apache.ibatis.session.SqlSession; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; -@BatchSide -@ServerSide public class DuplicationDao { private final MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/duplication/DuplicationMapper.java b/sonar-db/src/main/java/org/sonar/db/duplication/DuplicationMapper.java index 48b9aab84e5..fe366d9ffc0 100644 --- a/sonar-core/src/main/java/org/sonar/core/duplication/DuplicationMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/duplication/DuplicationMapper.java @@ -17,20 +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.duplication; - -import org.apache.ibatis.annotations.Param; +package org.sonar.db.duplication; import java.util.List; +import org.apache.ibatis.annotations.Param; public interface DuplicationMapper { List<DuplicationUnitDto> selectCandidates( - @Param("resource_snapshot_id") int resourceSnapshotId, - @Param("last_project_snapshot_id") Integer lastSnapshotId, - @Param("language") String language); + @Param("resource_snapshot_id") int resourceSnapshotId, + @Param("last_project_snapshot_id") Integer lastSnapshotId, + @Param("language") String language); void batchInsert(DuplicationUnitDto unit); } - diff --git a/sonar-core/src/main/java/org/sonar/core/duplication/DuplicationUnitDto.java b/sonar-db/src/main/java/org/sonar/db/duplication/DuplicationUnitDto.java index c2948f03cd1..443782a63bd 100644 --- a/sonar-core/src/main/java/org/sonar/core/duplication/DuplicationUnitDto.java +++ b/sonar-db/src/main/java/org/sonar/db/duplication/DuplicationUnitDto.java @@ -17,8 +17,7 @@ * 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.duplication; - +package org.sonar.db.duplication; /** * A simple DTO (Data Transfer Object) class that provides the mapping of data to a table. diff --git a/sonar-db/src/main/java/org/sonar/db/duplication/package-info.java b/sonar-db/src/main/java/org/sonar/db/duplication/package-info.java new file mode 100644 index 00000000000..54a5e199058 --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/duplication/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.duplication; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/event/EventDto.java b/sonar-db/src/main/java/org/sonar/db/event/EventDto.java index f505c3a569b..884723ab408 100644 --- a/sonar-core/src/main/java/org/sonar/core/event/EventDto.java +++ b/sonar-db/src/main/java/org/sonar/db/event/EventDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.event; +package org.sonar.db.event; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/event/db/EventMapper.java b/sonar-db/src/main/java/org/sonar/db/event/EventMapper.java index 831b5dd3160..57dee6a9e68 100644 --- a/sonar-core/src/main/java/org/sonar/core/event/db/EventMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/event/EventMapper.java @@ -18,14 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.event.db; - -import org.apache.ibatis.annotations.Param; -import org.sonar.core.event.EventDto; - -import javax.annotation.CheckForNull; +package org.sonar.db.event; import java.util.List; +import javax.annotation.CheckForNull; +import org.apache.ibatis.annotations.Param; public interface EventMapper { diff --git a/sonar-db/src/main/java/org/sonar/db/event/package-info.java b/sonar-db/src/main/java/org/sonar/db/event/package-info.java new file mode 100644 index 00000000000..1e1d8997b92 --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/event/package-info.java @@ -0,0 +1,25 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +@ParametersAreNonnullByDefault +package org.sonar.db.event; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanDao.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDao.java index cc75c1e1a93..bb63a3c9b90 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanDao.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDao.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.db.issue; import com.google.common.collect.Lists; import java.util.Collection; @@ -26,13 +26,13 @@ import java.util.Collections; import java.util.List; import org.apache.ibatis.session.SqlSession; import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.Dao; +import org.sonar.db.MyBatis; import static com.google.common.collect.Lists.newArrayList; @ServerSide -public class ActionPlanDao implements DaoComponent { +public class ActionPlanDao implements Dao { private final MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanDto.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDto.java index e9179d67151..f9cce188c07 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanDto.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDto.java @@ -18,18 +18,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.db.issue; +import java.util.Date; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.sonar.api.issue.ActionPlan; import org.sonar.core.issue.DefaultActionPlan; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - -import java.util.Date; - /** * @since 3.6 */ @@ -191,13 +189,13 @@ public class ActionPlanDto { public static ActionPlanDto toActionDto(ActionPlan actionPlan, Long projectId) { return new ActionPlanDto().setKey(actionPlan.key()) - .setName(actionPlan.name()) - .setProjectId(projectId) - .setDescription(actionPlan.description()) - .setStatus(actionPlan.status()) - .setDeadLine(actionPlan.deadLine()) - .setUserLogin(actionPlan.userLogin()) - .setCreatedAt(actionPlan.createdAt()) - .setUpdatedAt(actionPlan.updatedAt()); + .setName(actionPlan.name()) + .setProjectId(projectId) + .setDescription(actionPlan.description()) + .setStatus(actionPlan.status()) + .setDeadLine(actionPlan.deadLine()) + .setUserLogin(actionPlan.userLogin()) + .setCreatedAt(actionPlan.createdAt()) + .setUpdatedAt(actionPlan.updatedAt()); } } diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanMapper.java index 62ceedb2e67..b8df2a11a58 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanMapper.java @@ -18,11 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; - -import org.apache.ibatis.annotations.Param; +package org.sonar.db.issue; import java.util.List; +import org.apache.ibatis.annotations.Param; /** * @since 3.6 diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDao.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDao.java index 189f3272242..dfd4192922b 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDao.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDao.java @@ -18,20 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; - -import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.MyBatis; +package org.sonar.db.issue; import java.util.List; +import org.apache.ibatis.session.SqlSession; +import org.sonar.db.MyBatis; -/** - * @since 3.6 - */ -@BatchSide -@ServerSide public class ActionPlanStatsDao { private final MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDto.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDto.java index 8f7e5dd38e6..d1aa6bc3797 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsDto.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDto.java @@ -18,14 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.db.issue; +import java.util.Date; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.sonar.core.issue.ActionPlanStats; -import java.util.Date; - /** * @since 3.6 */ @@ -173,16 +172,16 @@ public class ActionPlanStatsDto { public ActionPlanStats toActionPlanStat() { return ((ActionPlanStats) ActionPlanStats.create(name) - .setKey(kee) - .setProjectKey(projectKey) - .setDescription(description) - .setStatus(status) - .setDeadLine(deadLine) - .setUserLogin(userLogin) - .setCreatedAt(createdAt) - .setUpdatedAt(updatedAt)) - .setTotalIssues(totalIssues) - .setUnresolvedIssues(unresolvedIssues); + .setKey(kee) + .setProjectKey(projectKey) + .setDescription(description) + .setStatus(status) + .setDeadLine(deadLine) + .setUserLogin(userLogin) + .setCreatedAt(createdAt) + .setUpdatedAt(updatedAt)) + .setTotalIssues(totalIssues) + .setUnresolvedIssues(unresolvedIssues); } } diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsMapper.java index 69ae2773ea3..26c3395a0f7 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/ActionPlanStatsMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsMapper.java @@ -18,11 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; - -import org.apache.ibatis.annotations.Param; +package org.sonar.db.issue; import java.util.List; +import org.apache.ibatis.annotations.Param; /** * @since 3.6 diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueChangeDao.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java index 23018566dc4..076681365eb 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueChangeDao.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.db.issue; import com.google.common.collect.Lists; import java.util.Collection; @@ -28,15 +28,15 @@ import javax.annotation.CheckForNull; import org.sonar.api.server.ServerSide; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.FieldDiffs; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import static com.google.common.collect.Lists.newArrayList; import static java.util.Arrays.asList; @ServerSide -public class IssueChangeDao implements DaoComponent { +public class IssueChangeDao implements Dao { private final MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueChangeDto.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDto.java index 0d79cd47ca4..14bce70b26b 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueChangeDto.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDto.java @@ -17,19 +17,17 @@ * 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.db.issue; +import java.io.Serializable; +import java.util.Date; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; +import org.sonar.api.utils.System2; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.FieldDiffs; -import org.sonar.api.utils.System2; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - -import java.io.Serializable; -import java.util.Date; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueChangeMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeMapper.java index 61d6b8e01ab..1f0efcd0c31 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueChangeMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeMapper.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.db.issue; import java.util.List; import javax.annotation.CheckForNull; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDao.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueDao.java index c4e2e516cf2..edc89f9c267 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDao.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueDao.java @@ -18,20 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.db.issue; import org.apache.ibatis.session.ResultHandler; import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; -/** - * @since 3.6 - */ -@BatchSide -@ServerSide public class IssueDao { private final MyBatis mybatis; @@ -43,7 +36,7 @@ public class IssueDao { public void selectNonClosedIssuesByModule(long componentId, ResultHandler handler) { SqlSession session = mybatis.openSession(false); try { - session.select("org.sonar.core.issue.db.IssueMapper.selectNonClosedIssuesByModule", componentId, handler); + session.select("org.sonar.db.issue.IssueMapper.selectNonClosedIssuesByModule", componentId, handler); } finally { MyBatis.closeQuietly(session); diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java index ec3b3b60cea..f5eff6e3095 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java @@ -17,31 +17,29 @@ * 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.db.issue; import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; +import java.io.Serializable; +import java.util.Collection; +import java.util.Date; import java.util.Set; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.sonar.core.issue.DefaultIssue; import org.sonar.api.resources.Project; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.Duration; import org.sonar.api.utils.KeyValueFormat; import org.sonar.api.utils.internal.Uuids; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.rule.RuleDto; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - -import java.io.Serializable; -import java.util.Collection; -import java.util.Date; +import org.sonar.core.issue.DefaultIssue; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.rule.RuleDto; import static org.sonar.api.utils.DateUtils.dateToLong; import static org.sonar.api.utils.DateUtils.longToDate; @@ -481,7 +479,7 @@ public final class IssueDto implements Serializable { /** * Should only be used to persist in E/S * <p/> - * Please use {@link #setRule(org.sonar.core.rule.RuleDto)} instead + * Please use {@link #setRule(RuleDto)} instead */ public IssueDto setLanguage(String language) { this.language = language; @@ -495,7 +493,7 @@ public final class IssueDto implements Serializable { /** * Should only be used to persist in E/S * <p/> - * Please use {@link #setComponent(org.sonar.core.component.ComponentDto)} instead + * Please use {@link #setComponent(ComponentDto)} instead */ public IssueDto setComponentKey(String componentKey) { this.componentKey = componentKey; @@ -513,7 +511,7 @@ public final class IssueDto implements Serializable { /** * Should only be used to persist in E/S * <p/> - * Please use {@link #setComponent(org.sonar.core.component.ComponentDto)} instead + * Please use {@link #setComponent(ComponentDto)} instead */ public IssueDto setComponentUuid(@Nullable String componentUuid) { this.componentUuid = componentUuid; @@ -528,7 +526,7 @@ public final class IssueDto implements Serializable { /** * Should only be used to persist in E/S * <p/> - * Please use {@link #setComponent(org.sonar.core.component.ComponentDto)} instead + * Please use {@link #setComponent(ComponentDto)} instead */ public IssueDto setModuleUuid(@Nullable String moduleUuid) { this.moduleUuid = moduleUuid; @@ -543,7 +541,7 @@ public final class IssueDto implements Serializable { /** * Should only be used to persist in E/S * <p/> - * Please use {@link #setComponent(org.sonar.core.component.ComponentDto)} instead + * Please use {@link #setComponent(ComponentDto)} instead */ public IssueDto setModuleUuidPath(@Nullable String moduleUuidPath) { this.moduleUuidPath = moduleUuidPath; @@ -560,7 +558,7 @@ public final class IssueDto implements Serializable { /** * Should only be used to persist in E/S * <p/> - * Please use {@link #setProject(org.sonar.core.component.ComponentDto)} instead + * Please use {@link #setProject(ComponentDto)} instead */ public IssueDto setProjectKey(String projectKey) { this.projectKey = projectKey; @@ -578,7 +576,7 @@ public final class IssueDto implements Serializable { /** * Should only be used to persist in E/S * <p/> - * Please use {@link #setProject(org.sonar.core.component.ComponentDto)} instead + * Please use {@link #setProject(ComponentDto)} instead */ public IssueDto setProjectUuid(@Nullable String projectUuid) { this.projectUuid = projectUuid; @@ -598,7 +596,7 @@ public final class IssueDto implements Serializable { /** * Should only be used to persist in E/S * <p/> - * Please use {@link #setRule(org.sonar.core.rule.RuleDto)} instead + * Please use {@link #setRule(RuleDto)} instead */ public IssueDto setRuleKey(String repo, String rule) { this.ruleRepo = repo; @@ -609,7 +607,7 @@ public final class IssueDto implements Serializable { /** * Should only be used to persist in E/S * <p/> - * Please use {@link #setProject(org.sonar.core.component.ComponentDto)} instead + * Please use {@link #setProject(ComponentDto)} instead */ public String getFilePath() { return filePath; @@ -618,7 +616,7 @@ public final class IssueDto implements Serializable { /** * Should only be used to persist in E/S * <p/> - * Please use {@link #setProject(org.sonar.core.component.ComponentDto)} instead + * Please use {@link #setProject(ComponentDto)} instead */ public IssueDto setFilePath(String filePath) { this.filePath = filePath; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterDao.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDao.java index a5791827d15..6d187866547 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterDao.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDao.java @@ -18,24 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; - -import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.MyBatis; - -import javax.annotation.CheckForNull; +package org.sonar.db.issue; import java.util.List; +import javax.annotation.CheckForNull; +import org.apache.ibatis.session.SqlSession; +import org.sonar.db.Dao; +import org.sonar.db.MyBatis; -/** - * @since 3.7 - */ -@BatchSide -@ServerSide -public class IssueFilterDao implements DaoComponent { +public class IssueFilterDao implements Dao { private final MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterDto.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDto.java index bbc14f41bd8..d3552aae316 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterDto.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDto.java @@ -17,11 +17,10 @@ * 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; - -import javax.annotation.Nullable; +package org.sonar.db.issue; import java.util.Date; +import javax.annotation.Nullable; /** * @since 3.7 diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterFavouriteDao.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDao.java index e3a71c76ba3..f9de1a19963 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterFavouriteDao.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDao.java @@ -18,20 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; - -import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.MyBatis; +package org.sonar.db.issue; import java.util.List; +import org.apache.ibatis.session.SqlSession; +import org.sonar.db.MyBatis; -/** - * @since 3.7 - */ -@BatchSide -@ServerSide public class IssueFilterFavouriteDao { private final MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterFavouriteDto.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDto.java index 6f0cb8c2bae..d86bd266bf4 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterFavouriteDto.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDto.java @@ -17,7 +17,7 @@ * 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.db.issue; import java.util.Date; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterFavouriteMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteMapper.java index 33c93150a1b..62bd124174b 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterFavouriteMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteMapper.java @@ -17,13 +17,11 @@ * 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; - -import org.apache.ibatis.annotations.Param; - -import javax.annotation.CheckForNull; +package org.sonar.db.issue; import java.util.List; +import javax.annotation.CheckForNull; +import org.apache.ibatis.annotations.Param; /** * @since 3.7 diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterMapper.java index b5e8eb93fac..50c7cc8912d 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueFilterMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterMapper.java @@ -17,11 +17,10 @@ * 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; - -import javax.annotation.CheckForNull; +package org.sonar.db.issue; import java.util.List; +import javax.annotation.CheckForNull; /** * @since 3.7 diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueMapper.java index a3a8f61c490..eda8b2ef7ba 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueMapper.java @@ -17,7 +17,7 @@ * 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.db.issue; import java.util.List; import java.util.Set; diff --git a/sonar-db/src/main/java/org/sonar/db/issue/package-info.java b/sonar-db/src/main/java/org/sonar/db/issue/package-info.java new file mode 100644 index 00000000000..472eca27cae --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/issue/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.issue; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/template/LoadedTemplateDao.java b/sonar-db/src/main/java/org/sonar/db/loadedtemplate/LoadedTemplateDao.java index 64b3a6fdddd..ccdb5c45101 100644 --- a/sonar-core/src/main/java/org/sonar/core/template/LoadedTemplateDao.java +++ b/sonar-db/src/main/java/org/sonar/db/loadedtemplate/LoadedTemplateDao.java @@ -17,18 +17,14 @@ * 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.template; +package org.sonar.db.loadedtemplate; import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; -@BatchSide -@ServerSide -public class LoadedTemplateDao implements DaoComponent { +public class LoadedTemplateDao implements Dao { private MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/template/LoadedTemplateDto.java b/sonar-db/src/main/java/org/sonar/db/loadedtemplate/LoadedTemplateDto.java index 1f935f1c924..36300281c96 100644 --- a/sonar-core/src/main/java/org/sonar/core/template/LoadedTemplateDto.java +++ b/sonar-db/src/main/java/org/sonar/db/loadedtemplate/LoadedTemplateDto.java @@ -17,7 +17,7 @@ * 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.template; +package org.sonar.db.loadedtemplate; import com.google.common.base.Objects; diff --git a/sonar-core/src/main/java/org/sonar/core/template/LoadedTemplateMapper.java b/sonar-db/src/main/java/org/sonar/db/loadedtemplate/LoadedTemplateMapper.java index a2446a2b32e..af8ace065bd 100644 --- a/sonar-core/src/main/java/org/sonar/core/template/LoadedTemplateMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/loadedtemplate/LoadedTemplateMapper.java @@ -17,7 +17,7 @@ * 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.template; +package org.sonar.db.loadedtemplate; import org.apache.ibatis.annotations.Param; diff --git a/sonar-db/src/main/java/org/sonar/db/loadedtemplate/package-info.java b/sonar-db/src/main/java/org/sonar/db/loadedtemplate/package-info.java new file mode 100644 index 00000000000..2dff941c724 --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/loadedtemplate/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.loadedtemplate; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/measure/custom/db/CustomMeasureDto.java b/sonar-db/src/main/java/org/sonar/db/measure/CustomMeasureDto.java index 615e9839161..e7387d34cb9 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/custom/db/CustomMeasureDto.java +++ b/sonar-db/src/main/java/org/sonar/db/measure/CustomMeasureDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure.custom.db; +package org.sonar.db.measure; public class CustomMeasureDto { private long id; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/custom/db/CustomMeasureMapper.java b/sonar-db/src/main/java/org/sonar/db/measure/CustomMeasureMapper.java index 58bbb04b966..e5f46294633 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/custom/db/CustomMeasureMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/measure/CustomMeasureMapper.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure.custom.db; +package org.sonar.db.measure; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureDto.java b/sonar-db/src/main/java/org/sonar/db/measure/MeasureDto.java index 1e288b3cea3..0ba16182f0e 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureDto.java +++ b/sonar-db/src/main/java/org/sonar/db/measure/MeasureDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure.db; +package org.sonar.db.measure; import com.google.common.base.Objects; import java.nio.charset.StandardCharsets; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureFilterDao.java b/sonar-db/src/main/java/org/sonar/db/measure/MeasureFilterDao.java index ed62ef46af6..50d0bad2f53 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureFilterDao.java +++ b/sonar-db/src/main/java/org/sonar/db/measure/MeasureFilterDao.java @@ -17,18 +17,11 @@ * 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.measure.db; +package org.sonar.db.measure; import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.MyBatis; -/** - * @since 3.4 - */ -@BatchSide -@ServerSide public class MeasureFilterDao { private MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureFilterDto.java b/sonar-db/src/main/java/org/sonar/db/measure/MeasureFilterDto.java index 6ad4168a990..f693d815790 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureFilterDto.java +++ b/sonar-db/src/main/java/org/sonar/db/measure/MeasureFilterDto.java @@ -17,11 +17,10 @@ * 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.measure.db; - -import javax.annotation.Nullable; +package org.sonar.db.measure; import java.util.Date; +import javax.annotation.Nullable; /** * @since 3.4 diff --git a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureFilterMapper.java b/sonar-db/src/main/java/org/sonar/db/measure/MeasureFilterMapper.java index 94f31ee141f..ed0c51d3dc2 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureFilterMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/measure/MeasureFilterMapper.java @@ -17,7 +17,7 @@ * 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.measure.db; +package org.sonar.db.measure; /** * @since 3.4 diff --git a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureMapper.java b/sonar-db/src/main/java/org/sonar/db/measure/MeasureMapper.java index 2bbded72760..8abcea4d7cf 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/measure/MeasureMapper.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure.db; +package org.sonar.db.measure; import java.util.List; import javax.annotation.CheckForNull; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/db/PastMeasureDto.java b/sonar-db/src/main/java/org/sonar/db/measure/PastMeasureDto.java index ac06c4946e0..f82099b6e03 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/db/PastMeasureDto.java +++ b/sonar-db/src/main/java/org/sonar/db/measure/PastMeasureDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure.db; +package org.sonar.db.measure; import java.util.Objects; import javax.annotation.CheckForNull; diff --git a/sonar-db/src/main/java/org/sonar/db/measure/package-info.java b/sonar-db/src/main/java/org/sonar/db/measure/package-info.java new file mode 100644 index 00000000000..4485a31899b --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/measure/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.measure; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/metric/db/MetricDto.java b/sonar-db/src/main/java/org/sonar/db/metric/MetricDto.java index 1ed03515e3d..9822dabaa84 100644 --- a/sonar-core/src/main/java/org/sonar/core/metric/db/MetricDto.java +++ b/sonar-db/src/main/java/org/sonar/db/metric/MetricDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.metric.db; +package org.sonar.db.metric; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/metric/db/MetricMapper.java b/sonar-db/src/main/java/org/sonar/db/metric/MetricMapper.java index aea1761b828..68ff2ccf0b4 100644 --- a/sonar-core/src/main/java/org/sonar/core/metric/db/MetricMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/metric/MetricMapper.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.metric.db; +package org.sonar.db.metric; import java.util.List; import java.util.Map; diff --git a/sonar-db/src/main/java/org/sonar/db/metric/package-info.java b/sonar-db/src/main/java/org/sonar/db/metric/package-info.java new file mode 100644 index 00000000000..b0c6b63660b --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/metric/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.metric; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/notification/db/NotificationQueueDao.java b/sonar-db/src/main/java/org/sonar/db/notification/NotificationQueueDao.java index 2126b1f8dec..b82ba01dd09 100644 --- a/sonar-core/src/main/java/org/sonar/core/notification/db/NotificationQueueDao.java +++ b/sonar-db/src/main/java/org/sonar/db/notification/NotificationQueueDao.java @@ -18,22 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.notification.db; - -import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +package org.sonar.db.notification; import java.util.Collections; import java.util.List; +import org.apache.ibatis.session.SqlSession; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; -/** - * @since 3.7.1 - */ -@BatchSide -@ServerSide public class NotificationQueueDao { private final MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/notification/db/NotificationQueueDto.java b/sonar-db/src/main/java/org/sonar/db/notification/NotificationQueueDto.java index 6a4665899d0..44a5602bb64 100644 --- a/sonar-core/src/main/java/org/sonar/core/notification/db/NotificationQueueDto.java +++ b/sonar-db/src/main/java/org/sonar/db/notification/NotificationQueueDto.java @@ -18,19 +18,18 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.notification.db; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; -import org.sonar.api.notifications.Notification; -import org.sonar.api.utils.SonarException; +package org.sonar.db.notification; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; +import org.sonar.api.notifications.Notification; +import org.sonar.api.utils.SonarException; /** * @since 3.7.1 diff --git a/sonar-core/src/main/java/org/sonar/core/notification/db/NotificationQueueMapper.java b/sonar-db/src/main/java/org/sonar/db/notification/NotificationQueueMapper.java index fedab33c8d5..dead94fc4ea 100644 --- a/sonar-core/src/main/java/org/sonar/core/notification/db/NotificationQueueMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/notification/NotificationQueueMapper.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.notification.db; +package org.sonar.db.notification; import java.util.List; diff --git a/sonar-db/src/main/java/org/sonar/db/notification/package-info.java b/sonar-db/src/main/java/org/sonar/db/notification/package-info.java new file mode 100644 index 00000000000..a6d74836ec6 --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/notification/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.notification; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-db/src/main/java/org/sonar/db/package-info.java b/sonar-db/src/main/java/org/sonar/db/package-info.java new file mode 100644 index 00000000000..d2f73de8eb1 --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/permission/GroupWithPermissionDto.java b/sonar-db/src/main/java/org/sonar/db/permission/GroupWithPermissionDto.java index 78d42099897..2dbcd04203c 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/GroupWithPermissionDto.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/GroupWithPermissionDto.java @@ -18,10 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.sonar.core.permission.GroupWithPermission; public class GroupWithPermissionDto { diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionDao.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionDao.java index 0149f80265a..e6a1508e222 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/PermissionDao.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionDao.java @@ -18,19 +18,17 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import com.google.common.annotations.VisibleForTesting; +import java.util.List; +import java.util.Map; +import javax.annotation.Nullable; import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.SqlSession; -import org.sonar.api.server.ServerSide; import org.sonar.api.security.DefaultGroups; -import org.sonar.core.persistence.MyBatis; - -import javax.annotation.Nullable; - -import java.util.List; -import java.util.Map; +import org.sonar.api.server.ServerSide; +import org.sonar.db.MyBatis; import static com.google.common.collect.Maps.newHashMap; diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionFacade.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionFacade.java index b4a0c68c6cf..116e2e2634f 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/PermissionFacade.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionFacade.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import com.google.common.annotations.VisibleForTesting; import java.text.MessageFormat; @@ -27,18 +27,17 @@ import java.util.Iterator; import java.util.List; import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; -import org.sonar.api.batch.BatchSide; import org.sonar.api.config.Settings; import org.sonar.api.security.DefaultGroups; import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; -import org.sonar.core.user.GroupDto; -import org.sonar.core.user.GroupRoleDto; -import org.sonar.core.user.RoleDao; -import org.sonar.core.user.UserDao; -import org.sonar.core.user.UserRoleDto; +import org.sonar.db.DbSession; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; +import org.sonar.db.user.GroupDto; +import org.sonar.db.user.GroupRoleDto; +import org.sonar.db.user.RoleDao; +import org.sonar.db.user.UserDao; +import org.sonar.db.user.UserRoleDto; /** * This facade wraps db operations related to permissions @@ -47,7 +46,6 @@ import org.sonar.core.user.UserRoleDto; * * WARNING, this class is called by Views to apply default permission template on new views */ -@BatchSide @ServerSide public class PermissionFacade { diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionMapper.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionMapper.java index 59a2c8538f0..08c7b3e07c0 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/PermissionMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionMapper.java @@ -18,12 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; - -import org.apache.ibatis.session.RowBounds; +package org.sonar.db.permission; import java.util.List; import java.util.Map; +import org.apache.ibatis.session.RowBounds; public interface PermissionMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionQuery.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionQuery.java index 3f651d3f528..6d1a04a66bb 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/PermissionQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionQuery.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; @@ -55,7 +55,6 @@ public class PermissionQuery { // index of selected page. Start with 1. private final int pageIndex; - private PermissionQuery(Builder builder) { this.permission = builder.permission; this.component = builder.component; diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateDao.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDao.java index b83ed509044..050f19c1cb4 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateDao.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDao.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import com.google.common.annotations.VisibleForTesting; import java.text.Normalizer; @@ -30,19 +30,15 @@ import javax.annotation.Nullable; import org.apache.commons.lang.time.DateFormatUtils; import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; import org.sonar.api.security.DefaultGroups; -import org.sonar.api.server.ServerSide; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import static com.google.common.collect.Maps.newHashMap; -@BatchSide -@ServerSide -public class PermissionTemplateDao implements DaoComponent { +public class PermissionTemplateDao implements Dao { public static final String QUERY_PARAMETER = "query"; public static final String TEMPLATE_ID_PARAMETER = "templateId"; diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateDto.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDto.java index f61a06013a1..68f7c1da41c 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateDto.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDto.java @@ -18,13 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; +package org.sonar.db.permission; import java.util.Date; import java.util.List; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; public class PermissionTemplateDto { diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateGroupDto.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateGroupDto.java index d37596eb621..dc1e11dd2c5 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateGroupDto.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateGroupDto.java @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; -import javax.annotation.Nullable; import java.util.Date; +import javax.annotation.Nullable; public class PermissionTemplateGroupDto { diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateMapper.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateMapper.java index 732ced344a9..1277462b14d 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateMapper.java @@ -18,12 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; - -import org.apache.ibatis.session.RowBounds; +package org.sonar.db.permission; import java.util.List; import java.util.Map; +import org.apache.ibatis.session.RowBounds; /** * @since 3.7 diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateUserDto.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateUserDto.java index cc3e88b39ad..a1f6aaacb2f 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/PermissionTemplateUserDto.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateUserDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import java.util.Date; diff --git a/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermissionDto.java b/sonar-db/src/main/java/org/sonar/db/permission/UserWithPermissionDto.java index 45b3fde55c7..66c7d176c96 100644 --- a/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermissionDto.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/UserWithPermissionDto.java @@ -18,10 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.sonar.core.permission.UserWithPermission; public class UserWithPermissionDto { diff --git a/sonar-core/src/main/java/org/sonar/core/event/db/package-info.java b/sonar-db/src/main/java/org/sonar/db/permission/package-info.java index 7651f0b3db9..bb23b9cf500 100644 --- a/sonar-core/src/main/java/org/sonar/core/event/db/package-info.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/package-info.java @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - @ParametersAreNonnullByDefault -package org.sonar.core.event.db; +package org.sonar.db.permission; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/InvocationUtils.java b/sonar-db/src/main/java/org/sonar/db/profiling/InvocationUtils.java index bb6c38816a7..a4c5ac1cdc0 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/InvocationUtils.java +++ b/sonar-db/src/main/java/org/sonar/db/profiling/InvocationUtils.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.persistence.profiling; +package org.sonar.db.profiling; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -33,8 +33,8 @@ class InvocationUtils { Object result = null; try { result = method.invoke(target, params); - } catch(InvocationTargetException invocationException) { - for (Class<?> exceptionClass: method.getExceptionTypes()) { + } catch (InvocationTargetException invocationException) { + for (Class<?> exceptionClass : method.getExceptionTypes()) { if (exceptionClass.isInstance(invocationException.getCause())) { throw invocationException.getCause(); } diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfiledDataSource.java b/sonar-db/src/main/java/org/sonar/db/profiling/ProfiledDataSource.java index 0a48c71c5b2..2b2136a1ef8 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfiledDataSource.java +++ b/sonar-db/src/main/java/org/sonar/db/profiling/ProfiledDataSource.java @@ -17,17 +17,16 @@ * 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.persistence.profiling; - -import org.apache.commons.dbcp.BasicDataSource; -import org.sonar.api.utils.log.Logger; -import org.sonar.api.utils.log.Loggers; +package org.sonar.db.profiling; import java.io.PrintWriter; import java.lang.reflect.Proxy; import java.sql.Connection; import java.sql.SQLException; import java.util.Collection; +import org.apache.commons.dbcp.BasicDataSource; +import org.sonar.api.utils.log.Logger; +import org.sonar.api.utils.log.Loggers; public class ProfiledDataSource extends BasicDataSource { @@ -311,14 +310,14 @@ public class ProfiledDataSource extends BasicDataSource { @Override public Connection getConnection() throws SQLException { - return (Connection) Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] { Connection.class }, - new ProfilingConnectionHandler(delegate.getConnection())); + return (Connection) Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {Connection.class}, + new ProfilingConnectionHandler(delegate.getConnection())); } @Override public Connection getConnection(String user, String pass) throws SQLException { - return (Connection) Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] { Connection.class }, - new ProfilingConnectionHandler(delegate.getConnection(user, pass))); + return (Connection) Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[] {Connection.class}, + new ProfilingConnectionHandler(delegate.getConnection(user, pass))); } @Override diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfilingConnectionHandler.java b/sonar-db/src/main/java/org/sonar/db/profiling/ProfilingConnectionHandler.java index aea31ff2587..4446a47e7ee 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfilingConnectionHandler.java +++ b/sonar-db/src/main/java/org/sonar/db/profiling/ProfilingConnectionHandler.java @@ -17,7 +17,7 @@ * 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.persistence.profiling; +package org.sonar.db.profiling; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; @@ -40,12 +40,12 @@ class ProfilingConnectionHandler implements InvocationHandler { if ("prepareStatement".equals(method.getName())) { PreparedStatement statement = (PreparedStatement) result; String sql = (String) args[0]; - return Proxy.newProxyInstance(ProfilingConnectionHandler.class.getClassLoader(), new Class[] { PreparedStatement.class }, + return Proxy.newProxyInstance(ProfilingConnectionHandler.class.getClassLoader(), new Class[] {PreparedStatement.class}, new ProfilingPreparedStatementHandler(statement, sql)); } else if ("createStatement".equals(method.getName())) { Statement statement = (Statement) result; - return Proxy.newProxyInstance(ProfilingConnectionHandler.class.getClassLoader(), new Class[] { Statement.class }, + return Proxy.newProxyInstance(ProfilingConnectionHandler.class.getClassLoader(), new Class[] {Statement.class}, new ProfilingStatementHandler(statement)); } else { diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfilingPreparedStatementHandler.java b/sonar-db/src/main/java/org/sonar/db/profiling/ProfilingPreparedStatementHandler.java index 2558a1950c5..9c451f13a30 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfilingPreparedStatementHandler.java +++ b/sonar-db/src/main/java/org/sonar/db/profiling/ProfilingPreparedStatementHandler.java @@ -17,16 +17,15 @@ * 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.persistence.profiling; +package org.sonar.db.profiling; import com.google.common.collect.Lists; -import org.apache.commons.lang.StringUtils; -import org.sonar.api.utils.log.Profiler; - import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.sql.PreparedStatement; import java.util.List; +import org.apache.commons.lang.StringUtils; +import org.sonar.api.utils.log.Profiler; class ProfilingPreparedStatementHandler implements InvocationHandler { diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfilingStatementHandler.java b/sonar-db/src/main/java/org/sonar/db/profiling/ProfilingStatementHandler.java index d2f2522c821..994f1a823c0 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfilingStatementHandler.java +++ b/sonar-db/src/main/java/org/sonar/db/profiling/ProfilingStatementHandler.java @@ -17,14 +17,13 @@ * 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.persistence.profiling; - -import org.apache.commons.lang.StringUtils; -import org.sonar.api.utils.log.Profiler; +package org.sonar.db.profiling; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.sql.Statement; +import org.apache.commons.lang.StringUtils; +import org.sonar.api.utils.log.Profiler; class ProfilingStatementHandler implements InvocationHandler { @@ -42,7 +41,7 @@ class ProfilingStatementHandler implements InvocationHandler { try { result = InvocationUtils.invokeQuietly(statement, method, args); } finally { - profiler.addContext("sql", StringUtils.remove((String)args[0], '\n')); + profiler.addContext("sql", StringUtils.remove((String) args[0], '\n')); profiler.stopTrace(""); } return result; diff --git a/sonar-db/src/main/java/org/sonar/db/profiling/package-info.java b/sonar-db/src/main/java/org/sonar/db/profiling/package-info.java new file mode 100644 index 00000000000..99f88d56e77 --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/profiling/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.profiling; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/properties/PropertiesDao.java b/sonar-db/src/main/java/org/sonar/db/property/PropertiesDao.java index 91c34a12741..cb1a63adbe3 100644 --- a/sonar-core/src/main/java/org/sonar/core/properties/PropertiesDao.java +++ b/sonar-db/src/main/java/org/sonar/db/property/PropertiesDao.java @@ -18,23 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.properties; +package org.sonar.db.property; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import org.apache.commons.dbutils.DbUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.resources.Scopes; -import org.sonar.api.server.ServerSide; -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 javax.annotation.Nullable; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -42,10 +29,17 @@ import java.sql.SQLException; import java.util.Collection; import java.util.List; import java.util.Map; +import javax.annotation.Nullable; +import org.apache.commons.dbutils.DbUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.ibatis.session.SqlSession; +import org.sonar.api.resources.Scopes; +import org.sonar.db.Dao; +import org.sonar.db.DaoUtils; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; -@BatchSide -@ServerSide -public class PropertiesDao implements DaoComponent { +public class PropertiesDao implements Dao { private static final String NOTIFICATION_PREFIX = "notification."; private MyBatis mybatis; @@ -61,7 +55,7 @@ public class PropertiesDao implements DaoComponent { * @return the list of logins (maybe be empty - obviously) */ public List<String> findUsersForNotification(String notificationDispatcherKey, String notificationChannelKey, - @Nullable String projectUuid) { + @Nullable String projectUuid) { SqlSession session = mybatis.openSession(false); PropertiesMapper mapper = session.getMapper(PropertiesMapper.class); try { diff --git a/sonar-core/src/main/java/org/sonar/core/properties/PropertiesMapper.java b/sonar-db/src/main/java/org/sonar/db/property/PropertiesMapper.java index 9b75aa5d6a6..34c03e2e9b8 100644 --- a/sonar-core/src/main/java/org/sonar/core/properties/PropertiesMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/property/PropertiesMapper.java @@ -18,13 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.properties; - -import org.apache.ibatis.annotations.Param; - -import javax.annotation.Nullable; +package org.sonar.db.property; import java.util.List; +import javax.annotation.Nullable; +import org.apache.ibatis.annotations.Param; public interface PropertiesMapper { @@ -45,7 +43,7 @@ public interface PropertiesMapper { List<PropertyDto> selectByQuery(@Param("query") PropertyQuery query); List<PropertyDto> selectDescendantModuleProperties(@Param("moduleUuid") String moduleUuid, @Param(value = "scope") String scope, - @Param(value = "excludeDisabled") boolean excludeDisabled); + @Param(value = "excludeDisabled") boolean excludeDisabled); void update(PropertyDto property); diff --git a/sonar-core/src/main/java/org/sonar/core/properties/PropertyDto.java b/sonar-db/src/main/java/org/sonar/db/property/PropertyDto.java index 7a771386e54..10456ace24c 100644 --- a/sonar-core/src/main/java/org/sonar/core/properties/PropertyDto.java +++ b/sonar-db/src/main/java/org/sonar/db/property/PropertyDto.java @@ -17,7 +17,7 @@ * 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.properties; +package org.sonar.db.property; import com.google.common.base.Objects; diff --git a/sonar-core/src/main/java/org/sonar/core/properties/PropertyQuery.java b/sonar-db/src/main/java/org/sonar/db/property/PropertyQuery.java index da489e95bf4..108fb2e2742 100644 --- a/sonar-core/src/main/java/org/sonar/core/properties/PropertyQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/property/PropertyQuery.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.properties; +package org.sonar.db.property; public class PropertyQuery { diff --git a/sonar-core/src/main/java/org/sonar/core/purge/IdUuidPair.java b/sonar-db/src/main/java/org/sonar/db/purge/IdUuidPair.java index f19ef88611f..642a6fbda55 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/IdUuidPair.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/IdUuidPair.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.purge; +package org.sonar.db.purge; public class IdUuidPair { private Long id; diff --git a/sonar-core/src/main/java/org/sonar/core/purge/IdUuidPairs.java b/sonar-db/src/main/java/org/sonar/db/purge/IdUuidPairs.java index 9949d9c9fa6..12bfbab8f09 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/IdUuidPairs.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/IdUuidPairs.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.purge; +package org.sonar.db.purge; import com.google.common.base.Function; import com.google.common.collect.Lists; diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeCommands.java b/sonar-db/src/main/java/org/sonar/db/purge/PurgeCommands.java index 14d9d9d69d3..8e93918e780 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeCommands.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/PurgeCommands.java @@ -17,7 +17,7 @@ * 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.purge; +package org.sonar.db.purge; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeConfiguration.java b/sonar-db/src/main/java/org/sonar/db/purge/PurgeConfiguration.java index ba0248ff139..65bc6c0ca0e 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeConfiguration.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/PurgeConfiguration.java @@ -17,17 +17,16 @@ * 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.purge; +package org.sonar.db.purge; import com.google.common.annotations.VisibleForTesting; +import java.util.Date; +import javax.annotation.CheckForNull; import org.apache.commons.lang.time.DateUtils; import org.sonar.api.config.Settings; import org.sonar.api.resources.Scopes; import org.sonar.api.utils.System2; -import org.sonar.core.computation.dbcleaner.DbCleanerConstants; - -import javax.annotation.CheckForNull; -import java.util.Date; +import org.sonar.core.config.PurgeConstants; public class PurgeConfiguration { @@ -49,11 +48,11 @@ public class PurgeConfiguration { } public static PurgeConfiguration newDefaultPurgeConfiguration(Settings settings, IdUuidPair idUuidPair) { - String[] scopes = new String[]{Scopes.FILE}; - if (settings.getBoolean(DbCleanerConstants.PROPERTY_CLEAN_DIRECTORY)) { - scopes = new String[]{Scopes.DIRECTORY, Scopes.FILE}; + String[] scopes = new String[] {Scopes.FILE}; + if (settings.getBoolean(PurgeConstants.PROPERTY_CLEAN_DIRECTORY)) { + scopes = new String[] {Scopes.DIRECTORY, Scopes.FILE}; } - return new PurgeConfiguration(idUuidPair, scopes, settings.getInt(DbCleanerConstants.DAYS_BEFORE_DELETING_CLOSED_ISSUES)); + return new PurgeConfiguration(idUuidPair, scopes, settings.getInt(PurgeConstants.DAYS_BEFORE_DELETING_CLOSED_ISSUES)); } public IdUuidPair rootProjectIdUuid() { diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeDao.java b/sonar-db/src/main/java/org/sonar/db/purge/PurgeDao.java index 7cfaa1ee8e2..a06767ab51c 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeDao.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/PurgeDao.java @@ -17,7 +17,7 @@ * 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.purge; +package org.sonar.db.purge; import com.google.common.collect.Lists; import java.util.ArrayList; @@ -32,18 +32,18 @@ import org.apache.ibatis.session.SqlSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; import static org.sonar.api.utils.DateUtils.dateToLong; /** * @since 2.14 */ -public class PurgeDao implements DaoComponent { +public class PurgeDao implements Dao { private static final Logger LOG = LoggerFactory.getLogger(PurgeDao.class); private final MyBatis mybatis; private final ResourceDao resourceDao; @@ -135,7 +135,7 @@ public class PurgeDao implements DaoComponent { private void disableOrphanResources(final ResourceDto project, final SqlSession session, final PurgeMapper purgeMapper, final PurgeListener purgeListener) { final List<IdUuidPair> componentIdUuids = new ArrayList<>(); - session.select("org.sonar.core.purge.PurgeMapper.selectComponentIdUuidsToDisable", project.getId(), new ResultHandler() { + session.select("org.sonar.db.purge.PurgeMapper.selectComponentIdUuidsToDisable", project.getId(), new ResultHandler() { @Override public void handleResult(ResultContext resultContext) { IdUuidPair componentIdUuid = (IdUuidPair) resultContext.getResultObject(); diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeListener.java b/sonar-db/src/main/java/org/sonar/db/purge/PurgeListener.java index 055b259a221..e1e90ccf714 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeListener.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/PurgeListener.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.purge; +package org.sonar.db.purge; public interface PurgeListener { diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeMapper.java b/sonar-db/src/main/java/org/sonar/db/purge/PurgeMapper.java index 914add27596..b1f84d0925f 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/PurgeMapper.java @@ -17,7 +17,7 @@ * 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.purge; +package org.sonar.db.purge; import java.util.List; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeProfiler.java b/sonar-db/src/main/java/org/sonar/db/purge/PurgeProfiler.java index 96c03fe4112..c68c8dfa2cc 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeProfiler.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/PurgeProfiler.java @@ -17,12 +17,9 @@ * 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.purge; +package org.sonar.db.purge; import com.google.common.annotations.VisibleForTesting; -import org.sonar.api.utils.TimeUtils; -import org.sonar.api.utils.log.Logger; - import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -30,6 +27,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.sonar.api.utils.TimeUtils; +import org.sonar.api.utils.log.Logger; public class PurgeProfiler { @@ -78,7 +77,7 @@ public class PurgeProfiler { for (Entry<String, Long> entry : truncateList(data)) { StringBuilder sb = new StringBuilder(); sb.append(" o ").append(entry.getKey()).append(": ").append(TimeUtils.formatDuration(entry.getValue())) - .append(" (").append((int) (entry.getValue() / percent)).append("%)"); + .append(" (").append((int) (entry.getValue() / percent)).append("%)"); logger.info(sb.toString()); } } diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeSnapshotQuery.java b/sonar-db/src/main/java/org/sonar/db/purge/PurgeSnapshotQuery.java index 7369d8b0e7c..2e44e1033ee 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeSnapshotQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/PurgeSnapshotQuery.java @@ -17,7 +17,7 @@ * 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.purge; +package org.sonar.db.purge; public final class PurgeSnapshotQuery { private Long id; @@ -57,29 +57,29 @@ public final class PurgeSnapshotQuery { } public String[] getScopes() { - return scopes;//NOSONAR May expose internal representation by returning reference to mutable object + return scopes;// NOSONAR May expose internal representation by returning reference to mutable object } public PurgeSnapshotQuery setScopes(String[] scopes) { - this.scopes = scopes; //NOSONAR May expose internal representation by incorporating reference to mutable object + this.scopes = scopes; // NOSONAR May expose internal representation by incorporating reference to mutable object return this; } public String[] getQualifiers() { - return qualifiers;//NOSONAR May expose internal representation by returning reference to mutable object + return qualifiers;// NOSONAR May expose internal representation by returning reference to mutable object } public PurgeSnapshotQuery setQualifiers(String[] qualifiers) { - this.qualifiers = qualifiers;//NOSONAR May expose internal representation by incorporating reference to mutable object + this.qualifiers = qualifiers;// NOSONAR May expose internal representation by incorporating reference to mutable object return this; } public String[] getStatus() { - return status;//NOSONAR May expose internal representation by returning reference to mutable object + return status;// NOSONAR May expose internal representation by returning reference to mutable object } public PurgeSnapshotQuery setStatus(String[] status) { - this.status = status; //NOSONAR org.sonar.core.purge.PurgeSnapshotQuery.setStatus(String[]) may expose internal representation + this.status = status; // NOSONAR org.sonar.db.purge.PurgeSnapshotQuery.setStatus(String[]) may expose internal representation return this; } diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeableSnapshotDto.java b/sonar-db/src/main/java/org/sonar/db/purge/PurgeableSnapshotDto.java index e3a8793bc90..b879738b04d 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeableSnapshotDto.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/PurgeableSnapshotDto.java @@ -17,13 +17,12 @@ * 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.purge; +package org.sonar.db.purge; +import java.util.Date; import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import java.util.Date; - public class PurgeableSnapshotDto implements Comparable<PurgeableSnapshotDto> { private Date date; private long snapshotId; diff --git a/sonar-db/src/main/java/org/sonar/db/purge/package-info.java b/sonar-db/src/main/java/org/sonar/db/purge/package-info.java new file mode 100644 index 00000000000..890b581cc1c --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/purge/package-info.java @@ -0,0 +1,25 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +@ParametersAreNonnullByDefault +package org.sonar.db.purge; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleaner.java b/sonar-db/src/main/java/org/sonar/db/purge/period/DefaultPeriodCleaner.java index 65dce4be5eb..ac7bad54d1a 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleaner.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/period/DefaultPeriodCleaner.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.db.purge.period; import com.google.common.annotations.VisibleForTesting; import java.util.List; @@ -27,10 +27,10 @@ import org.sonar.api.server.ServerSide; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.purge.PurgeDao; -import org.sonar.core.purge.PurgeSnapshotQuery; -import org.sonar.core.purge.PurgeableSnapshotDto; +import org.sonar.db.DbSession; +import org.sonar.db.purge.PurgeDao; +import org.sonar.db.purge.PurgeSnapshotQuery; +import org.sonar.db.purge.PurgeableSnapshotDto; @ServerSide public class DefaultPeriodCleaner { diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilter.java b/sonar-db/src/main/java/org/sonar/db/purge/period/DeleteAllFilter.java index 0b6d34cbfb9..9cd9275eaad 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilter.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/period/DeleteAllFilter.java @@ -18,15 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.db.purge.period; import com.google.common.collect.Lists; -import org.sonar.api.utils.DateUtils; -import org.sonar.api.utils.log.Loggers; -import org.sonar.core.purge.PurgeableSnapshotDto; - import java.util.Date; import java.util.List; +import org.sonar.api.utils.DateUtils; +import org.sonar.api.utils.log.Loggers; +import org.sonar.db.purge.PurgeableSnapshotDto; class DeleteAllFilter implements Filter { private final Date before; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filter.java b/sonar-db/src/main/java/org/sonar/db/purge/period/Filter.java index ef4a3753242..b10fb4cd342 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filter.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/period/Filter.java @@ -18,11 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; - -import org.sonar.core.purge.PurgeableSnapshotDto; +package org.sonar.db.purge.period; import java.util.List; +import org.sonar.db.purge.PurgeableSnapshotDto; interface Filter { List<PurgeableSnapshotDto> filter(List<PurgeableSnapshotDto> snapshots); diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filters.java b/sonar-db/src/main/java/org/sonar/db/purge/period/Filters.java index 8e59596212c..08b9bf04648 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filters.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/period/Filters.java @@ -18,25 +18,24 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.db.purge.period; import com.google.common.collect.Lists; -import org.apache.commons.lang.time.DateUtils; -import org.sonar.api.config.Settings; -import org.sonar.core.computation.dbcleaner.DbCleanerConstants; - import java.util.Calendar; import java.util.Date; import java.util.List; +import org.apache.commons.lang.time.DateUtils; +import org.sonar.api.config.Settings; +import org.sonar.core.config.PurgeConstants; class Filters { private final List<Filter> all = Lists.newArrayList(); Filters(Settings settings) { - Date dateToStartKeepingOneSnapshotByDay = getDateFromHours(settings, DbCleanerConstants.HOURS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_DAY); - Date dateToStartKeepingOneSnapshotByWeek = getDateFromWeeks(settings, DbCleanerConstants.WEEKS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_WEEK); - Date dateToStartKeepingOneSnapshotByMonth = getDateFromWeeks(settings, DbCleanerConstants.WEEKS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_MONTH); - Date dateToStartDeletingAllSnapshots = getDateFromWeeks(settings, DbCleanerConstants.WEEKS_BEFORE_DELETING_ALL_SNAPSHOTS); + Date dateToStartKeepingOneSnapshotByDay = getDateFromHours(settings, PurgeConstants.HOURS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_DAY); + Date dateToStartKeepingOneSnapshotByWeek = getDateFromWeeks(settings, PurgeConstants.WEEKS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_WEEK); + Date dateToStartKeepingOneSnapshotByMonth = getDateFromWeeks(settings, PurgeConstants.WEEKS_BEFORE_KEEPING_ONLY_ONE_SNAPSHOT_BY_MONTH); + Date dateToStartDeletingAllSnapshots = getDateFromWeeks(settings, PurgeConstants.WEEKS_BEFORE_DELETING_ALL_SNAPSHOTS); all.add(new KeepOneFilter(dateToStartKeepingOneSnapshotByWeek, dateToStartKeepingOneSnapshotByDay, Calendar.DAY_OF_YEAR, "day")); all.add(new KeepOneFilter(dateToStartKeepingOneSnapshotByMonth, dateToStartKeepingOneSnapshotByWeek, Calendar.WEEK_OF_YEAR, "week")); diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Interval.java b/sonar-db/src/main/java/org/sonar/db/purge/period/Interval.java index 5676a858495..2014d3fbecc 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Interval.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/period/Interval.java @@ -18,16 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.db.purge.period; import com.google.common.collect.Lists; -import org.apache.commons.lang.time.DateUtils; -import org.sonar.core.purge.PurgeableSnapshotDto; - import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; +import org.apache.commons.lang.time.DateUtils; +import org.sonar.db.purge.PurgeableSnapshotDto; final class Interval { List<PurgeableSnapshotDto> snapshots = Lists.newArrayList(); @@ -58,7 +57,7 @@ final class Interval { calendar.setTime(snapshot.getDate()); int currentFieldValue = calendar.get(calendarField); int currentYear = calendar.get(Calendar.YEAR); - if (lastYear!=currentYear || lastFieldValue != currentFieldValue) { + if (lastYear != currentYear || lastFieldValue != currentFieldValue) { currentInterval = new Interval(); intervals.add(currentInterval); } diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilter.java b/sonar-db/src/main/java/org/sonar/db/purge/period/KeepOneFilter.java index b1087066243..7335e7c1981 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilter.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/period/KeepOneFilter.java @@ -18,16 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.db.purge.period; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; -import org.sonar.api.utils.DateUtils; -import org.sonar.api.utils.log.Loggers; -import org.sonar.core.purge.PurgeableSnapshotDto; - import java.util.Date; import java.util.List; +import org.sonar.api.utils.DateUtils; +import org.sonar.api.utils.log.Loggers; +import org.sonar.db.purge.PurgeableSnapshotDto; class KeepOneFilter implements Filter { diff --git a/sonar-core/src/main/java/org/sonar/core/measure/db/package-info.java b/sonar-db/src/main/java/org/sonar/db/purge/period/package-info.java index 0027c705e86..462f8f07e52 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/db/package-info.java +++ b/sonar-db/src/main/java/org/sonar/db/purge/period/package-info.java @@ -19,7 +19,7 @@ */ @ParametersAreNonnullByDefault -package org.sonar.core.measure.db; +package org.sonar.db.purge.period; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociation.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociation.java index 34daeaf06c4..5aafbde3669 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociation.java +++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociation.java @@ -17,7 +17,7 @@ * 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.qualitygate.db; +package org.sonar.db.qualitygate; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationDao.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationDao.java index 24e70bac628..e5c03caa515 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationDao.java +++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationDao.java @@ -18,16 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualitygate.db; +package org.sonar.db.qualitygate; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; -import org.apache.ibatis.session.RowBounds; -import org.apache.ibatis.session.SqlSession; -import org.sonar.core.persistence.MyBatis; - import java.util.List; import java.util.Map; +import org.apache.ibatis.session.RowBounds; +import org.apache.ibatis.session.SqlSession; +import org.sonar.db.MyBatis; public class ProjectQgateAssociationDao { diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationDto.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationDto.java index 3d191933faa..18b3d7f0e19 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationDto.java +++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationDto.java @@ -17,7 +17,7 @@ * 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.qualitygate.db; +package org.sonar.db.qualitygate; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationMapper.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.java index 4caa0a7a755..1472fe7199a 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.java @@ -17,12 +17,11 @@ * 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.qualitygate.db; - -import org.apache.ibatis.session.RowBounds; +package org.sonar.db.qualitygate; import java.util.List; import java.util.Map; +import org.apache.ibatis.session.RowBounds; public interface ProjectQgateAssociationMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationQuery.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationQuery.java index 8abae3c2e60..7a96fe57b05 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/ProjectQgateAssociationQuery.java @@ -17,16 +17,14 @@ * 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.qualitygate.db; +package org.sonar.db.qualitygate; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import org.apache.commons.lang.StringUtils; - +import java.util.Set; import javax.annotation.CheckForNull; import javax.annotation.Nullable; - -import java.util.Set; +import org.apache.commons.lang.StringUtils; public class ProjectQgateAssociationQuery { @@ -52,7 +50,6 @@ public class ProjectQgateAssociationQuery { // index of selected page. Start with 1. private final int pageIndex; - private ProjectQgateAssociationQuery(Builder builder) { this.gateId = builder.gateId; this.membership = builder.membership; diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateConditionDao.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateConditionDao.java index 5c1eec7664f..df5f6886f25 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateConditionDao.java +++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateConditionDao.java @@ -17,19 +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.qualitygate.db; - -import org.apache.ibatis.session.SqlSession; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.MyBatis; +package org.sonar.db.qualitygate; import java.util.Collection; import java.util.Date; +import org.apache.ibatis.session.SqlSession; +import org.sonar.db.Dao; +import org.sonar.db.MyBatis; /** * @since 4.3 */ -public class QualityGateConditionDao implements DaoComponent { +public class QualityGateConditionDao implements Dao { private final MyBatis myBatis; diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateConditionDto.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateConditionDto.java index de3b7149eeb..dbfb9654d64 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateConditionDto.java +++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateConditionDto.java @@ -17,7 +17,7 @@ * 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.qualitygate.db; +package org.sonar.db.qualitygate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateConditionMapper.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateConditionMapper.java index 5d2d348fb51..da9527cbe61 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateConditionMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateConditionMapper.java @@ -1,4 +1,4 @@ -package org.sonar.core.qualitygate.db; +package org.sonar.db.qualitygate; import java.util.List; diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateDao.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateDao.java index 0cc6d669cab..5e483bbe30e 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateDao.java +++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateDao.java @@ -17,13 +17,12 @@ * 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.qualitygate.db; - -import org.apache.ibatis.session.SqlSession; -import org.sonar.core.persistence.MyBatis; +package org.sonar.db.qualitygate; import java.util.Collection; import java.util.Date; +import org.apache.ibatis.session.SqlSession; +import org.sonar.db.MyBatis; /** * @since 4.3 diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateDto.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateDto.java index ef6df28794a..e0e0f083ba3 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateDto.java +++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateDto.java @@ -17,7 +17,7 @@ * 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.qualitygate.db; +package org.sonar.db.qualitygate; import java.util.Date; diff --git a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateMapper.java b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateMapper.java index 90b7c5095da..c4880835cbe 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitygate/db/QualityGateMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/qualitygate/QualityGateMapper.java @@ -1,4 +1,4 @@ -package org.sonar.core.qualitygate.db; +package org.sonar.db.qualitygate; import java.util.List; diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDao.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java index bb2c0fb594d..24efe187dd7 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDao.java +++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java @@ -18,14 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualityprofile.db; +package org.sonar.db.qualityprofile; +import java.util.List; import org.apache.ibatis.session.SqlSession; import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; - -import java.util.List; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; /** * @deprecated use the ActiveRuleDao class defined in sonar-server diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDto.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDto.java index b671b187a87..ab2d37f9e84 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDto.java +++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualityprofile.db; +package org.sonar.db.qualityprofile; import com.google.common.base.Preconditions; import javax.annotation.CheckForNull; @@ -28,9 +28,9 @@ import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.ActiveRule; -import org.sonar.core.persistence.Dto; -import org.sonar.core.rule.RuleDto; import org.sonar.core.rule.SeverityUtil; +import org.sonar.db.Dto; +import org.sonar.db.rule.RuleDto; public class ActiveRuleDto extends Dto<ActiveRuleKey> { diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleKey.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleKey.java index c42b8050b09..4527fabaf88 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleKey.java +++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleKey.java @@ -17,12 +17,11 @@ * 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.qualityprofile.db; +package org.sonar.db.qualityprofile; import com.google.common.base.Preconditions; -import org.sonar.api.rule.RuleKey; - import java.io.Serializable; +import org.sonar.api.rule.RuleKey; /** * diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleMapper.java index 75a99504967..ee409f35171 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleMapper.java @@ -18,15 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualityprofile.db; - -import org.apache.ibatis.annotations.Param; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; +package org.sonar.db.qualityprofile; import java.sql.Timestamp; import java.util.List; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; +import org.apache.ibatis.annotations.Param; public interface ActiveRuleMapper { @@ -61,7 +59,7 @@ public interface ActiveRuleMapper { List<ActiveRuleParamDto> selectParamsByProfileKey(String profileKey); ActiveRuleDto selectByKey(@Param("profileKey") String profileKey, - @Param("repository") String repository, @Param("rule") String rule); + @Param("repository") String repository, @Param("rule") String rule); List<ActiveRuleParamDto> selectAllParams(); diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleParamDto.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleParamDto.java index 630adc21a84..6036f548c8c 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleParamDto.java +++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleParamDto.java @@ -18,16 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualityprofile.db; +package org.sonar.db.qualityprofile; import com.google.common.base.Preconditions; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; -import org.sonar.core.rule.RuleParamDto; - import java.util.Collection; import java.util.HashMap; import java.util.Map; +import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; +import org.sonar.db.rule.RuleParamDto; public class ActiveRuleParamDto { @@ -95,7 +94,7 @@ public class ActiveRuleParamDto { .setRulesParameterId(param.getId()); } - public static Map<String,ActiveRuleParamDto> groupByKey(Collection<ActiveRuleParamDto> params) { + public static Map<String, ActiveRuleParamDto> groupByKey(Collection<ActiveRuleParamDto> params) { Map<String, ActiveRuleParamDto> result = new HashMap<>(); for (ActiveRuleParamDto param : params) { result.put(param.getKey(), param); diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ProjectQprofileAssociationDto.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ProjectQprofileAssociationDto.java index e8f0d3c62b0..cb0c8e205bb 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ProjectQprofileAssociationDto.java +++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ProjectQprofileAssociationDto.java @@ -17,7 +17,7 @@ * 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.qualityprofile.db; +package org.sonar.db.qualityprofile; import javax.annotation.CheckForNull; diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDao.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java index feb860b6ffb..b184b493e01 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDao.java +++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java @@ -18,27 +18,25 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualityprofile.db; +package org.sonar.db.qualityprofile; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.sonar.api.server.ServerSide; -import org.sonar.api.utils.System2; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - import java.util.Date; import java.util.List; import java.util.Map; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; +import org.sonar.api.server.ServerSide; +import org.sonar.api.utils.System2; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.component.ComponentDto; @ServerSide -public class QualityProfileDao implements DaoComponent { +public class QualityProfileDao implements Dao { private final MyBatis mybatis; private final System2 system; @@ -82,7 +80,7 @@ public class QualityProfileDao implements DaoComponent { } /** - * @deprecated use {@link #insert(org.sonar.core.persistence.DbSession, QualityProfileDto, QualityProfileDto...)} + * @deprecated use {@link #insert(DbSession, QualityProfileDto, QualityProfileDto...)} */ @Deprecated public void insert(QualityProfileDto dto) { @@ -213,7 +211,7 @@ public class QualityProfileDao implements DaoComponent { /** * @deprecated Replaced by - * {@link #getByKey(org.sonar.core.persistence.DbSession, String)} + * {@link #getByKey(DbSession, String)} */ @Deprecated @CheckForNull @@ -223,7 +221,7 @@ public class QualityProfileDao implements DaoComponent { /** * @deprecated Replaced by - * {@link #getByKey(org.sonar.core.persistence.DbSession, String)} + * {@link #getByKey(DbSession, String)} */ @Deprecated @CheckForNull @@ -289,7 +287,7 @@ public class QualityProfileDao implements DaoComponent { /** * @deprecated Replaced by - * {@link #getByNameAndLanguage(String, String, org.sonar.core.persistence.DbSession)} + * {@link #getByNameAndLanguage(String, String, DbSession)} */ @Deprecated public QualityProfileDto getByNameAndLanguage(String name, String language) { diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileDto.java index ae43582e405..2c36242e9af 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java +++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileDto.java @@ -18,15 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualityprofile.db; - -import org.sonar.core.UtcDateUtils; -import org.sonar.core.persistence.Dto; +package org.sonar.db.qualityprofile; +import java.util.Date; import javax.annotation.CheckForNull; import javax.annotation.Nullable; - -import java.util.Date; +import org.sonar.core.util.UtcDateUtils; +import org.sonar.db.Dto; public class QualityProfileDto extends Dto<String> { diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileMapper.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileMapper.java index a54a4789283..ade9c166655 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileMapper.java @@ -18,14 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualityprofile.db; - -import org.apache.ibatis.annotations.Param; -import org.sonar.core.component.ComponentDto; - -import javax.annotation.CheckForNull; +package org.sonar.db.qualityprofile; import java.util.List; +import javax.annotation.CheckForNull; +import org.apache.ibatis.annotations.Param; +import org.sonar.db.component.ComponentDto; public interface QualityProfileMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileProjectCount.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileProjectCount.java index a18bd449c8f..287d7e93b36 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileProjectCount.java +++ b/sonar-db/src/main/java/org/sonar/db/qualityprofile/QualityProfileProjectCount.java @@ -17,8 +17,7 @@ * 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.qualityprofile.db; - +package org.sonar.db.qualityprofile; public class QualityProfileProjectCount { diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleDao.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleDao.java index 808e8b2ba67..25236bc2bcb 100644 --- a/sonar-core/src/main/java/org/sonar/core/rule/RuleDao.java +++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleDao.java @@ -17,21 +17,16 @@ * 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.rule; - -import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.MyBatis; +package org.sonar.db.rule; import java.util.List; +import org.apache.ibatis.session.SqlSession; +import org.sonar.db.MyBatis; /** * @deprecated in 4.4 moved to org.sonar.server.rule.db.RuleDao. */ @Deprecated -@BatchSide -@ServerSide public class RuleDao { private MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java index ed79218f328..d3188ec87db 100644 --- a/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java +++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java @@ -17,7 +17,7 @@ * 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.rule; +package org.sonar.db.rule; import java.util.Arrays; import java.util.Date; @@ -33,7 +33,8 @@ import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; -import org.sonar.core.persistence.Dto; +import org.sonar.core.rule.SeverityUtil; +import org.sonar.db.Dto; public class RuleDto extends Dto<RuleKey> { diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleMapper.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleMapper.java index 5e078efdc3b..5074160a11c 100644 --- a/sonar-core/src/main/java/org/sonar/core/rule/RuleMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleMapper.java @@ -17,15 +17,13 @@ * 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.rule; - -import org.apache.ibatis.annotations.Param; -import org.sonar.api.rule.RuleKey; - -import javax.annotation.Nullable; +package org.sonar.db.rule; import java.sql.Timestamp; import java.util.List; +import javax.annotation.Nullable; +import org.apache.ibatis.annotations.Param; +import org.sonar.api.rule.RuleKey; public interface RuleMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleParamDto.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleParamDto.java index 4d033696bea..2df5c541a93 100644 --- a/sonar-core/src/main/java/org/sonar/core/rule/RuleParamDto.java +++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleParamDto.java @@ -18,13 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.rule; - -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +package org.sonar.db.rule; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; public class RuleParamDto { diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/SemaphoreDao.java b/sonar-db/src/main/java/org/sonar/db/semaphore/SemaphoreDao.java index e50e39c3fa8..c34a9b89542 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/SemaphoreDao.java +++ b/sonar-db/src/main/java/org/sonar/db/semaphore/SemaphoreDao.java @@ -17,14 +17,14 @@ * 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.persistence; +package org.sonar.db.semaphore; import com.google.common.base.Strings; +import javax.annotation.CheckForNull; import org.apache.ibatis.session.SqlSession; import org.sonar.api.utils.Semaphores; import org.sonar.api.utils.System2; - -import javax.annotation.CheckForNull; +import org.sonar.db.MyBatis; import static com.google.common.base.Preconditions.checkArgument; import static org.sonar.api.utils.DateUtils.longToDate; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/SemaphoreDto.java b/sonar-db/src/main/java/org/sonar/db/semaphore/SemaphoreDto.java index d28bb804ab6..a26e6a35037 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/SemaphoreDto.java +++ b/sonar-db/src/main/java/org/sonar/db/semaphore/SemaphoreDto.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.db.semaphore; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.builder.ReflectionToStringBuilder; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/SemaphoreMapper.java b/sonar-db/src/main/java/org/sonar/db/semaphore/SemaphoreMapper.java index 22773833bbc..fc517e9f42d 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/SemaphoreMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/semaphore/SemaphoreMapper.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.db.semaphore; import org.apache.ibatis.annotations.Param; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/SemaphoreUpdater.java b/sonar-db/src/main/java/org/sonar/db/semaphore/SemaphoreUpdater.java index 77ff8402d9f..767539d385c 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/SemaphoreUpdater.java +++ b/sonar-db/src/main/java/org/sonar/db/semaphore/SemaphoreUpdater.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.db.semaphore; import com.google.common.collect.Maps; import java.util.Map; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/SemaphoresImpl.java b/sonar-db/src/main/java/org/sonar/db/semaphore/SemaphoresImpl.java index d5028b34fd9..63958124965 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/SemaphoresImpl.java +++ b/sonar-db/src/main/java/org/sonar/db/semaphore/SemaphoresImpl.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.db.semaphore; import org.sonar.api.utils.Semaphores; diff --git a/sonar-db/src/main/java/org/sonar/db/semaphore/package-info.java b/sonar-db/src/main/java/org/sonar/db/semaphore/package-info.java new file mode 100644 index 00000000000..888655d88da --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/semaphore/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.semaphore; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/source/db/FileSourceDto.java b/sonar-db/src/main/java/org/sonar/db/source/FileSourceDto.java index af0e95b25fd..0ac7561084f 100644 --- a/sonar-core/src/main/java/org/sonar/core/source/db/FileSourceDto.java +++ b/sonar-db/src/main/java/org/sonar/db/source/FileSourceDto.java @@ -17,16 +17,7 @@ * 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.source.db; - -import net.jpountz.lz4.LZ4BlockInputStream; -import net.jpountz.lz4.LZ4BlockOutputStream; -import org.apache.commons.io.IOUtils; -import org.sonar.server.source.db.FileSourceDb; -import org.sonar.server.source.db.FileSourceDb.Test; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; +package org.sonar.db.source; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -34,6 +25,13 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.List; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; +import net.jpountz.lz4.LZ4BlockInputStream; +import net.jpountz.lz4.LZ4BlockOutputStream; +import org.apache.commons.io.IOUtils; +import org.sonar.server.source.db.FileSourceDb; +import org.sonar.server.source.db.FileSourceDb.Test; public class FileSourceDto { diff --git a/sonar-core/src/main/java/org/sonar/core/source/db/FileSourceMapper.java b/sonar-db/src/main/java/org/sonar/db/source/FileSourceMapper.java index 027b2b02a16..45b03b15b65 100644 --- a/sonar-core/src/main/java/org/sonar/core/source/db/FileSourceMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/source/FileSourceMapper.java @@ -18,13 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.source.db; - -import org.apache.ibatis.annotations.Param; - -import javax.annotation.CheckForNull; +package org.sonar.db.source; import java.util.List; +import javax.annotation.CheckForNull; +import org.apache.ibatis.annotations.Param; public interface FileSourceMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/user/AuthorDao.java b/sonar-db/src/main/java/org/sonar/db/user/AuthorDao.java index 7db1e4de5bb..5837964ce82 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/AuthorDao.java +++ b/sonar-db/src/main/java/org/sonar/db/user/AuthorDao.java @@ -17,32 +17,25 @@ * 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.user; +package org.sonar.db.user; import com.google.common.base.Function; import com.google.common.base.Strings; -import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DaoUtils; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; - import java.util.Collection; import java.util.Date; import java.util.List; +import org.apache.ibatis.session.SqlSession; +import org.sonar.db.Dao; +import org.sonar.db.DaoUtils; +import org.sonar.db.MyBatis; +import org.sonar.db.component.ComponentDto; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; /** - * @since 3.0 - * * Be careful when updating this class because it's used by the Dev Cockpit plugin. */ -@BatchSide -@ServerSide -public class AuthorDao implements DaoComponent { +public class AuthorDao implements Dao { private final MyBatis mybatis; private final ResourceDao resourceDao; diff --git a/sonar-core/src/main/java/org/sonar/core/user/AuthorDto.java b/sonar-db/src/main/java/org/sonar/db/user/AuthorDto.java index 1f0d3f4bf21..32275ab680e 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/AuthorDto.java +++ b/sonar-db/src/main/java/org/sonar/db/user/AuthorDto.java @@ -17,7 +17,7 @@ * 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.user; +package org.sonar.db.user; import java.util.Date; @@ -60,7 +60,7 @@ public final class AuthorDto { } public Date getCreatedAt() { - return createdAt;//NOSONAR May expose internal representation by returning reference to mutable object + return createdAt;// NOSONAR May expose internal representation by returning reference to mutable object } public AuthorDto setCreatedAt(Date createdAt) { @@ -69,7 +69,7 @@ public final class AuthorDto { } public Date getUpdatedAt() { - return updatedAt;//NOSONAR May expose internal representation by returning reference to mutable object + return updatedAt;// NOSONAR May expose internal representation by returning reference to mutable object } public AuthorDto setUpdatedAt(Date updatedAt) { diff --git a/sonar-core/src/main/java/org/sonar/core/user/AuthorMapper.java b/sonar-db/src/main/java/org/sonar/db/user/AuthorMapper.java index 0d4c09bf3d8..06f12adf1d5 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/AuthorMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/user/AuthorMapper.java @@ -17,12 +17,11 @@ * 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.user; - -import org.apache.ibatis.annotations.Param; +package org.sonar.db.user; import java.util.Collection; import java.util.List; +import org.apache.ibatis.annotations.Param; /** * @since 3.0 diff --git a/sonar-core/src/main/java/org/sonar/core/user/AuthorizationDao.java b/sonar-db/src/main/java/org/sonar/db/user/AuthorizationDao.java index 0d9f78317c5..2a386c1d2b7 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/AuthorizationDao.java +++ b/sonar-db/src/main/java/org/sonar/db/user/AuthorizationDao.java @@ -17,28 +17,26 @@ * 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.user; +package org.sonar.db.user; import com.google.common.base.Function; import com.google.common.collect.Sets; -import org.apache.ibatis.session.SqlSession; -import org.sonar.api.server.ServerSide; -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 javax.annotation.Nullable; - import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; +import javax.annotation.Nullable; +import org.apache.ibatis.session.SqlSession; +import org.sonar.api.server.ServerSide; +import org.sonar.db.Dao; +import org.sonar.db.DaoUtils; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import static com.google.common.collect.Maps.newHashMap; @ServerSide -public class AuthorizationDao implements DaoComponent { +public class AuthorizationDao implements Dao { private static final String USER_ID_PARAM = "userId"; private final MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/user/AuthorizationMapper.java b/sonar-db/src/main/java/org/sonar/db/user/AuthorizationMapper.java index 10d137dffbd..ca2eadd15d2 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/AuthorizationMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/user/AuthorizationMapper.java @@ -18,12 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.user; - -import org.apache.ibatis.annotations.Param; +package org.sonar.db.user; import java.util.Collection; import java.util.List; +import org.apache.ibatis.annotations.Param; public interface AuthorizationMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/user/GroupDto.java b/sonar-db/src/main/java/org/sonar/db/user/GroupDto.java index b70d2526785..dd483344959 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/GroupDto.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupDto.java @@ -17,12 +17,11 @@ * 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.user; - -import org.sonar.core.persistence.Dto; +package org.sonar.db.user; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.sonar.db.Dto; public class GroupDto extends Dto<String> { diff --git a/sonar-core/src/main/java/org/sonar/core/user/GroupMapper.java b/sonar-db/src/main/java/org/sonar/db/user/GroupMapper.java index 607b97b4758..d1cafb62fa9 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/GroupMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupMapper.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.user; +package org.sonar.db.user; import java.util.List; import javax.annotation.CheckForNull; diff --git a/sonar-core/src/main/java/org/sonar/core/user/GroupMembershipDao.java b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipDao.java index 09b25209add..a62609259b8 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/GroupMembershipDao.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipDao.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.user; +package org.sonar.db.user; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -32,12 +32,12 @@ import java.util.Map; import javax.annotation.Nonnull; import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.SqlSession; -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.Dao; +import org.sonar.db.DaoUtils; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; -public class GroupMembershipDao implements DaoComponent { +public class GroupMembershipDao implements Dao { private final MyBatis mybatis; diff --git a/sonar-core/src/main/java/org/sonar/core/user/GroupMembershipDto.java b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipDto.java index 1b5b89474c0..65e32e9b7e1 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/GroupMembershipDto.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipDto.java @@ -17,10 +17,11 @@ * 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.user; +package org.sonar.db.user; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.sonar.core.user.GroupMembership; /** * @since 4.1 diff --git a/sonar-core/src/main/java/org/sonar/core/user/GroupMembershipMapper.java b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipMapper.java index 2d68ac5514c..37dda516a23 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/GroupMembershipMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipMapper.java @@ -17,7 +17,7 @@ * 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.user; +package org.sonar.db.user; import java.util.List; import java.util.Map; diff --git a/sonar-core/src/main/java/org/sonar/core/user/GroupMembershipQuery.java b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipQuery.java index 75f1fdb44b0..3dadb5963bf 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/GroupMembershipQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupMembershipQuery.java @@ -17,7 +17,7 @@ * 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.user; +package org.sonar.db.user; import com.google.common.collect.ImmutableSet; import java.util.Set; @@ -53,7 +53,6 @@ public class GroupMembershipQuery { // index of selected page. Start with 1. private final int pageIndex; - private GroupMembershipQuery(Builder builder) { this.login = builder.login; this.membership = builder.membership; diff --git a/sonar-core/src/main/java/org/sonar/core/user/GroupRoleDto.java b/sonar-db/src/main/java/org/sonar/db/user/GroupRoleDto.java index 2b814c2a34e..9c24a10dcdc 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/GroupRoleDto.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupRoleDto.java @@ -17,7 +17,7 @@ * 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.user; +package org.sonar.db.user; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/user/GroupUserCount.java b/sonar-db/src/main/java/org/sonar/db/user/GroupUserCount.java index e2f4cfa1840..0c82650f0da 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/GroupUserCount.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupUserCount.java @@ -17,7 +17,7 @@ * 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.user; +package org.sonar.db.user; public class GroupUserCount { diff --git a/sonar-core/src/main/java/org/sonar/core/user/LoginGroup.java b/sonar-db/src/main/java/org/sonar/db/user/LoginGroup.java index 7f25a8cee5f..1f2b080147e 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/LoginGroup.java +++ b/sonar-db/src/main/java/org/sonar/db/user/LoginGroup.java @@ -17,7 +17,7 @@ * 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.user; +package org.sonar.db.user; public class LoginGroup { diff --git a/sonar-core/src/main/java/org/sonar/core/user/RoleDao.java b/sonar-db/src/main/java/org/sonar/db/user/RoleDao.java index 7bde8163199..d1314b65900 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/RoleDao.java +++ b/sonar-db/src/main/java/org/sonar/db/user/RoleDao.java @@ -18,20 +18,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.user; +package org.sonar.db.user; import java.util.List; import javax.annotation.Nullable; import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; import org.sonar.api.security.DefaultGroups; -import org.sonar.api.server.ServerSide; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; -@ServerSide -@BatchSide -public class RoleDao implements DaoComponent { +public class RoleDao implements Dao { public List<String> selectUserPermissions(DbSession session, String userLogin, @Nullable Long resourceId) { return session.getMapper(RoleMapper.class).selectUserPermissions(userLogin, resourceId); diff --git a/sonar-core/src/main/java/org/sonar/core/user/RoleMapper.java b/sonar-db/src/main/java/org/sonar/db/user/RoleMapper.java index c4d2ca4dbd4..f26b59874bf 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/RoleMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/user/RoleMapper.java @@ -17,7 +17,7 @@ * 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.user; +package org.sonar.db.user; import java.util.List; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserDao.java b/sonar-db/src/main/java/org/sonar/db/user/UserDao.java index a72983a49ef..985da344a29 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/UserDao.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserDao.java @@ -17,28 +17,19 @@ * 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.user; +package org.sonar.db.user; import com.google.common.collect.Lists; +import java.util.List; +import javax.annotation.CheckForNull; import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; import org.sonar.api.user.UserQuery; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DaoComponent; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; - -import javax.annotation.CheckForNull; +import org.sonar.db.Dao; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; -import java.util.List; - -/** - * @since 3.2 - */ -@BatchSide -@ServerSide -public class UserDao implements DaoComponent { +public class UserDao implements Dao { private final MyBatis mybatis; private final System2 system2; diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserDto.java b/sonar-db/src/main/java/org/sonar/db/user/UserDto.java index 11cfc59cb08..b0d9f79d95f 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/UserDto.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserDto.java @@ -17,17 +17,16 @@ * 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.user; +package org.sonar.db.user; import com.google.common.base.Splitter; import com.google.common.collect.Lists; -import org.apache.commons.lang.StringUtils; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - import java.util.ArrayList; import java.util.List; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; +import org.apache.commons.lang.StringUtils; +import org.sonar.core.user.DefaultUser; /** * @since 3.2 diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserGroupDto.java b/sonar-db/src/main/java/org/sonar/db/user/UserGroupDto.java index 99d300c0574..d26510f69ad 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/UserGroupDto.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserGroupDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.user; +package org.sonar.db.user; public class UserGroupDto { diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserGroupMapper.java b/sonar-db/src/main/java/org/sonar/db/user/UserGroupMapper.java index 3381852a229..6c723dbf838 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/UserGroupMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserGroupMapper.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.user; +package org.sonar.db.user; public interface UserGroupMapper { diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserMapper.java b/sonar-db/src/main/java/org/sonar/db/user/UserMapper.java index 6658f10dc6a..e387210942a 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/UserMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserMapper.java @@ -17,15 +17,13 @@ * 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.user; +package org.sonar.db.user; +import java.util.List; +import javax.annotation.CheckForNull; import org.apache.ibatis.annotations.Param; import org.sonar.api.user.UserQuery; -import javax.annotation.CheckForNull; - -import java.util.List; - public interface UserMapper { @CheckForNull diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserMembershipDto.java b/sonar-db/src/main/java/org/sonar/db/user/UserMembershipDto.java index b7a128f1d7e..14b3dd3c90b 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/UserMembershipDto.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserMembershipDto.java @@ -17,7 +17,7 @@ * 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.user; +package org.sonar.db.user; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserMembershipQuery.java b/sonar-db/src/main/java/org/sonar/db/user/UserMembershipQuery.java index c54ff834be1..f89d99ce0cc 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/UserMembershipQuery.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserMembershipQuery.java @@ -17,7 +17,7 @@ * 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.user; +package org.sonar.db.user; import com.google.common.collect.ImmutableSet; import java.util.Set; @@ -53,7 +53,6 @@ public class UserMembershipQuery { // index of selected page. Start with 1. private final int pageIndex; - private UserMembershipQuery(Builder builder) { this.groupId = builder.groupId; this.membership = builder.membership; diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserRoleDto.java b/sonar-db/src/main/java/org/sonar/db/user/UserRoleDto.java index b6b58e8c1b0..9ce973e7519 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/UserRoleDto.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserRoleDto.java @@ -17,8 +17,7 @@ * 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.user; - +package org.sonar.db.user; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java index 836c3f7fdc0..e8435f2b05b 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java +++ b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java @@ -17,21 +17,15 @@ * 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.persistence; +package org.sonar.db.version; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; import org.apache.ibatis.session.SqlSession; -import org.sonar.api.batch.BatchSide; -import org.sonar.api.server.ServerSide; +import org.sonar.db.MyBatis; -/** - * @since 3.0 - */ -@BatchSide -@ServerSide public class DatabaseVersion { public static final int LAST_VERSION = 923; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/SchemaMigrationDto.java b/sonar-db/src/main/java/org/sonar/db/version/SchemaMigrationDto.java index b8005661a69..c78b8457f97 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/SchemaMigrationDto.java +++ b/sonar-db/src/main/java/org/sonar/db/version/SchemaMigrationDto.java @@ -17,14 +17,14 @@ * 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.persistence; +package org.sonar.db.version; /** * Maps the table SCHEMA_MIGRATIONS that is fed by Ruby on Rails Migrations * @since 3.0 */ public class SchemaMigrationDto { - private String version;//NOSONAR this field is assigned by MyBatis + private String version;// NOSONAR this field is assigned by MyBatis public String getVersion() { return version; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/SchemaMigrationMapper.java b/sonar-db/src/main/java/org/sonar/db/version/SchemaMigrationMapper.java index 8dc7d70a653..5b8a3645be2 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/SchemaMigrationMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/version/SchemaMigrationMapper.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.db.version; import java.util.List; diff --git a/sonar-db/src/main/java/org/sonar/db/version/package-info.java b/sonar-db/src/main/java/org/sonar/db/version/package-info.java new file mode 100644 index 00000000000..f5be5b6d523 --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/version/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.version; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/ChangeLog.java b/sonar-db/src/main/java/org/sonar/db/version/v44/ChangeLog.java index 915905b12ab..6306bb7704c 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/ChangeLog.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v44/ChangeLog.java @@ -17,7 +17,7 @@ * 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.persistence.migration.v44; +package org.sonar.db.version.v44; import java.util.Date; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/Migration44Mapper.java b/sonar-db/src/main/java/org/sonar/db/version/v44/Migration44Mapper.java index 666dc2cb01a..875be56a080 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/Migration44Mapper.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v44/Migration44Mapper.java @@ -17,15 +17,13 @@ * 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.persistence.migration.v44; - -import org.apache.ibatis.annotations.Param; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; +package org.sonar.db.version.v44; import java.util.Date; import java.util.List; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; +import org.apache.ibatis.annotations.Param; public interface Migration44Mapper { diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/ProfileMeasure.java b/sonar-db/src/main/java/org/sonar/db/version/v44/ProfileMeasure.java index 1e6dd591fb0..c3663442a87 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/ProfileMeasure.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v44/ProfileMeasure.java @@ -17,7 +17,7 @@ * 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.persistence.migration.v44; +package org.sonar.db.version.v44; public class ProfileMeasure { private long id; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/QProfileDto44.java b/sonar-db/src/main/java/org/sonar/db/version/v44/QProfileDto44.java index e69d23c1cb5..7b659f52f13 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/QProfileDto44.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v44/QProfileDto44.java @@ -17,7 +17,7 @@ * 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.persistence.migration.v44; +package org.sonar.db.version.v44; public class QProfileDto44 { diff --git a/sonar-core/src/main/java/org/sonar/core/metric/db/package-info.java b/sonar-db/src/main/java/org/sonar/db/version/v44/package-info.java index 77b704b45d7..9d07e1f584a 100644 --- a/sonar-core/src/main/java/org/sonar/core/metric/db/package-info.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v44/package-info.java @@ -19,7 +19,7 @@ */ @ParametersAreNonnullByDefault -package org.sonar.core.metric.db; +package org.sonar.db.version.v44; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v45/Migration45Mapper.java b/sonar-db/src/main/java/org/sonar/db/version/v45/Migration45Mapper.java index 046f01ec240..7d6cac507c7 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v45/Migration45Mapper.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v45/Migration45Mapper.java @@ -17,7 +17,7 @@ * 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.persistence.migration.v45; +package org.sonar.db.version.v45; import java.util.Date; import java.util.List; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v45/Rule.java b/sonar-db/src/main/java/org/sonar/db/version/v45/Rule.java index a54d2f3cf61..18fcf353e78 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v45/Rule.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v45/Rule.java @@ -17,13 +17,12 @@ * 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.persistence.migration.v45; - -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +package org.sonar.db.version.v45; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; /** * SONAR-5575 @@ -109,5 +108,4 @@ public final class Rule { .toHashCode(); } - } diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v45/RuleParameter.java b/sonar-db/src/main/java/org/sonar/db/version/v45/RuleParameter.java index c930518ab81..e2102b23bab 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v45/RuleParameter.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v45/RuleParameter.java @@ -17,13 +17,12 @@ * 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.persistence.migration.v45; - -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +package org.sonar.db.version.v45; import javax.annotation.CheckForNull; import javax.annotation.Nullable; +import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; /** * SONAR-5575 diff --git a/sonar-db/src/main/java/org/sonar/db/version/v45/package-info.java b/sonar-db/src/main/java/org/sonar/db/version/v45/package-info.java new file mode 100644 index 00000000000..98d09760f72 --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/version/v45/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.db.version.v45; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v50/Component.java b/sonar-db/src/main/java/org/sonar/db/version/v50/Component.java index bf64a3cfc57..acfa141ea9a 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v50/Component.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v50/Component.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.persistence.migration.v50; +package org.sonar.db.version.v50; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v50/Migration50Mapper.java b/sonar-db/src/main/java/org/sonar/db/version/v50/Migration50Mapper.java index d9b2fb55a78..f8f60aea16c 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v50/Migration50Mapper.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v50/Migration50Mapper.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.persistence.migration.v50; +package org.sonar.db.version.v50; import java.util.List; import org.apache.ibatis.annotations.Options; diff --git a/sonar-db/src/main/java/org/sonar/db/version/v50/package-info.java b/sonar-db/src/main/java/org/sonar/db/version/v50/package-info.java new file mode 100644 index 00000000000..03bb5056ad3 --- /dev/null +++ b/sonar-db/src/main/java/org/sonar/db/version/v50/package-info.java @@ -0,0 +1,25 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +@ParametersAreNonnullByDefault +package org.sonar.db.version.v50; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/IsAliveMapper.xml b/sonar-db/src/main/resources/org/sonar/db/IsAliveMapper.xml index 4fd531e52d1..c26b5961f8a 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/IsAliveMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/IsAliveMapper.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.persistence.IsAliveMapper"> +<mapper namespace="org.sonar.db.IsAliveMapper"> - <select id="isAlive" resultType="int" > + <select id="isAlive" resultType="int"> select 1 <choose> <when test="_databaseId == 'oracle'"> diff --git a/sonar-core/src/main/resources/org/sonar/core/activity/db/ActivityMapper.xml b/sonar-db/src/main/resources/org/sonar/db/activity/ActivityMapper.xml index c3de19773b6..0014464aa2c 100644 --- a/sonar-core/src/main/resources/org/sonar/core/activity/db/ActivityMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/activity/ActivityMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.activity.db.ActivityMapper"> +<mapper namespace="org.sonar.db.activity.ActivityMapper"> <insert id="insert" parameterType="Activity" useGeneratedKeys="false"> insert into activities diff --git a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentIndexMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/ComponentIndexMapper.xml index 1e88b4100b9..2a308781795 100644 --- a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentIndexMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/ComponentIndexMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.component.db.ComponentIndexMapper"> +<mapper namespace="org.sonar.db.component.ComponentIndexMapper"> <select id="selectProjectIdsFromQueryAndViewOrSubViewUuid" parameterType="map" resultType="long"> SELECT r.resource_id FROM resource_index r diff --git a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentLinkMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/ComponentLinkMapper.xml index 9d87b6078d7..c6db203313b 100644 --- a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentLinkMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/ComponentLinkMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.component.db.ComponentLinkMapper"> +<mapper namespace="org.sonar.db.component.ComponentLinkMapper"> <sql id="componentLinkColumns"> p.id, @@ -21,11 +21,13 @@ <insert id="insert" parameterType="ComponentLink" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO project_links (component_uuid, link_type, name, href) - VALUES (#{componentUuid,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{href,jdbcType=VARCHAR}) + VALUES (#{componentUuid,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, + #{href,jdbcType=VARCHAR}) </insert> <insert id="update" parameterType="ComponentLink" useGeneratedKeys="false"> - UPDATE project_links SET component_uuid=#{componentUuid,jdbcType=VARCHAR}, link_type=#{type,jdbcType=VARCHAR}, name=#{name,jdbcType=VARCHAR}, href=#{href,jdbcType=VARCHAR} + UPDATE project_links SET component_uuid=#{componentUuid,jdbcType=VARCHAR}, link_type=#{type,jdbcType=VARCHAR}, + name=#{name,jdbcType=VARCHAR}, href=#{href,jdbcType=VARCHAR} WHERE id=#{id} </insert> diff --git a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml index 8c58c026256..19740c7f76e 100644 --- a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.component.db.ComponentMapper"> +<mapper namespace="org.sonar.db.component.ComponentMapper"> <sql id="componentColumns"> p.id, @@ -33,7 +33,8 @@ </sql> <select id="selectByKey" parameterType="String" resultType="Component"> - SELECT <include refid="componentColumns"/> + SELECT + <include refid="componentColumns"/> FROM projects p <where> AND p.kee=#{key} @@ -41,7 +42,8 @@ </select> <select id="selectById" parameterType="long" resultType="Component"> - SELECT <include refid="componentColumns"/> + SELECT + <include refid="componentColumns"/> FROM projects p <where> AND p.id=#{id} @@ -49,7 +51,8 @@ </select> <select id="selectByUuid" parameterType="String" resultType="Component"> - SELECT <include refid="componentColumns"/> + SELECT + <include refid="componentColumns"/> FROM projects p <where> AND p.uuid=#{uuid} @@ -65,7 +68,8 @@ </select> <select id="selectByKeys" parameterType="String" resultType="Component"> - select <include refid="componentColumns"/> + select + <include refid="componentColumns"/> from projects p <where> p.enabled=${_true} @@ -90,7 +94,8 @@ </select> <select id="selectByUuids" parameterType="String" resultType="Component"> - select <include refid="componentColumns"/> + select + <include refid="componentColumns"/> from projects p <where> and p.uuid in @@ -112,7 +117,8 @@ </select> <select id="selectSubProjectsByComponentUuids" parameterType="String" resultType="Component"> - SELECT <include refid="componentColumns"/> + SELECT + <include refid="componentColumns"/> FROM projects p INNER JOIN projects child ON child.root_id=p.id AND child.enabled=${_true} <where> @@ -126,13 +132,15 @@ </select> <select id="selectDescendantModules" parameterType="map" resultType="Component"> - SELECT <include refid="componentColumns"/> + SELECT + <include refid="componentColumns"/> FROM projects p <include refid="modulesTreeQuery"/> </select> <sql id="modulesTreeQuery"> - INNER JOIN projects module ON module.project_uuid = p.project_uuid AND module.uuid = #{moduleUuid} AND module.scope='PRJ' AND module.enabled = ${_true} + INNER JOIN projects module ON module.project_uuid = p.project_uuid AND module.uuid = #{moduleUuid} AND + module.scope='PRJ' AND module.enabled = ${_true} <where> <if test="excludeDisabled"> p.enabled = ${_true} @@ -202,7 +210,8 @@ </select> <select id="selectComponentsFromProjectKeyAndScope" parameterType="map" resultType="Component"> - SELECT <include refid="componentColumns"/> + SELECT + <include refid="componentColumns"/> FROM projects p INNER JOIN projects root ON root.uuid=p.project_uuid AND root.kee=#{projectKey} <where> @@ -214,7 +223,8 @@ </select> <select id="selectProvisionedProjects" parameterType="map" resultType="Component"> - select <include refid="componentColumns"/> + select + <include refid="componentColumns"/> from projects p <include refid="provisionClauses"/> </select> @@ -241,7 +251,8 @@ </sql> <select id="selectGhostProjects" parameterType="map" resultType="Component"> - select distinct <include refid="componentColumns"/> + select distinct + <include refid="componentColumns"/> from projects p <include refid="ghostClauses"/> </select> @@ -268,32 +279,36 @@ </sql> <insert id="insert" parameterType="Component" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> - INSERT INTO projects (kee, deprecated_kee, uuid, project_uuid, module_uuid, module_uuid_path, name, long_name, qualifier, scope, language, description, root_id, path, copy_resource_id, enabled, + INSERT INTO projects (kee, deprecated_kee, uuid, project_uuid, module_uuid, module_uuid_path, name, long_name, + qualifier, scope, language, description, root_id, path, copy_resource_id, enabled, created_at, authorization_updated_at) - VALUES (#{kee,jdbcType=VARCHAR}, #{deprecatedKey,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}, #{projectUuid,jdbcType=VARCHAR}, #{moduleUuid,jdbcType=VARCHAR}, #{moduleUuidPath,jdbcType=VARCHAR}, - #{name,jdbcType=VARCHAR}, #{longName,jdbcType=VARCHAR}, #{qualifier,jdbcType=VARCHAR}, #{scope,jdbcType=VARCHAR}, #{language,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, - #{parentProjectId,jdbcType=BIGINT}, #{path,jdbcType=VARCHAR}, #{copyResourceId,jdbcType=BIGINT}, #{enabled,jdbcType=BOOLEAN}, - #{createdAt,jdbcType=TIMESTAMP}, #{authorizationUpdatedAt,jdbcType=BIGINT}) + VALUES (#{kee,jdbcType=VARCHAR}, #{deprecatedKey,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}, + #{projectUuid,jdbcType=VARCHAR}, #{moduleUuid,jdbcType=VARCHAR}, #{moduleUuidPath,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, #{longName,jdbcType=VARCHAR}, #{qualifier,jdbcType=VARCHAR}, #{scope,jdbcType=VARCHAR}, + #{language,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{parentProjectId,jdbcType=BIGINT}, #{path,jdbcType=VARCHAR}, #{copyResourceId,jdbcType=BIGINT}, + #{enabled,jdbcType=BOOLEAN}, + #{createdAt,jdbcType=TIMESTAMP}, #{authorizationUpdatedAt,jdbcType=BIGINT}) </insert> <insert id="update" parameterType="Component" useGeneratedKeys="false"> UPDATE projects SET - kee=#{kee,jdbcType=VARCHAR}, - deprecated_kee=#{deprecatedKey,jdbcType=VARCHAR}, - project_uuid=#{projectUuid,jdbcType=VARCHAR}, - module_uuid=#{moduleUuid,jdbcType=VARCHAR}, - module_uuid_path=#{moduleUuidPath,jdbcType=VARCHAR}, - name=#{name,jdbcType=VARCHAR}, - long_name=#{longName,jdbcType=VARCHAR}, - qualifier=#{qualifier,jdbcType=VARCHAR}, - scope=#{scope,jdbcType=VARCHAR}, - language=#{language,jdbcType=VARCHAR}, - description=#{description,jdbcType=VARCHAR}, - root_id=#{parentProjectId,jdbcType=BIGINT}, - path=#{path,jdbcType=VARCHAR}, - copy_resource_id=#{copyResourceId,jdbcType=BIGINT}, - enabled=#{enabled,jdbcType=BOOLEAN}, - authorization_updated_at=#{authorizationUpdatedAt,jdbcType=BIGINT} + kee=#{kee,jdbcType=VARCHAR}, + deprecated_kee=#{deprecatedKey,jdbcType=VARCHAR}, + project_uuid=#{projectUuid,jdbcType=VARCHAR}, + module_uuid=#{moduleUuid,jdbcType=VARCHAR}, + module_uuid_path=#{moduleUuidPath,jdbcType=VARCHAR}, + name=#{name,jdbcType=VARCHAR}, + long_name=#{longName,jdbcType=VARCHAR}, + qualifier=#{qualifier,jdbcType=VARCHAR}, + scope=#{scope,jdbcType=VARCHAR}, + language=#{language,jdbcType=VARCHAR}, + description=#{description,jdbcType=VARCHAR}, + root_id=#{parentProjectId,jdbcType=BIGINT}, + path=#{path,jdbcType=VARCHAR}, + copy_resource_id=#{copyResourceId,jdbcType=BIGINT}, + enabled=#{enabled,jdbcType=BOOLEAN}, + authorization_updated_at=#{authorizationUpdatedAt,jdbcType=BIGINT} WHERE uuid=#{uuid} </insert> diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/ResourceIndexerMapper.xml index 91c494daa4a..82afc7fa85d 100644 --- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/ResourceIndexerMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.resource.ResourceIndexerMapper"> +<mapper namespace="org.sonar.db.component.ResourceIndexerMapper"> <!-- The column PROJECTS.ROOT_ID is not exact on multi-modules projects. The root id must diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceKeyUpdaterMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/ResourceKeyUpdaterMapper.xml index 6f50a88e8c1..40add31c8cd 100644 --- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceKeyUpdaterMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/ResourceKeyUpdaterMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.resource.ResourceKeyUpdaterMapper"> +<mapper namespace="org.sonar.db.component.ResourceKeyUpdaterMapper"> <resultMap id="resourceResultMap" type="Resource"> <id property="id" column="id"/> diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/ResourceMapper.xml index 65624ef07a5..39339fe5ec2 100644 --- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/ResourceMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.resource.ResourceMapper"> +<mapper namespace="org.sonar.db.component.ResourceMapper"> <resultMap id="snapshotResultMap" type="Snapshot"> <id property="id" column="id"/> @@ -64,7 +64,8 @@ <where> <if test="qualifiers != null and qualifiers.length!=0"> and p.qualifier in - <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator="," close=")">#{qualifier}</foreach> + <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator="," close=")">#{qualifier} + </foreach> </if> <if test="key != null"> and p.kee=#{key} @@ -81,7 +82,8 @@ <where> <if test="qualifiers != null and qualifiers.length!=0"> and p.qualifier in - <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator="," close=")">#{qualifier}</foreach> + <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator="," close=")">#{qualifier} + </foreach> </if> <if test="key != null"> and p.kee=#{key} @@ -108,7 +110,7 @@ <select id="selectLastSnapshotByResourceKey" parameterType="string" resultMap="snapshotResultMap"> SELECT s.* FROM snapshots s - INNER JOIN projects p on p.id=s.project_id AND p.enabled=${_true} AND p.copy_resource_id IS NULL + INNER JOIN projects p on p.id=s.project_id AND p.enabled=${_true} AND p.copy_resource_id IS NULL <where> AND p.kee=#{id} AND s.islast=${_true} @@ -117,7 +119,7 @@ <select id="selectLastSnapshotByResourceUuid" parameterType="string" resultMap="snapshotResultMap"> SELECT s.* from snapshots s - INNER JOIN projects p on p.id=s.project_id AND p.enabled=${_true} AND p.copy_resource_id IS NULL + INNER JOIN projects p on p.id=s.project_id AND p.enabled=${_true} AND p.copy_resource_id IS NULL <where> AND p.uuid=#{uuid} AND s.islast=${_true} @@ -138,21 +140,23 @@ </where> </select> - <select id="selectRootProjectByComponentId" parameterType="long" resultMap="resourceResultMap" > + <select id="selectRootProjectByComponentId" parameterType="long" resultMap="resourceResultMap"> select rootProject.* from snapshots s inner join projects rootProject on rootProject.id=s.root_project_id where - s.project_id=#{componentId} - and s.islast=${_true} + s.project_id=#{componentId} + and s.islast=${_true} </select> <select id="selectProjectsIncludingNotCompletedOnesByQualifiers" parameterType="map" resultMap="resourceResultMap"> select * from projects p <where> <if test="qualifiers != null and qualifiers.size() > 0"> - and <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator=" or " close=")">p.qualifier=#{qualifier} - </foreach> + and + <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator=" or " close=")"> + p.qualifier=#{qualifier} + </foreach> </if> and p.enabled=${_true} and p.copy_resource_id is null @@ -160,7 +164,7 @@ </select> <select id="selectProjectsByQualifiers" parameterType="map" resultMap="resourceResultMap"> - <include refid="selectProjectsByQualifiersQuery" /> + <include refid="selectProjectsByQualifiersQuery"/> </select> <sql id="selectProjectsByQualifiersQuery"> @@ -168,8 +172,10 @@ inner join snapshots s on s.project_id=p.id <where> <if test="qualifiers != null and qualifiers.size() > 0"> - and <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator=" or " close=")">p.qualifier=#{qualifier} - </foreach> + and + <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator=" or " close=")"> + p.qualifier=#{qualifier} + </foreach> </if> and p.enabled=${_true} and p.copy_resource_id is null @@ -184,7 +190,9 @@ <where> and s2.id is null <if test="qualifiers != null and qualifiers.size() > 0"> - and <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator=" or " close=")">p.qualifier=#{qualifier} + and + <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator=" or " close=")"> + p.qualifier=#{qualifier} </foreach> </if> and p.copy_resource_id is null @@ -197,34 +205,41 @@ <where> and s.id is null <if test="qualifiers != null and qualifiers.size() > 0"> - and <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator=" or " close=")">p.qualifier=#{qualifier} + and + <foreach item="qualifier" index="index" collection="qualifiers" open="(" separator=" or " close=")"> + p.qualifier=#{qualifier} </foreach> </if> and p.copy_resource_id is null </where> </select> - <select id="selectProvisionedProject" parameterType="string" resultMap="resourceResultMap" > + <select id="selectProvisionedProject" parameterType="string" resultMap="resourceResultMap"> select p.* from projects p left join snapshots s on s.project_id=p.id where s.id is null - and p.kee = #{key} - and p.copy_resource_id is null + and p.kee = #{key} + and p.copy_resource_id is null </select> - <insert id="insert" parameterType="Resource" keyColumn="id" useGeneratedKeys="true" keyProperty="id" > + <insert id="insert" parameterType="Resource" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> insert into projects - (uuid, project_uuid, module_uuid, module_uuid_path, name, long_name, description, scope, qualifier, kee, deprecated_kee, path, language, root_id, copy_resource_id, person_id, + (uuid, project_uuid, module_uuid, module_uuid_path, name, long_name, description, scope, qualifier, kee, + deprecated_kee, path, language, root_id, copy_resource_id, person_id, enabled, authorization_updated_at, created_at) values ( - #{uuid,jdbcType=VARCHAR}, #{projectUuid,jdbcType=VARCHAR}, #{moduleUuid,jdbcType=VARCHAR}, #{moduleUuidPath,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, - #{longName,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{scope,jdbcType=VARCHAR}, #{qualifier,jdbcType=VARCHAR}, - #{key,jdbcType=VARCHAR}, #{deprecatedKey,jdbcType=VARCHAR}, #{path,jdbcType=VARCHAR}, #{language,jdbcType=VARCHAR}, #{rootId,jdbcType=INTEGER}, #{copyResourceId,jdbcType=INTEGER}, - #{personId,jdbcType=INTEGER}, #{enabled,jdbcType=BOOLEAN}, #{authorizationUpdatedAt,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP} + #{uuid,jdbcType=VARCHAR}, #{projectUuid,jdbcType=VARCHAR}, #{moduleUuid,jdbcType=VARCHAR}, + #{moduleUuidPath,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, + #{longName,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{scope,jdbcType=VARCHAR}, + #{qualifier,jdbcType=VARCHAR}, + #{key,jdbcType=VARCHAR}, #{deprecatedKey,jdbcType=VARCHAR}, #{path,jdbcType=VARCHAR}, #{language,jdbcType=VARCHAR}, + #{rootId,jdbcType=INTEGER}, #{copyResourceId,jdbcType=INTEGER}, + #{personId,jdbcType=INTEGER}, #{enabled,jdbcType=BOOLEAN}, #{authorizationUpdatedAt,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP} ) </insert> - <update id="update" parameterType="Resource" > + <update id="update" parameterType="Resource"> update projects set name=#{name}, long_name=#{longName}, description=#{description}, scope=#{scope}, qualifier=#{qualifier}, kee=#{key}, deprecated_kee=#{deprecatedKey}, path=#{path}, language=#{language}, root_id=#{rootId}, copy_resource_id=#{copyResourceId}, diff --git a/sonar-core/src/main/resources/org/sonar/core/component/db/SnapshotMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/SnapshotMapper.xml index 8d5b1d0576b..95af7ba53a8 100644 --- a/sonar-core/src/main/resources/org/sonar/core/component/db/SnapshotMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/SnapshotMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.component.db.SnapshotMapper"> +<mapper namespace="org.sonar.db.component.SnapshotMapper"> <sql id="snapshotColumns"> s.id, @@ -76,7 +76,7 @@ </if> </where> <if test="query.sortField != null"> - ORDER BY + ORDER BY <if test="query.sortField == 'created_at'"> created_at </if> diff --git a/sonar-core/src/main/resources/org/sonar/core/computation/db/AnalysisReportMapper.xml b/sonar-db/src/main/resources/org/sonar/db/compute/AnalysisReportMapper.xml index 28b7d9fbf57..2a3700186d4 100644 --- a/sonar-core/src/main/resources/org/sonar/core/computation/db/AnalysisReportMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/compute/AnalysisReportMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.computation.db.AnalysisReportMapper"> +<mapper namespace="org.sonar.db.compute.AnalysisReportMapper"> <sql id="reportColumns"> <!-- the data report is not brought back by default as it could be too big in memory --> ar.id, @@ -19,7 +19,8 @@ insert into analysis_reports (project_key, project_name, uuid, report_status, created_at, updated_at, started_at, finished_at) values ( - #{projectKey,jdbcType=VARCHAR}, #{projectName,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, + #{projectKey,jdbcType=VARCHAR}, #{projectName,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}, + #{status,jdbcType=VARCHAR}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, #{startedAt,jdbcType=BIGINT}, #{finishedAt,jdbcType=BIGINT} ) diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/ActiveDashboardMapper.xml b/sonar-db/src/main/resources/org/sonar/db/dashboard/ActiveDashboardMapper.xml index a192aab847f..6c88317e890 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/ActiveDashboardMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/dashboard/ActiveDashboardMapper.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.dashboard.ActiveDashboardMapper"> +<mapper namespace="org.sonar.db.dashboard.ActiveDashboardMapper"> - <insert id="insert" parameterType="ActiveDashboard" keyColumn="id" useGeneratedKeys="true" keyProperty ="id" > + <insert id="insert" parameterType="ActiveDashboard" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO active_dashboards (dashboard_id, user_id, order_index) VALUES (#{dashboardId}, #{userId}, #{orderIndex}) </insert> - <select id="selectMaxOrderIndexForNullUser" resultType="Integer" > + <select id="selectMaxOrderIndexForNullUser" resultType="Integer"> SELECT MAX(order_index) FROM active_dashboards WHERE user_id IS NULL @@ -20,34 +20,36 @@ </sql> <select id="selectGlobalDashboardsForUserLogin" parameterType="String" resultType="Dashboard"> - SELECT <include refid="dashboardColumns" /> + SELECT + <include refid="dashboardColumns"/> FROM dashboards d INNER JOIN active_dashboards ad on d.id=ad.dashboard_id LEFT OUTER JOIN users u on u.id=ad.user_id WHERE d.is_global=${_true} <choose> <when test="login == null"> - AND u.login IS NULL + AND u.login IS NULL </when> <otherwise> - AND u.login=#{login} + AND u.login=#{login} </otherwise> </choose> ORDER BY order_index ASC </select> <select id="selectProjectDashboardsForUserLogin" parameterType="String" resultType="Dashboard"> - SELECT <include refid="dashboardColumns" /> + SELECT + <include refid="dashboardColumns"/> FROM dashboards d INNER JOIN active_dashboards ad on d.id=ad.dashboard_id LEFT OUTER JOIN users u on u.id=ad.user_id WHERE d.is_global=${_false} <choose> <when test="login == null"> - AND u.login IS NULL + AND u.login IS NULL </when> <otherwise> - AND u.login=#{login} + AND u.login=#{login} </otherwise> </choose> ORDER BY order_index ASC diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper.xml b/sonar-db/src/main/resources/org/sonar/db/dashboard/DashboardMapper.xml index be61c330b73..ce27a44c73b 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/dashboard/DashboardMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.dashboard.DashboardMapper"> +<mapper namespace="org.sonar.db.dashboard.DashboardMapper"> </mapper> diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper.xml b/sonar-db/src/main/resources/org/sonar/db/dashboard/WidgetMapper.xml index ce1a70bf225..d77042a1d07 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/dashboard/WidgetMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.dashboard.WidgetMapper"> +<mapper namespace="org.sonar.db.dashboard.WidgetMapper"> <sql id="selectColumns"> w.id as "id", @@ -18,15 +18,21 @@ </sql> <select id="selectById" parameterType="Integer" resultType="Widget"> - select <include refid="selectColumns"/> from widgets w where w.id=#{id} + select + <include refid="selectColumns"/> + from widgets w where w.id=#{id} </select> <select id="selectByDashboard" parameterType="Integer" resultType="Widget"> - select <include refid="selectColumns"/> from widgets w where w.dashboard_id=#{id} + select + <include refid="selectColumns"/> + from widgets w where w.dashboard_id=#{id} </select> <select id="selectAll" resultType="Widget"> - select <include refid="selectColumns"/> from widgets w + select + <include refid="selectColumns"/> + from widgets w </select> </mapper> diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper.xml b/sonar-db/src/main/resources/org/sonar/db/dashboard/WidgetPropertyMapper.xml index e4744f93075..a2bf8024a7f 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/dashboard/WidgetPropertyMapper.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.dashboard.WidgetPropertyMapper"> +<mapper namespace="org.sonar.db.dashboard.WidgetPropertyMapper"> <delete id="deleteByWidgetIds" parameterType="map"> - DELETE FROM widget_properties - WHERE widget_id IN + DELETE FROM widget_properties + WHERE widget_id IN <foreach collection="list" open="(" close=")" item="wid" separator=",">#{wid}</foreach> </delete> diff --git a/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/CharacteristicMapper.xml b/sonar-db/src/main/resources/org/sonar/db/debt/CharacteristicMapper.xml index 123d7054a3e..a5f7aa7848a 100644 --- a/sonar-core/src/main/resources/org/sonar/core/technicaldebt/db/CharacteristicMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/debt/CharacteristicMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mappei.dtd"> -<mapper namespace="org.sonar.core.technicaldebt.db.CharacteristicMapper"> +<mapper namespace="org.sonar.db.debt.CharacteristicMapper"> <sql id="characteristicColumns"> c.id, @@ -16,18 +16,21 @@ </sql> <select id="selectEnabledCharacteristics" parameterType="map" resultType="Characteristic"> - select <include refid="characteristicColumns"/> + select + <include refid="characteristicColumns"/> from characteristics c where c.enabled=${_true} </select> <select id="selectCharacteristics" parameterType="map" resultType="Characteristic"> - select <include refid="characteristicColumns"/> + select + <include refid="characteristicColumns"/> from characteristics c </select> <select id="selectEnabledRootCharacteristics" parameterType="map" resultType="Characteristic"> - select <include refid="characteristicColumns"/> + select + <include refid="characteristicColumns"/> from characteristics c <where> and c.parent_id is null @@ -37,7 +40,8 @@ </select> <select id="selectCharacteristicsByParentId" parameterType="map" resultType="Characteristic"> - select <include refid="characteristicColumns"/> + select + <include refid="characteristicColumns"/> from characteristics c <where> and c.parent_id=#{parent_id} @@ -46,7 +50,8 @@ </select> <select id="selectCharacteristicsByIds" parameterType="map" resultType="Characteristic"> - select <include refid="characteristicColumns"/> + select + <include refid="characteristicColumns"/> from characteristics c <where> and c.enabled=${_true} @@ -55,7 +60,8 @@ </select> <select id="selectByKey" parameterType="String" resultType="Characteristic"> - select <include refid="characteristicColumns"/> + select + <include refid="characteristicColumns"/> from characteristics c <where> and c.kee=#{key} @@ -64,7 +70,8 @@ </select> <select id="selectById" parameterType="Integer" resultType="Characteristic"> - select <include refid="characteristicColumns"/> + select + <include refid="characteristicColumns"/> from characteristics c <where> and c.id=#{id} @@ -73,7 +80,8 @@ </select> <select id="selectByName" parameterType="String" resultType="Characteristic"> - select <include refid="characteristicColumns"/> + select + <include refid="characteristicColumns"/> from characteristics c <where> and c.name=#{name} @@ -92,10 +100,12 @@ <insert id="insert" parameterType="Characteristic" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO characteristics (kee, name, parent_id, characteristic_order, enabled, created_at, updated_at) - VALUES (#{kee,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, #{characteristicOrder,jdbcType=INTEGER}, #{enabled,jdbcType=BOOLEAN}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}) + VALUES (#{kee,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, + #{characteristicOrder,jdbcType=INTEGER}, #{enabled,jdbcType=BOOLEAN}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}) </insert> - <update id="update" parameterType="Characteristic" > + <update id="update" parameterType="Characteristic"> update characteristics set name=#{name}, parent_id=#{parentId}, @@ -105,7 +115,7 @@ where id=#{id} </update> - <select id="selectDeprecatedRequirements" resultType="RequirementMigration" > + <select id="selectDeprecatedRequirements" resultType="RequirementMigration"> select id as "id", parent_id as "parentId", root_id as "rootId", @@ -120,7 +130,7 @@ where rule_id IS NOT NULL </select> - <delete id="deleteRequirementsFromCharacteristicsTable" > + <delete id="deleteRequirementsFromCharacteristicsTable"> DELETE FROM characteristics WHERE rule_id IS NOT NULL </delete> </mapper> diff --git a/sonar-core/src/main/resources/org/sonar/core/duplication/DuplicationMapper.xml b/sonar-db/src/main/resources/org/sonar/db/duplication/DuplicationMapper.xml index 530c1182ebf..66212b3b205 100644 --- a/sonar-core/src/main/resources/org/sonar/core/duplication/DuplicationMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/duplication/DuplicationMapper.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.duplication.DuplicationMapper"> +<mapper namespace="org.sonar.db.duplication.DuplicationMapper"> <select id="selectCandidates" parameterType="map" resultType="DuplicationUnit"> - SELECT DISTINCT to_blocks.hash as hash, res.kee as resourceKey, to_blocks.index_in_file as indexInFile, to_blocks.start_line as startLine, to_blocks.end_line as endLine + SELECT DISTINCT to_blocks.hash as hash, res.kee as resourceKey, to_blocks.index_in_file as indexInFile, + to_blocks.start_line as startLine, to_blocks.end_line as endLine FROM duplications_index to_blocks, duplications_index from_blocks, snapshots snapshot, projects res WHERE from_blocks.snapshot_id = #{resource_snapshot_id} AND to_blocks.hash = from_blocks.hash @@ -17,7 +18,7 @@ </if> </select> - <insert id="batchInsert" parameterType="DuplicationUnit" useGeneratedKeys="false" > + <insert id="batchInsert" parameterType="DuplicationUnit" useGeneratedKeys="false"> INSERT INTO duplications_index (snapshot_id, project_snapshot_id, hash, index_in_file, start_line, end_line) VALUES (#{snapshotId}, #{projectSnapshotId}, #{hash}, #{indexInFile}, #{startLine}, #{endLine}) </insert> diff --git a/sonar-core/src/main/resources/org/sonar/core/event/db/EventMapper.xml b/sonar-db/src/main/resources/org/sonar/db/event/EventMapper.xml index 0c6dc2d3eb7..fa30a1f766f 100644 --- a/sonar-core/src/main/resources/org/sonar/core/event/db/EventMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/event/EventMapper.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.event.db.EventMapper"> +<mapper namespace="org.sonar.db.event.EventMapper"> <sql id="eventColumns"> e.id, @@ -15,7 +15,8 @@ </sql> <select id="selectByComponentUuid" parameterType="String" resultType="Event"> - SELECT <include refid="eventColumns"/> + SELECT + <include refid="eventColumns"/> FROM events e <where> AND e.component_uuid=#{uuid} @@ -30,7 +31,7 @@ <delete id="delete"> DELETE FROM events WHERE id=#{id} </delete> - + <select id="findSnapshotIdOfPreviousVersion" parameterType="map" resultType="long"> SELECT s.id FROM snapshots s, events e, projects p @@ -44,7 +45,7 @@ ORDER BY e.event_date DESC LIMIT 1 </select> - + <!-- SQL Server --> <select id="findSnapshotIdOfPreviousVersion" parameterType="map" resultType="long" databaseId="mssql"> SELECT TOP 1 s.id @@ -62,15 +63,15 @@ <!-- Oracle --> <select id="findSnapshotIdOfPreviousVersion" parameterType="map" resultType="long" databaseId="oracle"> SELECT * FROM (SELECT s.id - FROM snapshots s, events e, projects p - <where> - AND p.id=#{componentId} - AND p.uuid=e.component_uuid - AND e.name <> #{currentVersion} - AND e.category='Version' - AND s.id = e.snapshot_id - </where> - ORDER BY e.event_date DESC + FROM snapshots s, events e, projects p + <where> + AND p.id=#{componentId} + AND p.uuid=e.component_uuid + AND e.name <> #{currentVersion} + AND e.category='Version' + AND s.id = e.snapshot_id + </where> + ORDER BY e.event_date DESC ) WHERE ROWNUM <= 1 </select> diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/ActionPlanMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/ActionPlanMapper.xml index 1d770735304..49174ddad74 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/ActionPlanMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/issue/ActionPlanMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mappei.dtd"> -<mapper namespace="org.sonar.core.issue.db.ActionPlanMapper"> +<mapper namespace="org.sonar.db.issue.ActionPlanMapper"> <sql id="actionPlanColumns"> ap.id, @@ -18,9 +18,10 @@ p.kee as projectKey </sql> - <insert id="insert" parameterType="ActionPlanIssue" keyColumn="id" useGeneratedKeys="true" keyProperty="id" > + <insert id="insert" parameterType="ActionPlanIssue" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO action_plans (kee, name, description, user_login, project_id, status, deadline, created_at, updated_at) - VALUES (#{kee}, #{name}, #{description}, #{userLogin}, #{projectId}, #{status}, #{deadLine}, #{createdAt}, #{updatedAt}) + VALUES (#{kee}, #{name}, #{description}, #{userLogin}, #{projectId}, #{status}, #{deadLine}, #{createdAt}, + #{updatedAt}) </insert> <update id="update" parameterType="ActionPlanIssue"> @@ -40,7 +41,8 @@ </delete> <select id="findByKey" parameterType="long" resultType="ActionPlanIssue"> - select <include refid="actionPlanColumns"/> + select + <include refid="actionPlanColumns"/> from action_plans ap, projects p <where> and ap.kee=#{key} @@ -49,7 +51,8 @@ </select> <select id="findByKeys" parameterType="long" resultType="ActionPlanIssue"> - select <include refid="actionPlanColumns"/> + select + <include refid="actionPlanColumns"/> from action_plans ap, projects p <where> and ap.kee in @@ -61,7 +64,8 @@ </select> <select id="findOpenByProjectId" parameterType="long" resultType="ActionPlanIssue"> - select <include refid="actionPlanColumns"/> + select + <include refid="actionPlanColumns"/> from action_plans ap, projects p <where> and ap.project_id=#{projectId} @@ -71,7 +75,8 @@ </select> <select id="findByNameAndProjectId" parameterType="long" resultType="ActionPlanIssue"> - select <include refid="actionPlanColumns"/> + select + <include refid="actionPlanColumns"/> from action_plans ap, projects p <where> and ap.project_id=#{projectId} diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/ActionPlanStatsMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/ActionPlanStatsMapper.xml index a78884a9be0..ec6ddb40ea3 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/ActionPlanStatsMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/issue/ActionPlanStatsMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mappei.dtd"> -<mapper namespace="org.sonar.core.issue.db.ActionPlanStatsMapper"> +<mapper namespace="org.sonar.db.issue.ActionPlanStatsMapper"> <sql id="actionPlanColumns"> ap.id as id, @@ -19,7 +19,8 @@ </sql> <select id="findByProjectId" parameterType="map" resultType="ActionPlanStats"> - select <include refid="actionPlanColumns"/>, count(total_issues.id) as totalIssues, count(open_issues.id) as unresolvedIssues + select<include refid="actionPlanColumns"/>, count(total_issues.id) as totalIssues, count(open_issues.id) as + unresolvedIssues from action_plans ap left join projects p on p.id = ap.project_id left join issues total_issues on total_issues.action_plan_key = ap.kee @@ -27,7 +28,8 @@ <where> and ap.project_id = #{projectId} </where> - group by ap.id, ap.kee, ap.name, ap.description, ap.user_login, ap.project_id, ap.status, ap.deadline, ap.created_at, ap.updated_at, p.kee + group by ap.id, ap.kee, ap.name, ap.description, ap.user_login, ap.project_id, ap.status, ap.deadline, + ap.created_at, ap.updated_at, p.kee </select> -</mapper>
\ No newline at end of file +</mapper> diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueChangeMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/IssueChangeMapper.xml index b4aa445dae3..96caa141092 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueChangeMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/issue/IssueChangeMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.issue.db.IssueChangeMapper"> +<mapper namespace="org.sonar.db.issue.IssueChangeMapper"> <sql id="issueChangeColumns"> c.id, diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterFavouriteMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/IssueFilterFavouriteMapper.xml index 8f6ca9fef93..77db11f635c 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterFavouriteMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/issue/IssueFilterFavouriteMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.issue.db.IssueFilterFavouriteMapper"> +<mapper namespace="org.sonar.db.issue.IssueFilterFavouriteMapper"> <sql id="issueFilterFavouriteColumns"> filter_favourites.id as id, @@ -12,13 +12,15 @@ </sql> <select id="selectById" parameterType="long" resultType="issueFilterFavourite"> - select <include refid="issueFilterFavouriteColumns"/> + select + <include refid="issueFilterFavouriteColumns"/> from issue_filter_favourites filter_favourites where filter_favourites.id=#{id} </select> <select id="selectByFilterId" parameterType="long" resultType="issueFilterFavourite"> - select <include refid="issueFilterFavouriteColumns"/> + select + <include refid="issueFilterFavouriteColumns"/> from issue_filter_favourites filter_favourites where filter_favourites.issue_filter_id=#{filterId} </select> @@ -28,11 +30,11 @@ VALUES (#{userLogin}, #{issueFilterId}, current_timestamp) </insert> - <delete id="delete" parameterType="long" > + <delete id="delete" parameterType="long"> delete from issue_filter_favourites where id=#{id} </delete> - <delete id="deleteByFilterId" parameterType="long" > + <delete id="deleteByFilterId" parameterType="long"> delete from issue_filter_favourites where issue_filter_id=#{issueFilterId} </delete> diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/IssueFilterMapper.xml index 75e324a9e6e..aca8dffc6c2 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/issue/IssueFilterMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.issue.db.IssueFilterMapper"> +<mapper namespace="org.sonar.db.issue.IssueFilterMapper"> <sql id="issueFilterColumns"> filters.id as id, @@ -16,44 +16,49 @@ </sql> <select id="selectById" parameterType="long" resultType="IssueFilter"> - select <include refid="issueFilterColumns"/> + select + <include refid="issueFilterColumns"/> from issue_filters filters where filters.id=#{id} </select> <select id="selectByUser" parameterType="String" resultType="IssueFilter"> - select <include refid="issueFilterColumns"/> + select + <include refid="issueFilterColumns"/> from issue_filters filters where filters.user_login=#{user} </select> <select id="selectFavoriteFiltersByUser" parameterType="String" resultType="IssueFilter"> - select <include refid="issueFilterColumns"/> + select + <include refid="issueFilterColumns"/> from issue_filters filters inner join issue_filter_favourites fav on fav.issue_filter_id = filters.id where fav.user_login=#{user} </select> <select id="selectSharedFilters" parameterType="String" resultType="IssueFilter"> - select <include refid="issueFilterColumns"/> + select + <include refid="issueFilterColumns"/> from issue_filters filters where filters.shared=${_true} </select> <select id="selectProvidedFilterByName" parameterType="String" resultType="IssueFilter"> - select <include refid="issueFilterColumns"/> + select + <include refid="issueFilterColumns"/> from issue_filters filters where filters.user_login is null - and filters.shared=${_true} - and filters.name=#{name} + and filters.shared=${_true} + and filters.name=#{name} </select> - <insert id="insert" parameterType="IssueFilter" keyColumn="id" useGeneratedKeys="true" keyProperty="id" > + <insert id="insert" parameterType="IssueFilter" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO issue_filters (name, user_login, shared, description, data, created_at, updated_at) VALUES (#{name}, #{userLogin}, #{shared}, #{description}, #{data}, #{createdAt}, #{updatedAt}) </insert> - <update id="update" parameterType="IssueFilter" > + <update id="update" parameterType="IssueFilter"> update issue_filters set name=#{name}, shared=#{shared}, @@ -64,7 +69,7 @@ where id=#{id} </update> - <delete id="delete" parameterType="long" > + <delete id="delete" parameterType="long"> delete from issue_filters where id=#{id} </delete> diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml index a6511b06329..790040bc6e3 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mappei.dtd"> -<mapper namespace="org.sonar.core.issue.db.IssueMapper"> +<mapper namespace="org.sonar.db.issue.IssueMapper"> <sql id="issueColumns"> i.id, @@ -192,7 +192,8 @@ p.kee as componentKey, root.kee as projectKey from issues i - inner join (select p.id, p.uuid,p.kee from projects p where (p.root_id=#{id} and p.qualifier <> 'BRC') or (p.id=#{id})) p on p.uuid=i.component_uuid + inner join (select p.id, p.uuid,p.kee from projects p where (p.root_id=#{id} and p.qualifier <> 'BRC') or + (p.id=#{id})) p on p.uuid=i.component_uuid inner join rules r on r.id=i.rule_id left outer join projects root on root.uuid=i.project_uuid where i.status <> 'CLOSED' diff --git a/sonar-core/src/main/resources/org/sonar/core/template/LoadedTemplateMapper.xml b/sonar-db/src/main/resources/org/sonar/db/loadedtemplate/LoadedTemplateMapper.xml index 5e0f57f200d..0395aad517a 100644 --- a/sonar-core/src/main/resources/org/sonar/core/template/LoadedTemplateMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/loadedtemplate/LoadedTemplateMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.template.LoadedTemplateMapper"> +<mapper namespace="org.sonar.db.loadedtemplate.LoadedTemplateMapper"> <resultMap id="loadedTemplateResultMap" type="LoadedTemplate"> <result property="id" column="id"/> diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/custom/db/CustomMeasureMapper.xml b/sonar-db/src/main/resources/org/sonar/db/measure/CustomMeasureMapper.xml index 8d39aac0143..119cec178b4 100644 --- a/sonar-core/src/main/resources/org/sonar/core/measure/custom/db/CustomMeasureMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/measure/CustomMeasureMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.measure.custom.db.CustomMeasureMapper"> +<mapper namespace="org.sonar.db.measure.CustomMeasureMapper"> <sql id="selectColumns"> m.id, m.metric_id as metricId, diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterMapper.xml b/sonar-db/src/main/resources/org/sonar/db/measure/MeasureFilterMapper.xml index 0ed22491088..85e85b3fa4e 100644 --- a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/measure/MeasureFilterMapper.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.measure.db.MeasureFilterMapper"> +<mapper namespace="org.sonar.db.measure.MeasureFilterMapper"> - <select id="findSystemFilterByName" parameterType="string" resultType="MeasureFilter" > - select id, name, user_id as "userId", shared, description, data, created_at as "createdAt", updated_at as "updatedAt" + <select id="findSystemFilterByName" parameterType="string" resultType="MeasureFilter"> + select id, name, user_id as "userId", shared, description, data, created_at as "createdAt", updated_at as + "updatedAt" from measure_filters WHERE user_id is null and name=#{id} </select> - <insert id="insert" parameterType="MeasureFilter" keyColumn="id" useGeneratedKeys="true" keyProperty="id" > + <insert id="insert" parameterType="MeasureFilter" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO measure_filters (name, user_id, shared, description, data, created_at, updated_at) VALUES (#{name}, #{userId}, #{shared}, #{description}, #{data}, #{createdAt}, #{updatedAt}) </insert> diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml b/sonar-db/src/main/resources/org/sonar/db/measure/MeasureMapper.xml index 8c13c1d2472..7d83e993e05 100644 --- a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/measure/MeasureMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.measure.db.MeasureMapper"> +<mapper namespace="org.sonar.db.measure.MeasureMapper"> <sql id="measureColumns"> pm.id, @@ -70,8 +70,10 @@ </where> </select> - <select id="selectByComponentUuidAndProjectSnapshotIdAndStatusAndMetricIds" parameterType="map" resultType="org.sonar.core.measure.db.PastMeasureDto"> - SELECT pm.id as id, pm.metric_id as metricId, pm.rule_id as ruleId, pm.characteristic_id as characteristicId, pm.person_id as personId, pm.value as value + <select id="selectByComponentUuidAndProjectSnapshotIdAndStatusAndMetricIds" parameterType="map" + resultType="org.sonar.db.measure.PastMeasureDto"> + SELECT pm.id as id, pm.metric_id as metricId, pm.rule_id as ruleId, pm.characteristic_id as characteristicId, + pm.person_id as personId, pm.value as value FROM project_measures pm INNER JOIN snapshots s ON s.id=pm.snapshot_id AND s.status=#{status} INNER JOIN projects p ON p.id=s.project_id AND p.enabled=${_true} @@ -95,16 +97,17 @@ #{ruleId, jdbcType=INTEGER}, #{textValue, jdbcType=VARCHAR}, #{componentId, jdbcType=INTEGER}, #{alertStatus, jdbcType=VARCHAR}, #{alertText, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, #{characteristicId, jdbcType=INTEGER}, - #{personId, jdbcType=INTEGER}, #{variation1, jdbcType=DOUBLE}, #{variation2, jdbcType=DOUBLE}, #{variation3, jdbcType=DOUBLE}, + #{personId, jdbcType=INTEGER}, #{variation1, jdbcType=DOUBLE}, #{variation2, jdbcType=DOUBLE}, + #{variation3, jdbcType=DOUBLE}, #{variation4, jdbcType=DOUBLE}, #{variation5, jdbcType=DOUBLE}, #{dataValue, jdbcType=BINARY} ) </insert> <select id="selectMetricKeysForSnapshot" parameterType="long" resultType="string"> - SELECT DISTINCT m.name - FROM project_measures pm - INNER JOIN metrics m ON m.id=pm.metric_id - WHERE pm.snapshot_id=#{snapshotId} + SELECT DISTINCT m.name + FROM project_measures pm + INNER JOIN metrics m ON m.id=pm.metric_id + WHERE pm.snapshot_id=#{snapshotId} </select> </mapper> diff --git a/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml b/sonar-db/src/main/resources/org/sonar/db/metric/MetricMapper.xml index f11d214d376..ca4a79a3a82 100644 --- a/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/metric/MetricMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.metric.db.MetricMapper"> +<mapper namespace="org.sonar.db.metric.MetricMapper"> <sql id="metricColumns"> m.id, @@ -21,7 +21,7 @@ m.delete_historical_data as deleteHistoricalData </sql> - <select id="selectByKey" parameterType="map" resultType="org.sonar.core.metric.db.MetricDto"> + <select id="selectByKey" parameterType="map" resultType="org.sonar.db.metric.MetricDto"> SELECT <include refid="metricColumns"/> FROM metrics m @@ -30,7 +30,7 @@ </where> </select> - <select id="selectAllEnabled" parameterType="map" resultType="org.sonar.core.metric.db.MetricDto"> + <select id="selectAllEnabled" parameterType="map" resultType="org.sonar.db.metric.MetricDto"> SELECT <include refid="metricColumns"/> FROM metrics m @@ -48,7 +48,7 @@ ORDER BY UPPER(m.short_name), m.short_name </select> - <select id="selectAvailableCustomMetricsByComponentUuid" resultType="org.sonar.core.metric.db.MetricDto"> + <select id="selectAvailableCustomMetricsByComponentUuid" resultType="org.sonar.db.metric.MetricDto"> select <include refid="metricColumns"/> from metrics m @@ -75,7 +75,7 @@ </where> </select> - <insert id="insert" parameterType="org.sonar.core.metric.db.MetricDto" useGeneratedKeys="true" keyColumn="id" + <insert id="insert" parameterType="org.sonar.db.metric.MetricDto" useGeneratedKeys="true" keyColumn="id" keyProperty="id"> INSERT INTO metrics ( name, description, direction, domain, short_name, qualitative, val_type, user_managed, enabled, worst_value, @@ -89,7 +89,7 @@ ) </insert> - <update id="update" parameterType="org.sonar.core.metric.db.MetricDto"> + <update id="update" parameterType="org.sonar.db.metric.MetricDto"> update metrics set name=#{key, jdbcType=VARCHAR}, @@ -128,7 +128,7 @@ where name=#{key} </update> - <select id="selectByKeys" resultType="org.sonar.core.metric.db.MetricDto"> + <select id="selectByKeys" resultType="org.sonar.db.metric.MetricDto"> SELECT <include refid="metricColumns"/> FROM metrics m @@ -140,7 +140,7 @@ </where> </select> - <select id="selectByIds" resultType="org.sonar.core.metric.db.MetricDto"> + <select id="selectByIds" resultType="org.sonar.db.metric.MetricDto"> SELECT <include refid="metricColumns"/> FROM metrics m @@ -152,7 +152,7 @@ </where> </select> - <select id="selectById" resultType="org.sonar.core.metric.db.MetricDto"> + <select id="selectById" resultType="org.sonar.db.metric.MetricDto"> SELECT <include refid="metricColumns"/> FROM metrics m diff --git a/sonar-core/src/main/resources/org/sonar/core/notification/db/NotificationQueueMapper.xml b/sonar-db/src/main/resources/org/sonar/db/notification/NotificationQueueMapper.xml index d1dbc9b0875..c09eafc31d0 100644 --- a/sonar-core/src/main/resources/org/sonar/core/notification/db/NotificationQueueMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/notification/NotificationQueueMapper.xml @@ -2,22 +2,22 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mappei.dtd"> -<mapper namespace="org.sonar.core.notification.db.NotificationQueueMapper"> +<mapper namespace="org.sonar.db.notification.NotificationQueueMapper"> - <insert id="insert" parameterType="NotificationQueue" useGeneratedKeys="false" > + <insert id="insert" parameterType="NotificationQueue" useGeneratedKeys="false"> INSERT INTO notifications (data) VALUES (#{data}) </insert> - <delete id="delete" parameterType="long" > + <delete id="delete" parameterType="long"> delete from notifications where id=#{id} </delete> - <select id="count" resultType="long" > + <select id="count" resultType="long"> select count(*) from notifications </select> - <select id="findOldest" parameterType="int" resultType="NotificationQueue" > + <select id="findOldest" parameterType="int" resultType="NotificationQueue"> select id, data from notifications order by id asc @@ -25,18 +25,18 @@ </select> <!-- SQL Server --> - <select id="findOldest" parameterType="int" resultType="NotificationQueue" databaseId="mssql" > + <select id="findOldest" parameterType="int" resultType="NotificationQueue" databaseId="mssql"> select top (#{count}) id, data from notifications order by id asc </select> <!-- Oracle --> - <select id="findOldest" parameterType="int" resultType="NotificationQueue" databaseId="oracle" > + <select id="findOldest" parameterType="int" resultType="NotificationQueue" databaseId="oracle"> select * from (select - id, data - from notifications - order by id asc + id, data + from notifications + order by id asc ) where rownum <= #{count} </select> diff --git a/sonar-core/src/main/resources/org/sonar/core/permission/PermissionMapper.xml b/sonar-db/src/main/resources/org/sonar/db/permission/PermissionMapper.xml index efb946a92c3..79a705a44dc 100644 --- a/sonar-core/src/main/resources/org/sonar/core/permission/PermissionMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/permission/PermissionMapper.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.permission.PermissionMapper"> +<mapper namespace="org.sonar.db.permission.PermissionMapper"> <select id="selectUsers" parameterType="map" resultType="UserWithPermission"> SELECT u.login as login, u.name as name, user_role.role as permission FROM users u LEFT JOIN user_roles user_role ON user_role.user_id=u.id - AND user_role.role=#{query.permission} + AND user_role.role=#{query.permission} <if test="componentId != null"> AND user_role.resource_id=#{componentId} </if> @@ -36,7 +36,7 @@ (SELECT g.name as name, g.description as description, group_role.role as permission FROM groups g LEFT JOIN group_roles group_role ON group_role.group_id=g.id - AND group_role.role=#{query.permission} + AND group_role.role=#{query.permission} <if test="componentId != null"> AND group_role.resource_id=#{componentId} </if> diff --git a/sonar-core/src/main/resources/org/sonar/core/permission/PermissionTemplateMapper.xml b/sonar-db/src/main/resources/org/sonar/db/permission/PermissionTemplateMapper.xml index c153b3564fd..95567f2e5c2 100644 --- a/sonar-core/src/main/resources/org/sonar/core/permission/PermissionTemplateMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/permission/PermissionTemplateMapper.xml @@ -1,47 +1,47 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.permission.PermissionTemplateMapper"> +<mapper namespace="org.sonar.db.permission.PermissionTemplateMapper"> - <insert id="insert" parameterType="PermissionTemplate" keyColumn="id" useGeneratedKeys="true" keyProperty="id" > + <insert id="insert" parameterType="PermissionTemplate" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO permission_templates (name, kee, description, key_pattern, created_at, updated_at) VALUES (#{name}, #{kee}, #{description}, #{keyPattern}, #{createdAt}, #{updatedAt}) </insert> - <update id="update" parameterType="PermissionTemplate" > + <update id="update" parameterType="PermissionTemplate"> UPDATE permission_templates SET name = #{name}, description = #{description}, key_pattern = #{keyPattern}, updated_at = #{updatedAt} WHERE id = #{id} </update> - <delete id="delete" parameterType="long" > + <delete id="delete" parameterType="long"> DELETE FROM permission_templates WHERE id = #{templateId} </delete> - <delete id="deleteUsersPermissions" parameterType="long" > + <delete id="deleteUsersPermissions" parameterType="long"> DELETE FROM perm_templates_users WHERE template_id = #{templateId} </delete> - <delete id="deleteGroupsPermissions" parameterType="long" > + <delete id="deleteGroupsPermissions" parameterType="long"> DELETE FROM perm_templates_groups WHERE template_id = #{templateId} </delete> - <insert id="insertUserPermission" parameterType="PermissionTemplateUser" > + <insert id="insertUserPermission" parameterType="PermissionTemplateUser"> INSERT INTO perm_templates_users (template_id, user_id, permission_reference, created_at, updated_at) VALUES (#{templateId}, #{userId}, #{permission}, #{createdAt}, #{updatedAt}) </insert> - <delete id="deleteUserPermission" parameterType="PermissionTemplateUser" > + <delete id="deleteUserPermission" parameterType="PermissionTemplateUser"> DELETE FROM perm_templates_users WHERE template_id = #{templateId} AND user_id = #{userId} AND permission_reference = #{permission} </delete> - <insert id="insertGroupPermission" parameterType="PermissionTemplateGroup" > + <insert id="insertGroupPermission" parameterType="PermissionTemplateGroup"> INSERT INTO perm_templates_groups (template_id, group_id, permission_reference, created_at, updated_at) VALUES (#{templateId}, #{groupId}, #{permission}, #{createdAt}, #{updatedAt}) </insert> @@ -70,8 +70,8 @@ SELECT u.login as login, u.name as name, ptu.permission_reference as permission FROM users u LEFT JOIN perm_templates_users ptu ON ptu.user_id=u.id - AND ptu.permission_reference=#{query.permission} - AND ptu.template_id=#{templateId} + AND ptu.permission_reference=#{query.permission} + AND ptu.template_id=#{templateId} <where> u.active = ${_true} <choose> @@ -94,8 +94,8 @@ (SELECT g.name as name, g.description as description, ptg.permission_reference as permission FROM groups g LEFT JOIN perm_templates_groups ptg ON ptg.group_id=g.id - AND ptg.permission_reference=#{query.permission} - AND ptg.template_id=#{templateId} + AND ptg.permission_reference=#{query.permission} + AND ptg.template_id=#{templateId} UNION -- Add Anyone group permission SELECT #{anyoneGroup} as name, NULL as description, ptg.permission_reference as permission @@ -114,46 +114,46 @@ ORDER BY groups.name </select> - <select id="selectByKey" parameterType="String" resultType="PermissionTemplate" > + <select id="selectByKey" parameterType="String" resultType="PermissionTemplate"> SELECT id, name, kee, description, key_pattern AS keyPattern, created_at AS createdAt, updated_at AS updatedAt FROM permission_templates WHERE kee = #{kee} </select> - <select id="selectAllPermissionTemplates" resultType="PermissionTemplate" > + <select id="selectAllPermissionTemplates" resultType="PermissionTemplate"> SELECT id, name, kee, description, key_pattern AS keyPattern, created_at AS createdAt, updated_at AS updatedAt FROM permission_templates </select> - <select id="selectTemplateUsersPermissions" parameterType="String" resultMap="fullPermissionsTemplateResult" > - SELECT pt.id AS template_id, - pt.name AS template_name, - pt.description AS template_description, - pt.key_pattern AS template_key_pattern, - pt.created_at AS template_created_at, - pt.updated_at AS template_updated_at, - ptu.id AS permission_template_user_id, - ptu.permission_reference AS user_permission, - ptu.user_id AS user_id, - u.name AS user_name, - u.login AS user_login + <select id="selectTemplateUsersPermissions" parameterType="String" resultMap="fullPermissionsTemplateResult"> + SELECT pt.id AS template_id, + pt.name AS template_name, + pt.description AS template_description, + pt.key_pattern AS template_key_pattern, + pt.created_at AS template_created_at, + pt.updated_at AS template_updated_at, + ptu.id AS permission_template_user_id, + ptu.permission_reference AS user_permission, + ptu.user_id AS user_id, + u.name AS user_name, + u.login AS user_login FROM permission_templates pt INNER JOIN perm_templates_users ptu ON ptu.template_id = pt.id INNER JOIN users u ON u.id = ptu.user_id AND u.active = ${_true} WHERE pt.kee = #{templateKey} </select> - <select id="selectTemplateGroupsPermissions" parameterType="String" resultMap="fullPermissionsTemplateResult" > - SELECT pt.id AS template_id, - pt.name AS template_name, - pt.description AS template_description, - pt.key_pattern AS template_key_pattern, - pt.created_at AS template_created_at, - pt.updated_at AS template_updated_at, - ptg.id AS permission_template_group_id, - ptg.permission_reference AS group_permission, - ptg.group_id AS group_id, - g.name AS group_name + <select id="selectTemplateGroupsPermissions" parameterType="String" resultMap="fullPermissionsTemplateResult"> + SELECT pt.id AS template_id, + pt.name AS template_name, + pt.description AS template_description, + pt.key_pattern AS template_key_pattern, + pt.created_at AS template_created_at, + pt.updated_at AS template_updated_at, + ptg.id AS permission_template_group_id, + ptg.permission_reference AS group_permission, + ptg.group_id AS group_id, + g.name AS group_name FROM permission_templates pt INNER JOIN perm_templates_groups ptg ON ptg.template_id = pt.id LEFT OUTER JOIN groups g ON g.id = ptg.group_id diff --git a/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper.xml b/sonar-db/src/main/resources/org/sonar/db/property/PropertiesMapper.xml index 18297848cd6..d36c205772c 100644 --- a/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/property/PropertiesMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.properties.PropertiesMapper"> +<mapper namespace="org.sonar.db.property.PropertiesMapper"> <select id="findUsersForNotification" parameterType="map" resultType="String"> select u.login @@ -48,9 +48,11 @@ </select> <select id="selectDescendantModuleProperties" parameterType="String" resultType="Property"> - SELECT prop.id as id, prop.prop_key as "key", prop.text_value as value, prop.resource_id as resourceId, prop.user_id as userId + SELECT prop.id as id, prop.prop_key as "key", prop.text_value as value, prop.resource_id as resourceId, prop.user_id + as userId FROM properties prop - INNER JOIN (SELECT p.id FROM projects p<include refid="org.sonar.core.component.db.ComponentMapper.modulesTreeQuery"/>) modules on modules.id=prop.resource_id + INNER JOIN (SELECT p.id FROM projects p<include refid="org.sonar.db.component.ComponentMapper.modulesTreeQuery"/>) + modules on modules.id=prop.resource_id WHERE prop.user_id IS NULL </select> diff --git a/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml b/sonar-db/src/main/resources/org/sonar/db/purge/PurgeMapper.xml index de41b816f28..1d6bed47806 100644 --- a/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/purge/PurgeMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.purge.PurgeMapper"> +<mapper namespace="org.sonar.db.purge.PurgeMapper"> <select id="selectSnapshotIds" parameterType="map" resultType="long"> select s.id from snapshots s diff --git a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/ProjectQgateAssociationMapper.xml b/sonar-db/src/main/resources/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.xml index 9fcd4d16e22..bbcf7b52121 100644 --- a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/ProjectQgateAssociationMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/qualitygate/ProjectQgateAssociationMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.qualitygate.db.ProjectQgateAssociationMapper"> +<mapper namespace="org.sonar.db.qualitygate.ProjectQgateAssociationMapper"> <select id="selectProjects" parameterType="map" resultType="ProjectQgateAssociation"> SELECT proj.id as id, proj.name as name, prop.text_value as gateId @@ -9,7 +9,8 @@ <if test="query.projectSearch() != null"> JOIN resource_index ind ON ind.root_project_id=proj.id </if> - LEFT JOIN properties prop ON prop.resource_id=proj.id AND prop.prop_key='sonar.qualitygate' AND prop.text_value LIKE #{gateId} + LEFT JOIN properties prop ON prop.resource_id=proj.id AND prop.prop_key='sonar.qualitygate' AND prop.text_value LIKE + #{gateId} <where> <choose> <when test="query.membership() == 'selected'"> diff --git a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateConditionMapper.xml b/sonar-db/src/main/resources/org/sonar/db/qualitygate/QualityGateConditionMapper.xml index d4170d89d0f..0923db5ae60 100644 --- a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateConditionMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/qualitygate/QualityGateConditionMapper.xml @@ -1,32 +1,39 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.qualitygate.db.QualityGateConditionMapper"> +<mapper namespace="org.sonar.db.qualitygate.QualityGateConditionMapper"> - <insert id="insert" parameterType="QualityGateCondition" keyColumn="id" useGeneratedKeys="true" keyProperty="id" > - insert into quality_gate_conditions (qgate_id, metric_id, operator, value_error, value_warning, period, created_at, updated_at) - values (#{qualityGateId}, #{metricId}, #{operator}, #{errorThreshold}, #{warningThreshold}, #{period}, #{createdAt}, #{updatedAt}) + <insert id="insert" parameterType="QualityGateCondition" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> + insert into quality_gate_conditions (qgate_id, metric_id, operator, value_error, value_warning, period, created_at, + updated_at) + values (#{qualityGateId}, #{metricId}, #{operator}, #{errorThreshold}, #{warningThreshold}, #{period}, #{createdAt}, + #{updatedAt}) </insert> <sql id="conditionColumns"> - id, qgate_id as qualityGateId, metric_id as metricId, operator, value_warning as warningThreshold, value_error as errorThreshold, period, - created_at as createdAt, updated_at as updatedAt + id, qgate_id as qualityGateId, metric_id as metricId, operator, value_warning as warningThreshold, value_error as + errorThreshold, period, + created_at as createdAt, updated_at as updatedAt </sql> <select id="selectForQualityGate" resultType="QualityGateCondition" parameterType="long"> - select <include refid="conditionColumns"/> from quality_gate_conditions where qgate_id=#{qGateId} + select + <include refid="conditionColumns"/> + from quality_gate_conditions where qgate_id=#{qGateId} order by id asc </select> <select id="selectById" parameterType="long" resultType="QualityGateCondition"> - select <include refid="conditionColumns"/> from quality_gate_conditions where id=#{id} + select + <include refid="conditionColumns"/> + from quality_gate_conditions where id=#{id} </select> - <update id="delete" parameterType="long" > + <update id="delete" parameterType="long"> delete from quality_gate_conditions where id=#{id} </update> - <update id="update" parameterType="QualityGateCondition" > + <update id="update" parameterType="QualityGateCondition"> update quality_gate_conditions set metric_id=#{metricId}, operator=#{operator}, @@ -37,7 +44,7 @@ where id=#{id} </update> - <delete id="deleteConditionsWithInvalidMetrics" > + <delete id="deleteConditionsWithInvalidMetrics"> delete from quality_gate_conditions where metric_id not in (select id from metrics where enabled=${_true}) </delete> diff --git a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateMapper.xml b/sonar-db/src/main/resources/org/sonar/db/qualitygate/QualityGateMapper.xml index f54a4a8414b..64d2e58efb4 100644 --- a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/qualitygate/QualityGateMapper.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.qualitygate.db.QualityGateMapper"> +<mapper namespace="org.sonar.db.qualitygate.QualityGateMapper"> - <insert id="insert" parameterType="QualityGate" keyColumn="id" useGeneratedKeys="true" keyProperty="id" > + <insert id="insert" parameterType="QualityGate" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> insert into quality_gates (name, created_at, updated_at) values (#{name}, #{createdAt}, #{updatedAt}) </insert> @@ -13,25 +13,31 @@ </sql> <select id="selectAll" resultType="QualityGate"> - select <include refid="gateColumns"/> from quality_gates + select + <include refid="gateColumns"/> + from quality_gates order by name asc </select> <select id="selectByName" parameterType="String" resultType="QualityGate"> - select <include refid="gateColumns"/> from quality_gates + select + <include refid="gateColumns"/> + from quality_gates where name=#{name} </select> <select id="selectById" parameterType="long" resultType="QualityGate"> - select <include refid="gateColumns"/> from quality_gates + select + <include refid="gateColumns"/> + from quality_gates where id=#{id} </select> - <update id="delete" parameterType="long" > + <update id="delete" parameterType="long"> delete from quality_gates where id=#{id} </update> - <update id="update" parameterType="QualityGate" > + <update id="update" parameterType="QualityGate"> update quality_gates set name=#{name}, updated_at=#{updatedAt} diff --git a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/qualityprofile/ActiveRuleMapper.xml index 0775c410de8..23ac091ce8a 100644 --- a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/qualityprofile/ActiveRuleMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.qualityprofile.db.ActiveRuleMapper"> +<mapper namespace="org.sonar.db.qualityprofile.ActiveRuleMapper"> <sql id="activeRuleKeyColumns"> a.id, @@ -36,7 +36,8 @@ <sql id="activeRuleJoin"> LEFT JOIN rules_profiles qp ON qp.id=a.profile_id LEFT JOIN rules_profiles profile_parent ON profile_parent.kee=qp.parent_kee - LEFT JOIN active_rules active_rule_parent ON active_rule_parent.profile_id=profile_parent.id AND a.rule_id=active_rule_parent.rule_id + LEFT JOIN active_rules active_rule_parent ON active_rule_parent.profile_id=profile_parent.id AND + a.rule_id=active_rule_parent.rule_id </sql> <select id="selectAfterDate" parameterType="Date" resultType="ActiveRule" @@ -67,7 +68,7 @@ WHERE id=#{id} </update> - <update id="delete" parameterType="int" > + <update id="delete" parameterType="int"> DELETE FROM active_rules WHERE id=#{id} </update> diff --git a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/QualityProfileMapper.xml b/sonar-db/src/main/resources/org/sonar/db/qualityprofile/QualityProfileMapper.xml index 814b3fa4439..873a983c4cb 100644 --- a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/QualityProfileMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/qualityprofile/QualityProfileMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.qualityprofile.db.QualityProfileMapper"> +<mapper namespace="org.sonar.db.qualityprofile.QualityProfileMapper"> <sql id="profilesColumns"> p.id as id, @@ -15,12 +15,12 @@ p.rules_updated_at as rulesUpdatedAt </sql> - <insert id="insert" parameterType="QualityProfile" keyColumn="id" useGeneratedKeys="true" keyProperty="id" > + <insert id="insert" parameterType="QualityProfile" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO rules_profiles (kee, parent_kee, name, language, is_default, created_at, updated_at, rules_updated_at) VALUES (#{kee}, #{parentKee}, #{name}, #{language}, #{isDefault}, #{createdAt}, #{updatedAt}, #{rulesUpdatedAt,}) </insert> - <update id="update" parameterType="QualityProfile" > + <update id="update" parameterType="QualityProfile"> UPDATE rules_profiles SET name=#{name}, language=#{language}, @@ -31,65 +31,74 @@ WHERE id=#{id} </update> - <update id="delete" parameterType="int" > + <update id="delete" parameterType="int"> DELETE FROM rules_profiles WHERE id=#{id} </update> <select id="selectAll" parameterType="map" resultType="QualityProfile"> - SELECT <include refid="profilesColumns"/> + SELECT + <include refid="profilesColumns"/> FROM rules_profiles p ORDER BY p.name, p.language </select> <select id="selectByNameAndLanguage" parameterType="map" resultType="QualityProfile"> - SELECT <include refid="profilesColumns"/> + SELECT + <include refid="profilesColumns"/> FROM rules_profiles p WHERE p.name=#{name} AND p.language=#{language} </select> <select id="selectByKey" parameterType="string" resultType="QualityProfile"> - SELECT <include refid="profilesColumns"/> + SELECT + <include refid="profilesColumns"/> FROM rules_profiles p WHERE p.kee=#{id} </select> <select id="selectByLanguage" parameterType="String" resultType="QualityProfile"> - SELECT <include refid="profilesColumns"/> + SELECT + <include refid="profilesColumns"/> FROM rules_profiles p WHERE p.language=#{language} ORDER BY p.name </select> <select id="selectById" parameterType="Integer" resultType="QualityProfile"> - SELECT <include refid="profilesColumns"/> + SELECT + <include refid="profilesColumns"/> FROM rules_profiles p WHERE p.id=#{id} </select> <select id="selectParent" parameterType="string" resultType="QualityProfile"> - SELECT <include refid="profilesColumns"/> + SELECT + <include refid="profilesColumns"/> FROM rules_profiles p INNER JOIN rules_profiles child ON child.parent_kee=p.kee AND child.kee=#{id} </select> <select id="selectParentById" parameterType="int" resultType="QualityProfile"> - SELECT <include refid="profilesColumns"/> + SELECT + <include refid="profilesColumns"/> FROM rules_profiles p INNER JOIN rules_profiles child ON child.parent_kee=p.kee and child.id=#{id} </select> <select id="selectChildren" parameterType="string" resultType="QualityProfile"> - SELECT <include refid="profilesColumns"/> + SELECT + <include refid="profilesColumns"/> FROM rules_profiles p WHERE p.parent_kee=#{id} ORDER BY p.name </select> <select id="selectDefaultProfile" parameterType="map" resultType="QualityProfile"> - SELECT <include refid="profilesColumns"/> + SELECT + <include refid="profilesColumns"/> FROM rules_profiles p WHERE p.is_default=${_true} - AND p.language=#{language} + AND p.language=#{language} </select> <select id="selectProjects" resultType="Component"> @@ -103,11 +112,11 @@ </where> </select> - <select id="selectSelectedProjects" resultType="org.sonar.core.qualityprofile.db.ProjectQprofileAssociationDto"> + <select id="selectSelectedProjects" resultType="org.sonar.db.qualityprofile.ProjectQprofileAssociationDto"> SELECT pp.id as id, pj.id as projectId, pj.uuid as projectUuid, pj.name as projectName, pp.profile_key as profileKey FROM projects pj JOIN project_qprofiles pp ON pp.project_uuid = pj.uuid - AND pp.profile_key = #{profileKey} + AND pp.profile_key = #{profileKey} <where> AND pj.scope='PRJ' AND pj.qualifier='TRK' AND UPPER(pj.name) LIKE #{nameQuery} @@ -115,11 +124,11 @@ ORDER BY pj.name ASC </select> - <select id="selectDeselectedProjects" resultType="org.sonar.core.qualityprofile.db.ProjectQprofileAssociationDto"> + <select id="selectDeselectedProjects" resultType="org.sonar.db.qualityprofile.ProjectQprofileAssociationDto"> SELECT pp.id as id, pj.id as projectId, pj.uuid as projectUuid, pj.name as projectName, pp.profile_key as profileKey FROM projects pj LEFT JOIN project_qprofiles pp ON pp.project_uuid = pj.uuid - AND pp.profile_key = #{profileKey} + AND pp.profile_key = #{profileKey} <where> AND pj.scope='PRJ' AND pj.qualifier='TRK' AND UPPER(pj.name) LIKE #{nameQuery} @@ -128,11 +137,11 @@ ORDER BY pj.name ASC </select> - <select id="selectProjectAssociations" resultType="org.sonar.core.qualityprofile.db.ProjectQprofileAssociationDto"> + <select id="selectProjectAssociations" resultType="org.sonar.db.qualityprofile.ProjectQprofileAssociationDto"> SELECT pp.id as id, pj.id as projectId, pj.uuid as projectUuid, pj.name as projectName, pp.profile_key as profileKey FROM projects pj LEFT JOIN project_qprofiles pp ON pp.project_uuid = pj.uuid - AND pp.profile_key = #{profileKey} + AND pp.profile_key = #{profileKey} <where> AND pj.scope='PRJ' AND pj.qualifier='TRK' AND UPPER(pj.name) LIKE #{nameQuery} @@ -151,7 +160,7 @@ </where> </select> - <select id="countProjectsByProfile" resultType="org.sonar.core.qualityprofile.db.QualityProfileProjectCount"> + <select id="countProjectsByProfile" resultType="org.sonar.db.qualityprofile.QualityProfileProjectCount"> SELECT pp.profile_key as profileKey, count(projects.id) as projectCount FROM projects projects INNER JOIN project_qprofiles pp ON pp.project_uuid=projects.uuid @@ -161,20 +170,22 @@ </select> <select id="selectByProjectIdAndLanguage" parameterType="map" resultType="QualityProfile"> - SELECT <include refid="profilesColumns"/> + SELECT + <include refid="profilesColumns"/> FROM rules_profiles p JOIN project_qprofiles pp ON pp.profile_key=p.kee JOIN projects project ON pp.project_uuid=project.uuid - AND project.id=#{projectId} + AND project.id=#{projectId} WHERE p.language=#{language} </select> <select id="selectByProjectAndLanguage" parameterType="map" resultType="QualityProfile"> - SELECT <include refid="profilesColumns"/> + SELECT + <include refid="profilesColumns"/> FROM rules_profiles p JOIN project_qprofiles pp ON pp.profile_key=p.kee JOIN projects project ON pp.project_uuid=project.uuid - AND project.kee=#{projectKey} + AND project.kee=#{projectKey} WHERE p.language=#{language} </select> diff --git a/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml index ce3320f987d..fd93ba7b0a5 100644 --- a/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.rule.RuleMapper"> +<mapper namespace="org.sonar.db.rule.RuleMapper"> <sql id="selectColumns"> r.id, @@ -146,10 +146,15 @@ <insert id="batchInsert" parameterType="Rule" useGeneratedKeys="false"> insert into rules <include refid="insertColumns"/> - values (#{ruleKey,jdbcType=VARCHAR}, #{repositoryKey,jdbcType=VARCHAR}, #{description,jdbcType=CLOB}, #{descriptionFormat,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{configKey,jdbcType=VARCHAR}, - #{severity,jdbcType=INTEGER}, #{isTemplate,jdbcType=BOOLEAN}, #{language,jdbcType=VARCHAR}, #{templateId,jdbcType=INTEGER}, - #{subCharacteristicId,jdbcType=INTEGER}, #{defaultSubCharacteristicId,jdbcType=INTEGER}, #{remediationFunction,jdbcType=VARCHAR}, #{defaultRemediationFunction,jdbcType=VARCHAR}, - #{remediationCoefficient,jdbcType=VARCHAR}, #{defaultRemediationCoefficient,jdbcType=VARCHAR}, #{remediationOffset,jdbcType=VARCHAR}, #{defaultRemediationOffset,jdbcType=VARCHAR}, + values (#{ruleKey,jdbcType=VARCHAR}, #{repositoryKey,jdbcType=VARCHAR}, #{description,jdbcType=CLOB}, + #{descriptionFormat,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, + #{configKey,jdbcType=VARCHAR}, + #{severity,jdbcType=INTEGER}, #{isTemplate,jdbcType=BOOLEAN}, #{language,jdbcType=VARCHAR}, + #{templateId,jdbcType=INTEGER}, + #{subCharacteristicId,jdbcType=INTEGER}, #{defaultSubCharacteristicId,jdbcType=INTEGER}, + #{remediationFunction,jdbcType=VARCHAR}, #{defaultRemediationFunction,jdbcType=VARCHAR}, + #{remediationCoefficient,jdbcType=VARCHAR}, #{defaultRemediationCoefficient,jdbcType=VARCHAR}, + #{remediationOffset,jdbcType=VARCHAR}, #{defaultRemediationOffset,jdbcType=VARCHAR}, #{effortToFixDescription}, #{tagsField}, #{systemTagsField}, #{noteData}, #{noteUserLogin}, #{noteCreatedAt}, #{noteUpdatedAt,jdbcType=TIMESTAMP}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}) </insert> diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/SemaphoreMapper.xml b/sonar-db/src/main/resources/org/sonar/db/semaphore/SemaphoreMapper.xml index 4c42b26ea17..5d1c1028478 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/SemaphoreMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/semaphore/SemaphoreMapper.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.persistence.SemaphoreMapper"> +<mapper namespace="org.sonar.db.semaphore.SemaphoreMapper"> - <insert id="initialize" parameterType="map" useGeneratedKeys="false" > + <insert id="initialize" parameterType="map" useGeneratedKeys="false"> INSERT INTO semaphores (name, checksum, created_at, updated_at, locked_at) VALUES (#{name}, #{checksum}, #{createdAt}, #{updatedAt}, #{lockedAt}) </insert> @@ -17,16 +17,16 @@ </if> </update> - <delete id="release" parameterType="String" > + <delete id="release" parameterType="String"> delete from semaphores where name=#{id} </delete> - <select id="selectSemaphore" parameterType="String" resultType="Semaphore" > + <select id="selectSemaphore" parameterType="String" resultType="Semaphore"> select s.id, s.name as name, s.locked_at as lockedAt, s.created_at as createdAt, s.updated_at as updatedAt from semaphores s where s.name=#{name} </select> - <update id="update" parameterType="map" > + <update id="update" parameterType="map"> update semaphores set updated_at = #{now} where name=#{name} diff --git a/sonar-core/src/main/resources/org/sonar/core/source/db/FileSourceMapper.xml b/sonar-db/src/main/resources/org/sonar/db/source/FileSourceMapper.xml index 290ab9f2d31..dd6a83ed5ff 100644 --- a/sonar-core/src/main/resources/org/sonar/core/source/db/FileSourceMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/source/FileSourceMapper.xml @@ -2,43 +2,46 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.source.db.FileSourceMapper"> +<mapper namespace="org.sonar.db.source.FileSourceMapper"> - <select id="select" parameterType="map" resultType="org.sonar.core.source.db.FileSourceDto"> + <select id="select" parameterType="map" resultType="org.sonar.db.source.FileSourceDto"> SELECT id, project_uuid as projectUuid, file_uuid as fileUuid, created_at as createdAt, updated_at as updatedAt, - binary_data as binaryData, line_hashes as lineHashes, data_hash as dataHash, src_hash as srcHash, data_type as dataType + binary_data as binaryData, line_hashes as lineHashes, data_hash as dataHash, src_hash as srcHash, data_type as + dataType FROM file_sources WHERE file_uuid = #{fileUuid} and data_type = #{dataType} </select> - <select id="selectHashesForProject" parameterType="map" resultType="org.sonar.core.source.db.FileSourceDto"> + <select id="selectHashesForProject" parameterType="map" resultType="org.sonar.db.source.FileSourceDto"> SELECT id, file_uuid as fileUuid, data_hash as dataHash, src_hash as srcHash, updated_at as updatedAt FROM file_sources WHERE project_uuid = #{projectUuid} and data_type=#{dataType} </select> - <insert id="insert" parameterType="org.sonar.core.source.db.FileSourceDto" useGeneratedKeys="false"> - INSERT INTO file_sources (project_uuid, file_uuid, created_at, updated_at, binary_data, line_hashes, data_hash, src_hash, data_type) + <insert id="insert" parameterType="org.sonar.db.source.FileSourceDto" useGeneratedKeys="false"> + INSERT INTO file_sources (project_uuid, file_uuid, created_at, updated_at, binary_data, line_hashes, data_hash, + src_hash, data_type) VALUES (#{projectUuid,jdbcType=VARCHAR}, #{fileUuid,jdbcType=VARCHAR}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, #{binaryData,jdbcType=BLOB}, #{lineHashes,jdbcType=CLOB}, #{dataHash,jdbcType=VARCHAR}, #{srcHash,jdbcType=VARCHAR},#{dataType,jdbcType=VARCHAR}) </insert> - <update id="update" parameterType="org.sonar.core.source.db.FileSourceDto" useGeneratedKeys="false"> + <update id="update" parameterType="org.sonar.db.source.FileSourceDto" useGeneratedKeys="false"> UPDATE file_sources SET - updated_at = #{updatedAt,jdbcType=BIGINT}, - binary_data = #{binaryData,jdbcType=BLOB}, - line_hashes = #{lineHashes,jdbcType=CLOB}, - data_hash = #{dataHash,jdbcType=VARCHAR}, - src_hash = #{srcHash,jdbcType=VARCHAR} + updated_at = #{updatedAt,jdbcType=BIGINT}, + binary_data = #{binaryData,jdbcType=BLOB}, + line_hashes = #{lineHashes,jdbcType=CLOB}, + data_hash = #{dataHash,jdbcType=VARCHAR}, + src_hash = #{srcHash,jdbcType=VARCHAR} WHERE id = #{id} </update> - <update id="updateDateWhenUpdatedDateIsZero" parameterType="org.sonar.core.source.db.FileSourceDto" useGeneratedKeys="false"> + <update id="updateDateWhenUpdatedDateIsZero" parameterType="org.sonar.db.source.FileSourceDto" + useGeneratedKeys="false"> UPDATE file_sources SET updated_at = #{date,jdbcType=BIGINT} WHERE project_uuid = #{projectUuid} - AND updated_at = 0 + AND updated_at = 0 </update> </mapper> diff --git a/sonar-core/src/main/resources/org/sonar/core/source/db/SnapshotDataMapper.xml b/sonar-db/src/main/resources/org/sonar/db/source/SnapshotDataMapper.xml index 2d380360fe8..022381e4df8 100644 --- a/sonar-core/src/main/resources/org/sonar/core/source/db/SnapshotDataMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/source/SnapshotDataMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.source.db.SnapshotDataMapper"> +<mapper namespace="org.sonar.db.source.SnapshotDataMapper"> <sql id="snapshotDataColumns"> snapshot_id AS "snapshotId", @@ -10,7 +10,8 @@ </sql> <select id="selectSnapshotData" parameterType="map" resultType="SnapshotData"> - SELECT <include refid="snapshotDataColumns"/> + SELECT + <include refid="snapshotDataColumns"/> FROM snapshot_data WHERE snapshot_id = #{sid} AND data_type IN @@ -18,7 +19,8 @@ </select> <select id="selectSnapshotDataByComponentKey" parameterType="map" resultType="SnapshotData"> - SELECT <include refid="snapshotDataColumns"/> + SELECT + <include refid="snapshotDataColumns"/> FROM snapshot_data sd INNER JOIN projects p ON p.id=sd.resource_id and p.enabled=${_true} WHERE p.kee = #{componentKey} @@ -30,7 +32,8 @@ insert into snapshot_data (resource_id, snapshot_id, snapshot_data, data_type, created_at, updated_at) values ( - #{resourceId,jdbcType=INTEGER}, #{snapshotId,jdbcType=INTEGER}, #{data,jdbcType=CLOB}, #{dataType,jdbcType=VARCHAR}, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) + #{resourceId,jdbcType=INTEGER}, #{snapshotId,jdbcType=INTEGER}, #{data,jdbcType=CLOB}, #{dataType,jdbcType=VARCHAR}, + CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) </insert> </mapper> diff --git a/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/AuthorMapper.xml index f12ea11d5d4..440d2d74701 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/AuthorMapper.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.user.AuthorMapper"> +<mapper namespace="org.sonar.db.user.AuthorMapper"> - <select id="selectByLogin" parameterType="string" resultType="Author" > + <select id="selectByLogin" parameterType="string" resultType="Author"> SELECT id, person_id AS personId, login, created_at AS createdAt, updated_at AS updatedAt FROM authors WHERE login=#{id} </select> - <select id="countDeveloperLogins" parameterType="long" resultType="int" > + <select id="countDeveloperLogins" parameterType="long" resultType="int"> SELECT count(id) FROM authors WHERE person_id=#{id} </select> - <insert id="insert" parameterType="Author" keyColumn="id" useGeneratedKeys="true" keyProperty="id" > + <insert id="insert" parameterType="Author" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO authors (person_id, login, created_at, updated_at) VALUES (#{personId}, #{login}, #{createdAt}, #{updatedAt}) diff --git a/sonar-core/src/main/resources/org/sonar/core/user/AuthorizationMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/AuthorizationMapper.xml index 52601598415..f33a7ae0640 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/AuthorizationMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/AuthorizationMapper.xml @@ -1,34 +1,40 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.user.AuthorizationMapper"> +<mapper namespace="org.sonar.db.user.AuthorizationMapper"> <select id="keepAuthorizedComponentKeysForUser" parameterType="map" resultType="string"> SELECT p.kee FROM group_roles gr, projects p WHERE - gr.role=#{role} - and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where gu.user_id=#{userId})) - and (gr.resource_id = p.root_id or gr.resource_id = p.id) and - <foreach collection="componentKeys" open="(" close=")" item="element" index="index" separator=" or " >p.kee=#{element}</foreach> + gr.role=#{role} + and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where gu.user_id=#{userId})) + and (gr.resource_id = p.root_id or gr.resource_id = p.id) and + <foreach collection="componentKeys" open="(" close=")" item="element" index="index" separator=" or "> + p.kee=#{element} + </foreach> UNION SELECT p.kee FROM user_roles ur INNER JOIN projects p on p.id = ur.resource_id WHERE - ur.role=#{role} - and ur.user_id=#{userId} and - <foreach collection="componentKeys" open="(" close=")" item="element" index="index" separator=" or " >p.kee=#{element}</foreach> + ur.role=#{role} + and ur.user_id=#{userId} and + <foreach collection="componentKeys" open="(" close=")" item="element" index="index" separator=" or "> + p.kee=#{element} + </foreach> </select> <select id="keepAuthorizedComponentKeysForAnonymous" parameterType="map" resultType="string"> - SELECT p.kee - FROM group_roles gr, projects p - WHERE - gr.role=#{role} - and gr.group_id is null - and (gr.resource_id = p.root_id or gr.resource_id = p.id) and - <foreach collection="componentKeys" open="(" close=")" item="element" index="index" separator=" or " >p.kee=#{element}</foreach> + SELECT p.kee + FROM group_roles gr, projects p + WHERE + gr.role=#{role} + and gr.group_id is null + and (gr.resource_id = p.root_id or gr.resource_id = p.id) and + <foreach collection="componentKeys" open="(" close=")" item="element" index="index" separator=" or "> + p.kee=#{element} + </foreach> </select> <select id="keepAuthorizedProjectIdsForUser" parameterType="map" resultType="long"> @@ -38,7 +44,9 @@ gr.role=#{role} and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where gu.user_id=#{userId})) and - <foreach collection="componentIds" open="(" close=")" item="element" index="index" separator=" or ">gr.resource_id=#{element}</foreach> + <foreach collection="componentIds" open="(" close=")" item="element" index="index" separator=" or "> + gr.resource_id=#{element} + </foreach> UNION SELECT p.id FROM user_roles ur @@ -46,7 +54,9 @@ WHERE ur.role=#{role} and ur.user_id=#{userId} and - <foreach collection="componentIds" open="(" close=")" item="element" index="index" separator=" or ">p.id=#{element}</foreach> + <foreach collection="componentIds" open="(" close=")" item="element" index="index" separator=" or "> + p.id=#{element} + </foreach> </select> <select id="keepAuthorizedProjectIdsForAnonymous" parameterType="map" resultType="long"> @@ -56,11 +66,13 @@ gr.role=#{role} and gr.group_id is null and - <foreach collection="componentIds" open="(" close=")" item="element" index="index" separator=" or ">gr.resource_id=#{element}</foreach> + <foreach collection="componentIds" open="(" close=")" item="element" index="index" separator=" or "> + gr.resource_id=#{element} + </foreach> </select> <select id="selectAuthorizedRootProjectsKeys" parameterType="map" resultType="string"> - <include refid="selectAuthorizedRootProjectsKeysQuery" /> + <include refid="selectAuthorizedRootProjectsKeysQuery"/> </select> <sql id="selectAuthorizedRootProjectsKeysQuery"> @@ -71,7 +83,8 @@ INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL <where> and gr.role=#{role} - and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where gu.user_id=#{userId})) + and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where + gu.user_id=#{userId})) </where> UNION SELECT p.kee as root_project_kee @@ -102,7 +115,8 @@ INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL <where> and gr.role=#{role} - and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where gu.user_id=#{userId})) + and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where + gu.user_id=#{userId})) </where> UNION SELECT p.uuid as root_project_uuid @@ -134,7 +148,8 @@ INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL <where> and gr.role=#{role} - and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where gu.user_id=#{userId})) + and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where + gu.user_id=#{userId})) </where> UNION SELECT p.id as root_project_id diff --git a/sonar-core/src/main/resources/org/sonar/core/user/GroupMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/GroupMapper.xml index 2f7cc2d3f16..0991bcffc0b 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/GroupMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/GroupMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.user.GroupMapper"> +<mapper namespace="org.sonar.db.user.GroupMapper"> <sql id="groupColumns"> g.id as id, @@ -13,7 +13,8 @@ </sql> <select id="selectByKey" parameterType="string" resultType="Group"> - SELECT <include refid="groupColumns"/> + SELECT + <include refid="groupColumns"/> FROM groups g <where> g.name=#{id} @@ -21,7 +22,8 @@ </select> <select id="selectById" parameterType="long" resultType="Group"> - SELECT <include refid="groupColumns"/> + SELECT + <include refid="groupColumns"/> FROM groups g <where> g.id=#{id} @@ -36,7 +38,8 @@ </delete> <select id="selectByUserLogin" parameterType="string" resultType="Group"> - SELECT <include refid="groupColumns"/> + SELECT + <include refid="groupColumns"/> FROM groups g INNER JOIN groups_users gu on gu.group_id=g.id INNER JOIN users u on u.id=gu.user_id @@ -52,14 +55,15 @@ <update id="update" parameterType="Group"> UPDATE groups SET - name=#{name}, - description=#{description}, - updated_at=#{updatedAt} + name=#{name}, + description=#{description}, + updated_at=#{updatedAt} WHERE id=#{id} </update> <select id="selectByQuery" parameterType="map" resultType="Group"> - SELECT <include refid="groupColumns" /> + SELECT + <include refid="groupColumns"/> FROM groups g WHERE UPPER(g.name) LIKE #{query} ORDER BY UPPER(g.name) diff --git a/sonar-core/src/main/resources/org/sonar/core/user/GroupMembershipMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/GroupMembershipMapper.xml index 21ba56c9785..36591ceea05 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/GroupMembershipMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/GroupMembershipMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.user.GroupMembershipMapper"> +<mapper namespace="org.sonar.db.user.GroupMembershipMapper"> <sql id="commonClauses"> FROM groups g @@ -23,29 +23,29 @@ <select id="selectGroups" parameterType="map" resultType="GroupMembership"> SELECT g.id as id, g.name as name, g.description as description, gu.user_id as userId - <include refid="commonClauses" /> + <include refid="commonClauses"/> ORDER BY g.name </select> <select id="countGroups" parameterType="map" resultType="int"> SELECT COUNT(g.id) - <include refid="commonClauses" /> + <include refid="commonClauses"/> </select> - <select id="countUsersByGroup" parameterType="long" resultType="org.sonar.core.user.GroupUserCount"> + <select id="countUsersByGroup" parameterType="long" resultType="org.sonar.db.user.GroupUserCount"> SELECT g.name as groupName, count(gu.user_id) as userCount FROM groups g LEFT JOIN groups_users gu ON gu.group_id=g.id <where> - g.id in - <foreach collection="groupIds" open="(" close=")" item="id" separator=","> - #{id} - </foreach> - </where> + g.id in + <foreach collection="groupIds" open="(" close=")" item="id" separator=","> + #{id} + </foreach> + </where> GROUP BY g.name </select> - <select id="selectGroupsByLogins" parameterType="string" resultType="org.sonar.core.user.LoginGroup"> + <select id="selectGroupsByLogins" parameterType="string" resultType="org.sonar.db.user.LoginGroup"> SELECT u.login as login, g.name as groupName FROM users u LEFT JOIN groups_users gu ON gu.user_id=u.id @@ -71,21 +71,22 @@ </when> </choose> <if test="query.memberSearch() != null"> - AND ((UPPER(u.login) LIKE #{query.memberSearchSql} ESCAPE '/') OR (UPPER(u.name) LIKE #{query.memberSearchSql} ESCAPE '/')) + AND ((UPPER(u.login) LIKE #{query.memberSearchSql} ESCAPE '/') OR (UPPER(u.name) LIKE #{query.memberSearchSql} + ESCAPE '/')) </if> AND u.active=${_true} </where> </sql> - <select id="selectMembers" parameterType="map" resultType="org.sonar.core.user.UserMembershipDto"> + <select id="selectMembers" parameterType="map" resultType="org.sonar.db.user.UserMembershipDto"> SELECT u.id as id, u.login as login, u.name as name, gu.group_id as groupId - <include refid="userCommonClauses" /> + <include refid="userCommonClauses"/> ORDER BY u.name ASC </select> <select id="countMembers" parameterType="map" resultType="int"> SELECT COUNT(u.id) - <include refid="userCommonClauses" /> + <include refid="userCommonClauses"/> </select> </mapper> diff --git a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/RoleMapper.xml index 5cc000c61f6..41303206013 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/RoleMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.user.RoleMapper"> +<mapper namespace="org.sonar.db.user.RoleMapper"> <select id="selectUserPermissions" parameterType="map" resultType="String"> SELECT ur.role @@ -46,12 +46,12 @@ </where> </select> - <insert id="insertGroupRole" parameterType="GroupRole" keyColumn="id" useGeneratedKeys="true" keyProperty="id" > + <insert id="insertGroupRole" parameterType="GroupRole" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO group_roles (group_id, resource_id, role) VALUES (#{groupId}, #{resourceId}, #{role}) </insert> - <insert id="insertUserRole" parameterType="UserRole" keyColumn="id" useGeneratedKeys="true" keyProperty="id" > + <insert id="insertUserRole" parameterType="UserRole" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO user_roles (user_id, resource_id, role) VALUES (#{userId}, #{resourceId}, #{role}) </insert> diff --git a/sonar-core/src/main/resources/org/sonar/core/user/UserGroupMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/UserGroupMapper.xml index 8b6b828ec95..d2177b452c0 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/UserGroupMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/UserGroupMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.user.UserGroupMapper"> +<mapper namespace="org.sonar.db.user.UserGroupMapper"> <insert id="insert" parameterType="UserGroup" useGeneratedKeys="false"> INSERT INTO groups_users (user_id, group_id) @@ -11,15 +11,15 @@ <delete id="delete" parameterType="UserGroup"> DELETE FROM groups_users <where> - AND user_id = #{userId} - AND group_id = #{groupId} + AND user_id = #{userId} + AND group_id = #{groupId} </where> </delete> <delete id="deleteMembersByGroup" parameterType="long"> DELETE FROM groups_users <where> - AND group_id = #{groupId} + AND group_id = #{groupId} </where> </delete> diff --git a/sonar-core/src/main/resources/org/sonar/core/user/UserMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/UserMapper.xml index aab09322e5d..d46d44f2eaa 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/UserMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/UserMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.user.UserMapper"> +<mapper namespace="org.sonar.db.user.UserMapper"> <sql id="userColumns"> u.id as id, @@ -124,13 +124,17 @@ <insert id="insert" parameterType="User" keyColumn="id" useGeneratedKeys="true" keyProperty="id"> INSERT INTO users (login, name, email, active, scm_accounts, salt, crypted_password, created_at, updated_at) - VALUES (#{login,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{active,jdbcType=BOOLEAN}, #{scmAccounts,jdbcType=VARCHAR}, - #{salt,jdbcType=VARCHAR}, #{cryptedPassword,jdbcType=VARCHAR}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}) + VALUES (#{login,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{active,jdbcType=BOOLEAN}, + #{scmAccounts,jdbcType=VARCHAR}, + #{salt,jdbcType=VARCHAR}, #{cryptedPassword,jdbcType=VARCHAR}, #{createdAt,jdbcType=BIGINT}, + #{updatedAt,jdbcType=BIGINT}) </insert> <insert id="update" parameterType="User" useGeneratedKeys="false"> - UPDATE users set name=#{name,jdbcType=VARCHAR}, email=#{email,jdbcType=VARCHAR}, active=#{active,jdbcType=BOOLEAN}, scm_accounts=#{scmAccounts,jdbcType=VARCHAR}, - salt=#{salt,jdbcType=VARCHAR}, crypted_password=#{cryptedPassword,jdbcType=BIGINT}, updated_at=#{updatedAt,jdbcType=BIGINT} + UPDATE users set name=#{name,jdbcType=VARCHAR}, email=#{email,jdbcType=VARCHAR}, active=#{active,jdbcType=BOOLEAN}, + scm_accounts=#{scmAccounts,jdbcType=VARCHAR}, + salt=#{salt,jdbcType=VARCHAR}, crypted_password=#{cryptedPassword,jdbcType=BIGINT}, + updated_at=#{updatedAt,jdbcType=BIGINT} WHERE login = #{login} </insert> diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/SchemaMigrationMapper.xml b/sonar-db/src/main/resources/org/sonar/db/version/SchemaMigrationMapper.xml index 4f8e08eafc9..cde37378a00 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/SchemaMigrationMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/version/SchemaMigrationMapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.persistence.SchemaMigrationMapper"> +<mapper namespace="org.sonar.db.version.SchemaMigrationMapper"> <select id="selectVersions" resultType="int"> select version from schema_migrations diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql index 706947ab524..706947ab524 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql +++ b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl index d0ad5236787..d0ad5236787 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl +++ b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/migration/v44/Migration44Mapper.xml b/sonar-db/src/main/resources/org/sonar/db/version/v44/Migration44Mapper.xml index 472eff1ffb4..30bcffddccb 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/migration/v44/Migration44Mapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/version/v44/Migration44Mapper.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.persistence.migration.v44.Migration44Mapper"> +<mapper namespace="org.sonar.db.version.v44.Migration44Mapper"> - <select id="selectProfileMeasures" resultType="org.sonar.core.persistence.migration.v44.ProfileMeasure"> + <select id="selectProfileMeasures" resultType="org.sonar.db.version.v44.ProfileMeasure"> select pm.id as id, pm.value as profileId, pm.snapshot_id as snapshotId from project_measures pm inner join metrics m on m.id=pm.metric_id and m.name='profile' @@ -18,7 +18,7 @@ where pm.value is not null and s.id=#{id} </select> - <select id="selectProfileById" resultType="org.sonar.core.persistence.migration.v44.QProfileDto44" parameterType="int"> + <select id="selectProfileById" resultType="org.sonar.db.version.v44.QProfileDto44" parameterType="int"> select id, kee, name, language from rules_profiles where id=#{id} @@ -40,14 +40,14 @@ </delete> <select id="selectMeasuresOnDeletedQualityProfiles" resultType="long"> - select pm.id from project_measures pm - inner join snapshots s on s.id=pm.snapshot_id and s.islast=${_true} - where - pm.metric_id=(select id from metrics where name='quality_profiles') - and pm.value is not null + select pm.id from project_measures pm + inner join snapshots s on s.id=pm.snapshot_id and s.islast=${_true} + where + pm.metric_id=(select id from metrics where name='quality_profiles') + and pm.value is not null </select> - <select id="selectAllProfiles" resultType="org.sonar.core.persistence.migration.v44.QProfileDto44"> + <select id="selectAllProfiles" resultType="org.sonar.db.version.v44.QProfileDto44"> select id, kee, name, language from rules_profiles </select> @@ -68,7 +68,7 @@ </update> <select id="selectActiveRuleChange" parameterType="Boolean" - resultType="org.sonar.core.persistence.migration.v44.ChangeLog"> + resultType="org.sonar.db.version.v44.ChangeLog"> select rule_change.id as id, rule_change.change_date as createdAt, diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/migration/v45/Migration45Mapper.xml b/sonar-db/src/main/resources/org/sonar/db/version/v45/Migration45Mapper.xml index ea7778ed475..0b741e6d396 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/migration/v45/Migration45Mapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/version/v45/Migration45Mapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.persistence.migration.v45.Migration45Mapper"> +<mapper namespace="org.sonar.db.version.v45.Migration45Mapper"> </mapper> diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/migration/v50/Migration50Mapper.xml b/sonar-db/src/main/resources/org/sonar/db/version/v50/Migration50Mapper.xml index 1db97943867..46fd146b117 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/migration/v50/Migration50Mapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/version/v50/Migration50Mapper.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="org.sonar.core.persistence.migration.v50.Migration50Mapper"> +<mapper namespace="org.sonar.db.version.v50.Migration50Mapper"> </mapper> diff --git a/sonar-core/src/test/java/org/sonar/core/issue/ActionPlanStatsTest.java b/sonar-db/src/test/java/org/sonar/core/issue/ActionPlanStatsTest.java index f37d730aa86..233f99787b2 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/ActionPlanStatsTest.java +++ b/sonar-db/src/test/java/org/sonar/core/issue/ActionPlanStatsTest.java @@ -20,12 +20,11 @@ package org.sonar.core.issue; +import java.util.Date; import org.apache.commons.lang.time.DateUtils; import org.junit.Test; import org.sonar.api.issue.ActionPlan; -import java.util.Date; - import static org.assertj.core.api.Assertions.assertThat; public class ActionPlanStatsTest { diff --git a/sonar-core/src/test/java/org/sonar/core/timemachine/PeriodsTest.java b/sonar-db/src/test/java/org/sonar/core/timemachine/PeriodsTest.java index 1a604565d97..ee5fbb87bb7 100644 --- a/sonar-core/src/test/java/org/sonar/core/timemachine/PeriodsTest.java +++ b/sonar-db/src/test/java/org/sonar/core/timemachine/PeriodsTest.java @@ -19,6 +19,7 @@ */ package org.sonar.core.timemachine; +import java.util.Locale; import org.junit.Before; import org.junit.Test; import org.sonar.api.CoreProperties; @@ -27,9 +28,13 @@ import org.sonar.api.database.model.Snapshot; import org.sonar.api.i18n.I18n; import org.sonar.api.utils.System2; -import java.util.Locale; - -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.isNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class PeriodsTest { @@ -254,5 +259,4 @@ public class PeriodsTest { periods.label(periodIndex); } - } diff --git a/sonar-core/src/test/java/org/sonar/core/user/DefaultUserFinderTest.java b/sonar-db/src/test/java/org/sonar/core/user/DefaultUserFinderTest.java index 125f6e2d7e1..2a97bef0a21 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/DefaultUserFinderTest.java +++ b/sonar-db/src/test/java/org/sonar/core/user/DefaultUserFinderTest.java @@ -19,15 +19,18 @@ */ package org.sonar.core.user; +import java.util.Arrays; +import java.util.Collection; import org.junit.Test; import org.sonar.api.user.User; import org.sonar.api.user.UserQuery; - -import java.util.Arrays; -import java.util.Collection; +import org.sonar.db.user.UserDao; +import org.sonar.db.user.UserDto; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class DefaultUserFinderTest { UserDao dao = mock(UserDao.class); diff --git a/sonar-core/src/test/java/org/sonar/core/user/DefaultUserTest.java b/sonar-db/src/test/java/org/sonar/core/user/DefaultUserTest.java index 6028a82dd3d..6028a82dd3d 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/DefaultUserTest.java +++ b/sonar-db/src/test/java/org/sonar/core/user/DefaultUserTest.java diff --git a/sonar-core/src/test/java/org/sonar/core/user/DeprecatedUserFinderTest.java b/sonar-db/src/test/java/org/sonar/core/user/DeprecatedUserFinderTest.java index b0fa938476d..0d978a6124a 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/DeprecatedUserFinderTest.java +++ b/sonar-db/src/test/java/org/sonar/core/user/DeprecatedUserFinderTest.java @@ -25,7 +25,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.database.model.User; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; +import org.sonar.db.user.UserDao; import org.sonar.test.DbTests; import static org.hamcrest.Matchers.is; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java b/sonar-db/src/test/java/org/sonar/db/AbstractDaoTestCase.java index 4111e1033c8..756a3437595 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/AbstractDaoTestCase.java +++ b/sonar-db/src/test/java/org/sonar/db/AbstractDaoTestCase.java @@ -17,10 +17,20 @@ * 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.persistence; +package org.sonar.db; import com.google.common.collect.Maps; import com.google.common.io.Closeables; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.net.URI; +import java.net.URISyntaxException; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Map; +import java.util.Properties; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.text.StrSubstitutor; @@ -47,26 +57,14 @@ import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.config.Settings; -import org.sonar.core.cluster.NullQueue; -import org.sonar.core.config.Logback; -import org.sonar.core.persistence.dialect.MySql; +import org.sonar.db.deprecated.NullQueue; +import org.sonar.db.dialect.MySql; import org.sonar.test.DbTests; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URI; -import java.net.URISyntaxException; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Map; -import java.util.Properties; - import static org.junit.Assert.fail; /** - * @deprecated use an instance of {@link org.sonar.core.persistence.DbTester instead} instead, + * @deprecated use an instance of {@link DbTester instead} instead, * and do no forget to annotated the test class with {@link org.sonar.test.DbTests}. */ @Category(DbTests.class) @@ -102,7 +100,7 @@ public abstract class AbstractDaoTestCase { LOG.info("Test Database: " + database); databaseCommands = DatabaseCommands.forDialect(database.getDialect()); - myBatis = new MyBatis(database, new Logback(), new NullQueue()); + myBatis = new MyBatis(database, new NullQueue()); myBatis.start(); } } diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/BatchSessionTest.java b/sonar-db/src/test/java/org/sonar/db/BatchSessionTest.java index 71f8c6a7e66..dc6999e61a1 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/BatchSessionTest.java +++ b/sonar-db/src/test/java/org/sonar/db/BatchSessionTest.java @@ -17,14 +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.persistence; +package org.sonar.db; import org.apache.ibatis.session.SqlSession; import org.junit.Test; -import org.sonar.core.cluster.ClusterAction; -import org.sonar.core.cluster.WorkQueue; +import org.sonar.db.deprecated.ClusterAction; +import org.sonar.db.deprecated.WorkQueue; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; public class BatchSessionTest { @Test @@ -68,15 +72,15 @@ public class BatchSessionTest { } @Test - public void shouldResetCounterAfterCommit() { - SqlSession mybatisSession = mock(SqlSession.class); - WorkQueue<?> queue = mock(WorkQueue.class); - BatchSession session = new BatchSession(queue, mybatisSession, 10); + public void shouldResetCounterAfterCommit() { + SqlSession mybatisSession = mock(SqlSession.class); + WorkQueue<?> queue = mock(WorkQueue.class); + BatchSession session = new BatchSession(queue, mybatisSession, 10); - for (int i = 0; i < 35; i++) { - session.insert("id" + i); - } - verify(mybatisSession, times(3)).commit(); - session.close(); + for (int i = 0; i < 35; i++) { + session.insert("id" + i); } + verify(mybatisSession, times(3)).commit(); + session.close(); + } } diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DaoUtilsTest.java b/sonar-db/src/test/java/org/sonar/db/DaoUtilsTest.java index 4715e7f4a2c..24987271dfb 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/DaoUtilsTest.java +++ b/sonar-db/src/test/java/org/sonar/db/DaoUtilsTest.java @@ -17,14 +17,13 @@ * 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.persistence; +package org.sonar.db; import com.google.common.base.Function; import com.google.common.collect.Iterables; -import org.junit.Test; - import java.util.Collections; import java.util.List; +import org.junit.Test; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseCommands.java b/sonar-db/src/test/java/org/sonar/db/DatabaseCommands.java index 67a953c206e..626933d4aef 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseCommands.java +++ b/sonar-db/src/test/java/org/sonar/db/DatabaseCommands.java @@ -17,10 +17,17 @@ * 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.persistence; +package org.sonar.db; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.List; +import javax.sql.DataSource; import org.apache.commons.dbutils.DbUtils; import org.apache.commons.lang.StringUtils; import org.dbunit.dataset.datatype.DefaultDataTypeFactory; @@ -31,20 +38,12 @@ import org.dbunit.ext.mssql.MsSqlDataTypeFactory; import org.dbunit.ext.mysql.MySqlDataTypeFactory; import org.dbunit.ext.oracle.Oracle10DataTypeFactory; import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory; -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 javax.sql.DataSource; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.List; +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; +import org.sonar.db.version.DatabaseVersion; public abstract class DatabaseCommands { private final IDataTypeFactory dbUnitFactory; @@ -73,7 +72,7 @@ public abstract class DatabaseCommands { public static DatabaseCommands forDialect(Dialect dialect) { DatabaseCommands command = ImmutableMap.of( - org.sonar.core.persistence.dialect.H2.ID, H2, + org.sonar.db.dialect.H2.ID, H2, MsSql.ID, MSSQL, MySql.ID, MYSQL, Oracle.ID, ORACLE, @@ -173,7 +172,7 @@ public abstract class DatabaseCommands { try { rs = stmt.executeQuery("select count(*) from " + table); if (rs.next()) { - return rs.getInt(1)>0; + return rs.getInt(1) > 0; } } catch (SQLException ignored) { diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseUtilsTest.java b/sonar-db/src/test/java/org/sonar/db/DatabaseUtilsTest.java index 06f313be843..933e931ac03 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseUtilsTest.java +++ b/sonar-db/src/test/java/org/sonar/db/DatabaseUtilsTest.java @@ -17,16 +17,15 @@ * 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.persistence; - -import org.junit.Test; -import org.sonar.core.persistence.dialect.Oracle; +package org.sonar.db; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import org.junit.Test; +import org.sonar.db.dialect.Oracle; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doThrow; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DbTester.java b/sonar-db/src/test/java/org/sonar/db/DbTester.java index bf5d14b0200..ba428c5cbe8 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/DbTester.java +++ b/sonar-db/src/test/java/org/sonar/db/DbTester.java @@ -17,10 +17,28 @@ * 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.persistence; +package org.sonar.db; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigDecimal; +import java.net.HttpURLConnection; +import java.net.URI; +import java.net.URISyntaxException; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.dbutils.QueryRunner; import org.apache.commons.io.FileUtils; @@ -48,29 +66,8 @@ import org.junit.rules.ExternalResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.config.Settings; -import org.sonar.core.cluster.NullQueue; -import org.sonar.core.config.Logback; -import org.sonar.core.persistence.dialect.Dialect; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigDecimal; -import java.net.HttpURLConnection; -import java.net.URI; -import java.net.URISyntaxException; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import org.sonar.db.deprecated.NullQueue; +import org.sonar.db.dialect.Dialect; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; @@ -82,7 +79,7 @@ import static org.junit.Assert.fail; * the schema will be recreated before each test). * Data will be truncated each time you call prepareDbUnit(). * <p/> - * File using {@link org.sonar.core.persistence.DbTester} must be annotated with {@link org.sonar.test.DbTests} so + * File using {@link DbTester} must be annotated with {@link org.sonar.test.DbTests} so * that they can be executed on all supported DBs (Oracle, MySQL, ...). */ public class DbTester extends ExternalResource { @@ -132,7 +129,7 @@ public class DbTester extends ExternalResource { commands = DatabaseCommands.forDialect(db.getDialect()); tester = new DataSourceDatabaseTester(db.getDataSource(), commands.useLoginAsSchema() ? login : null); - myBatis = new MyBatis(db, new Logback(), new NullQueue()); + myBatis = new MyBatis(db, new NullQueue()); myBatis.start(); truncateTables(); @@ -242,7 +239,7 @@ public class DbTester extends ExternalResource { doClobFree(clob); } else if (value instanceof BigDecimal) { // In Oracle, INTEGER types are mapped as BigDecimal - BigDecimal bgValue = ((BigDecimal)value); + BigDecimal bgValue = ((BigDecimal) value); if (bgValue.scale() == 0) { value = bgValue.longValue(); } else { @@ -449,7 +446,7 @@ public class DbTester extends ExternalResource { private static void doClobFree(Clob clob) throws SQLException { try { clob.free(); - } catch (AbstractMethodError e){ + } catch (AbstractMethodError e) { // JTS driver do not implement free() as it's using JDBC 3.0 } } diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DdlUtilsTest.java b/sonar-db/src/test/java/org/sonar/db/DdlUtilsTest.java index 3e5fdece620..ddc7764b350 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/DdlUtilsTest.java +++ b/sonar-db/src/test/java/org/sonar/db/DdlUtilsTest.java @@ -17,15 +17,15 @@ * 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.persistence; - -import org.h2.Driver; -import org.junit.Test; +package org.sonar.db; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; +import org.assertj.core.api.Assertions; +import org.h2.Driver; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -33,7 +33,7 @@ public class DdlUtilsTest { @Test public void shouldSupportOnlyH2() { - assertThat(DdlUtils.supportsDialect("h2")).isTrue(); + Assertions.assertThat(DdlUtils.supportsDialect("h2")).isTrue(); assertThat(DdlUtils.supportsDialect("mysql")).isFalse(); assertThat(DdlUtils.supportsDialect("oracle")).isFalse(); assertThat(DdlUtils.supportsDialect("mssql")).isFalse(); diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DefaultDatabaseTest.java b/sonar-db/src/test/java/org/sonar/db/DefaultDatabaseTest.java index 109846319be..8fda6636030 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/DefaultDatabaseTest.java +++ b/sonar-db/src/test/java/org/sonar/db/DefaultDatabaseTest.java @@ -17,18 +17,16 @@ * 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.persistence; +package org.sonar.db; +import java.util.Properties; import org.apache.commons.dbcp.BasicDataSource; import org.junit.Test; import org.sonar.api.config.Settings; -import org.sonar.core.persistence.dialect.PostgreSql; - -import java.util.Properties; +import org.sonar.db.dialect.PostgreSql; import static org.assertj.core.api.Assertions.assertThat; - public class DefaultDatabaseTest { @Test diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/H2Database.java b/sonar-db/src/test/java/org/sonar/db/H2Database.java index 07035468cf9..688211e31b2 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/H2Database.java +++ b/sonar-db/src/test/java/org/sonar/db/H2Database.java @@ -17,15 +17,15 @@ * 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.persistence; +package org.sonar.db; import java.sql.Connection; import java.sql.SQLException; import javax.sql.DataSource; import org.apache.commons.dbcp.BasicDataSource; import org.apache.commons.dbutils.DbUtils; -import org.sonar.core.persistence.dialect.Dialect; -import org.sonar.core.persistence.dialect.H2; +import org.sonar.db.dialect.Dialect; +import org.sonar.db.dialect.H2; /** * H2 in-memory database, used for unit tests only. diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/H2DatabaseTest.java b/sonar-db/src/test/java/org/sonar/db/H2DatabaseTest.java index 60df556b76c..363fcc6619b 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/H2DatabaseTest.java +++ b/sonar-db/src/test/java/org/sonar/db/H2DatabaseTest.java @@ -17,16 +17,14 @@ * 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.persistence; +package org.sonar.db; +import java.sql.Connection; +import java.sql.SQLException; import org.junit.After; - import org.junit.Before; import org.junit.Test; -import java.sql.Connection; -import java.sql.SQLException; - import static org.assertj.core.api.Assertions.assertThat; public class H2DatabaseTest { diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/IsAliveMapperTest.java b/sonar-db/src/test/java/org/sonar/db/IsAliveMapperTest.java index 4cf93908b7e..02b9c6b4427 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/IsAliveMapperTest.java +++ b/sonar-db/src/test/java/org/sonar/db/IsAliveMapperTest.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.db; import org.junit.After; import org.junit.Before; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/MyBatisTest.java b/sonar-db/src/test/java/org/sonar/db/MyBatisTest.java index 706e1523149..194346fe0a0 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/MyBatisTest.java +++ b/sonar-db/src/test/java/org/sonar/db/MyBatisTest.java @@ -17,9 +17,7 @@ * 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.persistence; - -import org.sonar.core.cluster.WorkQueue; +package org.sonar.db; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.SqlSession; @@ -27,15 +25,15 @@ import org.hamcrest.core.Is; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.sonar.core.config.Logback; -import org.sonar.core.rule.RuleMapper; +import org.sonar.db.deprecated.WorkQueue; +import org.sonar.db.rule.RuleMapper; + import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; public class MyBatisTest { private static H2Database database; - private Logback logback = mock(Logback.class); private WorkQueue<?> queue = mock(WorkQueue.class); @BeforeClass @@ -51,7 +49,7 @@ public class MyBatisTest { @Test public void shouldConfigureMyBatis() { - MyBatis myBatis = new MyBatis(database, logback, queue); + MyBatis myBatis = new MyBatis(database, queue); myBatis.start(); Configuration conf = myBatis.getSessionFactory().getConfiguration(); @@ -62,7 +60,7 @@ public class MyBatisTest { @Test public void shouldOpenBatchSession() { - MyBatis myBatis = new MyBatis(database, logback, queue); + MyBatis myBatis = new MyBatis(database, queue); myBatis.start(); SqlSession session = myBatis.openBatchSession(); diff --git a/sonar-core/src/test/java/org/sonar/core/component/ComponentDtoTest.java b/sonar-db/src/test/java/org/sonar/db/component/ComponentDtoTest.java index bd030b5dd78..c1dc490f695 100644 --- a/sonar-core/src/test/java/org/sonar/core/component/ComponentDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/component/ComponentDtoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component; +package org.sonar.db.component; import org.junit.Test; import org.sonar.api.resources.Qualifiers; diff --git a/sonar-core/src/test/java/org/sonar/core/component/ComponentLinkDtoTest.java b/sonar-db/src/test/java/org/sonar/db/component/ComponentLinkDtoTest.java index bca227fa782..165a3ea08f2 100644 --- a/sonar-core/src/test/java/org/sonar/core/component/ComponentLinkDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/component/ComponentLinkDtoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component; +package org.sonar.db.component; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java b/sonar-db/src/test/java/org/sonar/db/component/ResourceDaoTest.java index c154a7c0e80..a6c809330f1 100644 --- a/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/component/ResourceDaoTest.java @@ -17,10 +17,13 @@ * 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.resource; +package org.sonar.db.component; import com.google.common.base.Function; import com.google.common.collect.Iterables; +import java.util.Collections; +import java.util.List; +import javax.annotation.Nullable; import org.apache.ibatis.session.SqlSession; import org.junit.After; import org.junit.Before; @@ -29,14 +32,8 @@ import org.sonar.api.component.Component; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; import org.sonar.api.utils.System2; -import org.sonar.core.component.ComponentDto; -import org.sonar.core.component.SnapshotDto; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; - -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/resource/ResourceIndexerDaoTest.java b/sonar-db/src/test/java/org/sonar/db/component/ResourceIndexerDaoTest.java index 5fe8bb09402..90329d5842b 100644 --- a/sonar-core/src/test/java/org/sonar/core/resource/ResourceIndexerDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/component/ResourceIndexerDaoTest.java @@ -17,17 +17,16 @@ * 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.resource; +package org.sonar.db.component; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; import org.hamcrest.core.Is; import org.junit.Before; import org.junit.Test; import org.sonar.api.resources.Qualifiers; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; +import org.sonar.db.AbstractDaoTestCase; import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/resource/ResourceKeyUpdaterDaoTest.java b/sonar-db/src/test/java/org/sonar/db/component/ResourceKeyUpdaterDaoTest.java index 227d0925cbb..13e46936fb8 100644 --- a/sonar-core/src/test/java/org/sonar/core/resource/ResourceKeyUpdaterDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/component/ResourceKeyUpdaterDaoTest.java @@ -17,15 +17,14 @@ * 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.resource; +package org.sonar.db.component; +import java.util.Map; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import java.util.Map; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/component/SnapshotDtoTest.java b/sonar-db/src/test/java/org/sonar/db/component/SnapshotDtoTest.java index 26a4aad9825..360fd739238 100644 --- a/sonar-core/src/test/java/org/sonar/core/component/SnapshotDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/component/SnapshotDtoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component; +package org.sonar.db.component; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/component/db/SnapshotQueryTest.java b/sonar-db/src/test/java/org/sonar/db/component/SnapshotQueryTest.java index 9ab0af5aa8e..613686ec55b 100644 --- a/sonar-core/src/test/java/org/sonar/core/component/db/SnapshotQueryTest.java +++ b/sonar-db/src/test/java/org/sonar/db/component/SnapshotQueryTest.java @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.component.db; +package org.sonar.db.component; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -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.db.component.SnapshotQuery.SORT_FIELD.BY_DATE; +import static org.sonar.db.component.SnapshotQuery.SORT_ORDER.ASC; public class SnapshotQueryTest { diff --git a/sonar-core/src/test/java/org/sonar/core/dashboard/ActiveDashboardDaoTest.java b/sonar-db/src/test/java/org/sonar/db/dashboard/ActiveDashboardDaoTest.java index 1d03f781ffb..8f320764923 100644 --- a/sonar-core/src/test/java/org/sonar/core/dashboard/ActiveDashboardDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/dashboard/ActiveDashboardDaoTest.java @@ -17,13 +17,13 @@ * 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.dashboard; +package org.sonar.db.dashboard; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/dashboard/DashboardDaoTest.java b/sonar-db/src/test/java/org/sonar/db/dashboard/DashboardDaoTest.java index f7ddd44cbf2..bcb505fc176 100644 --- a/sonar-core/src/test/java/org/sonar/core/dashboard/DashboardDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/dashboard/DashboardDaoTest.java @@ -17,17 +17,16 @@ * 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.dashboard; +package org.sonar.db.dashboard; +import java.util.Date; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; -import java.util.Date; - import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertNull; diff --git a/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDaoTest.java b/sonar-db/src/test/java/org/sonar/db/debt/CharacteristicDaoTest.java index b5966c8aa31..504fe7d9246 100644 --- a/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/debt/CharacteristicDaoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.technicaldebt.db; +package org.sonar.db.debt; import java.util.List; import org.junit.After; @@ -27,8 +27,8 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.utils.DateUtils; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; import static com.google.common.collect.Lists.newArrayList; diff --git a/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java b/sonar-db/src/test/java/org/sonar/db/debt/CharacteristicDtoTest.java index 8d66dd657bc..8ecfbb32dae 100644 --- a/sonar-core/src/test/java/org/sonar/core/technicaldebt/db/CharacteristicDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/debt/CharacteristicDtoTest.java @@ -18,13 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.technicaldebt.db; +package org.sonar.db.debt; +import java.util.Date; import org.junit.Test; import org.sonar.api.technicaldebt.batch.internal.DefaultCharacteristic; -import java.util.Date; - import static org.assertj.core.api.Assertions.assertThat; public class CharacteristicDtoTest { @@ -63,7 +62,6 @@ public class CharacteristicDtoTest { .setKey("MEMORY_EFFICIENCY") .setName("Memory use"); - CharacteristicDto dto = new CharacteristicDto() .setId(2) .setParentId(1) diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/DialectUtilsTest.java b/sonar-db/src/test/java/org/sonar/db/dialect/DialectUtilsTest.java index 7981df76eab..32621935884 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/DialectUtilsTest.java +++ b/sonar-db/src/test/java/org/sonar/db/dialect/DialectUtilsTest.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import org.junit.Test; import org.sonar.api.utils.MessageException; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/H2Test.java b/sonar-db/src/test/java/org/sonar/db/dialect/H2Test.java index e187c55b4b8..bd230b1b580 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/H2Test.java +++ b/sonar-db/src/test/java/org/sonar/db/dialect/H2Test.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/MsSqlTest.java b/sonar-db/src/test/java/org/sonar/db/dialect/MsSqlTest.java index 8719be31490..3b1ebb14989 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/MsSqlTest.java +++ b/sonar-db/src/test/java/org/sonar/db/dialect/MsSqlTest.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/MySqlTest.java b/sonar-db/src/test/java/org/sonar/db/dialect/MySqlTest.java index b9d9990f8e8..c33aa898cb5 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/MySqlTest.java +++ b/sonar-db/src/test/java/org/sonar/db/dialect/MySqlTest.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/OracleTest.java b/sonar-db/src/test/java/org/sonar/db/dialect/OracleTest.java index 4b91a15a040..cc40aab20e1 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/OracleTest.java +++ b/sonar-db/src/test/java/org/sonar/db/dialect/OracleTest.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/PostgreSqlTest.java b/sonar-db/src/test/java/org/sonar/db/dialect/PostgreSqlTest.java index c6b437dc3bf..43cf2d0094f 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/dialect/PostgreSqlTest.java +++ b/sonar-db/src/test/java/org/sonar/db/dialect/PostgreSqlTest.java @@ -17,7 +17,7 @@ * 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.persistence.dialect; +package org.sonar.db.dialect; import org.junit.Test; @@ -38,7 +38,6 @@ public class PostgreSqlTest { assertThat(dialect.getConnectionInitStatements()).isEqualTo(PostgreSql.INIT_STATEMENTS); } - @Test public void testBooleanSqlValues() { assertThat(dialect.getTrueSqlValue()).isEqualTo("true"); diff --git a/sonar-core/src/test/java/org/sonar/core/duplication/DuplicationDaoTest.java b/sonar-db/src/test/java/org/sonar/db/duplication/DuplicationDaoTest.java index ba7a89ce431..32705a7e5b1 100644 --- a/sonar-core/src/test/java/org/sonar/core/duplication/DuplicationDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/duplication/DuplicationDaoTest.java @@ -17,14 +17,13 @@ * 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.duplication; - -import org.junit.Before; -import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; +package org.sonar.db.duplication; import java.util.Arrays; import java.util.List; +import org.junit.Before; +import org.junit.Test; +import org.sonar.db.AbstractDaoTestCase; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/event/EventDtoTest.java b/sonar-db/src/test/java/org/sonar/db/event/EventDtoTest.java index 63c8e8e85a5..cf90cce47cd 100644 --- a/sonar-core/src/test/java/org/sonar/core/event/EventDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/event/EventDtoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.event; +package org.sonar.db.event; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/ActionPlanDaoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/ActionPlanDaoTest.java index 642cee05239..939fc01ed36 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/ActionPlanDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/issue/ActionPlanDaoTest.java @@ -18,16 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.db.issue; +import java.util.Collection; +import java.util.List; import org.apache.ibatis.session.SqlSession; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.MyBatis; - -import java.util.Collection; -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.MyBatis; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; @@ -44,11 +43,11 @@ public class ActionPlanDaoTest extends AbstractDaoTestCase { @Test public void should_insert_new_action_plan() { ActionPlanDto actionPlanDto = new ActionPlanDto().setKey("ABC").setName("Long term").setDescription("Long term action plan").setStatus("OPEN") - .setProjectId(1l).setUserLogin("arthur"); + .setProjectId(1l).setUserLogin("arthur"); dao.save(actionPlanDto); - checkTables("should_insert_new_action_plan", new String[]{"id", "created_at", "updated_at"}, "action_plans"); + checkTables("should_insert_new_action_plan", new String[] {"id", "created_at", "updated_at"}, "action_plans"); } @Test @@ -56,10 +55,10 @@ public class ActionPlanDaoTest extends AbstractDaoTestCase { setupData("should_update_action_plan"); ActionPlanDto actionPlanDto = new ActionPlanDto().setKey("ABC").setName("Long term").setDescription("Long term action plan").setStatus("OPEN") - .setProjectId(1l).setUserLogin("arthur"); + .setProjectId(1l).setUserLogin("arthur"); dao.update(actionPlanDto); - checkTables("should_update_action_plan", new String[]{"id", "created_at", "updated_at"}, "action_plans"); + checkTables("should_update_action_plan", new String[] {"id", "created_at", "updated_at"}, "action_plans"); } @Test @@ -68,7 +67,7 @@ public class ActionPlanDaoTest extends AbstractDaoTestCase { dao.delete("BCD"); - checkTables("should_delete_action_plan", new String[]{"id", "created_at", "updated_at"}, "action_plans"); + checkTables("should_delete_action_plan", new String[] {"id", "created_at", "updated_at"}, "action_plans"); } @Test @@ -95,7 +94,7 @@ public class ActionPlanDaoTest extends AbstractDaoTestCase { SqlSession session = getMyBatis().openSession(); List<String> hugeNbOKeys = newArrayList(); - for (int i=0; i<4500; i++) { + for (int i = 0; i < 4500; i++) { hugeNbOKeys.add("ABCD" + i); } List<ActionPlanDto> result = dao.findByKeys(hugeNbOKeys); diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/ActionPlanStatsDaoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/ActionPlanStatsDaoTest.java index c86a0dcb59a..a70e1a3d08e 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/ActionPlanStatsDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/issue/ActionPlanStatsDaoTest.java @@ -18,13 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.db.issue; +import java.util.Collection; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import java.util.Collection; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDaoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueChangeDaoTest.java index 91530c88983..4510995aace 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueChangeDaoTest.java @@ -17,7 +17,7 @@ * 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.db.issue; import java.util.Arrays; import java.util.Collections; @@ -28,9 +28,9 @@ import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.FieldDiffs; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDtoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueChangeDtoTest.java index 2d3ece83f18..2d7cfdcb478 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueChangeDtoTest.java @@ -17,12 +17,12 @@ * 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.db.issue; import org.junit.Test; +import org.sonar.api.utils.System2; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.FieldDiffs; -import org.sonar.api.utils.System2; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.api.utils.DateUtils.parseDate; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeMapperTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueChangeMapperTest.java index f9d51c39c37..dc2fef893e6 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeMapperTest.java +++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueChangeMapperTest.java @@ -17,14 +17,14 @@ * 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.db.issue; import org.apache.ibatis.session.SqlSession; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.MyBatis; public class IssueChangeMapperTest extends AbstractDaoTestCase { SqlSession session; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java index 7738ca20486..24f556df1e6 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java @@ -18,14 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.db.issue; import org.apache.ibatis.executor.result.DefaultResultHandler; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java index 0ee3ae23416..3933f0302e3 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java @@ -17,20 +17,19 @@ * 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.db.issue; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; import org.apache.commons.lang.time.DateUtils; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.issue.Issue; -import org.sonar.core.issue.DefaultIssue; import org.sonar.api.utils.Duration; -import org.sonar.core.rule.RuleDto; - -import java.util.Arrays; -import java.util.Calendar; -import java.util.Date; +import org.sonar.core.issue.DefaultIssue; +import org.sonar.db.rule.RuleDto; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueFilterDaoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueFilterDaoTest.java index 621246ef967..474eb8e8770 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueFilterDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueFilterDaoTest.java @@ -18,13 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.db.issue; +import java.util.List; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; @@ -99,7 +98,7 @@ public class IssueFilterDaoTest extends AbstractDaoTestCase { dao.insert(filterDto); - checkTables("should_insert", new String[]{"created_at", "updated_at"}, "issue_filters"); + checkTables("should_insert", new String[] {"created_at", "updated_at"}, "issue_filters"); } @Test @@ -116,7 +115,7 @@ public class IssueFilterDaoTest extends AbstractDaoTestCase { dao.update(filterDto); - checkTables("should_update", new String[]{"created_at", "updated_at"}, "issue_filters"); + checkTables("should_update", new String[] {"created_at", "updated_at"}, "issue_filters"); } @Test @@ -125,6 +124,6 @@ public class IssueFilterDaoTest extends AbstractDaoTestCase { dao.delete(1l); - checkTables("should_delete", new String[]{"created_at", "updated_at"}, "issue_filters"); + checkTables("should_delete", new String[] {"created_at", "updated_at"}, "issue_filters"); } } diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueFilterFavouriteDaoTest.java index 52722038590..abe79583e69 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueFilterFavouriteDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueFilterFavouriteDaoTest.java @@ -18,13 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.issue.db; +package org.sonar.db.issue; +import java.util.List; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; @@ -76,7 +75,7 @@ public class IssueFilterFavouriteDaoTest extends AbstractDaoTestCase { dao.insert(dto); - checkTables("should_insert", new String[]{"created_at"}, "issue_filter_favourites"); + checkTables("should_insert", new String[] {"created_at"}, "issue_filter_favourites"); } @Test @@ -85,7 +84,7 @@ public class IssueFilterFavouriteDaoTest extends AbstractDaoTestCase { dao.delete(3l); - checkTables("should_delete", new String[]{"created_at"}, "issue_filter_favourites"); + checkTables("should_delete", new String[] {"created_at"}, "issue_filter_favourites"); } @Test @@ -94,7 +93,7 @@ public class IssueFilterFavouriteDaoTest extends AbstractDaoTestCase { dao.deleteByFilterId(10l); - checkTables("should_delete_by_issue_filter_id", new String[]{"created_at"}, "issue_filter_favourites"); + checkTables("should_delete_by_issue_filter_id", new String[] {"created_at"}, "issue_filter_favourites"); } } diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java index 9e81671a899..1e241b783ae 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java +++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java @@ -17,15 +17,15 @@ * 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.db.issue; import org.apache.ibatis.session.SqlSession; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.sonar.api.utils.DateUtils; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.MyBatis; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/template/LoadedTemplateDaoTest.java b/sonar-db/src/test/java/org/sonar/db/loadedtemplate/LoadedTemplateDaoTest.java index c4ecf345a32..13253d6bef3 100644 --- a/sonar-core/src/test/java/org/sonar/core/template/LoadedTemplateDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/loadedtemplate/LoadedTemplateDaoTest.java @@ -17,11 +17,11 @@ * 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.template; +package org.sonar.db.loadedtemplate; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; +import org.sonar.db.AbstractDaoTestCase; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/measure/db/MeasureDtoTest.java b/sonar-db/src/test/java/org/sonar/db/measure/MeasureDtoTest.java index 1363794cd7b..058b0007c6c 100644 --- a/sonar-core/src/test/java/org/sonar/core/measure/db/MeasureDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/measure/MeasureDtoTest.java @@ -18,11 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure.db; +package org.sonar.db.measure; import com.google.common.base.Strings; import org.junit.Test; -import org.sonar.api.rule.Severity; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/measure/db/MeasureFilterDaoTest.java b/sonar-db/src/test/java/org/sonar/db/measure/MeasureFilterDaoTest.java index 013ad0f02e6..06efb6a3825 100644 --- a/sonar-core/src/test/java/org/sonar/core/measure/db/MeasureFilterDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/measure/MeasureFilterDaoTest.java @@ -17,11 +17,11 @@ * 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.measure.db; +package org.sonar.db.measure; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; @@ -63,6 +63,6 @@ public class MeasureFilterDaoTest extends AbstractDaoTestCase { dao.insert(filterDto); - checkTables("shouldInsert", new String[]{"created_at", "updated_at"}, "measure_filters"); + checkTables("shouldInsert", new String[] {"created_at", "updated_at"}, "measure_filters"); } } diff --git a/sonar-core/src/test/java/org/sonar/core/measure/db/PastMeasureDtoTest.java b/sonar-db/src/test/java/org/sonar/db/measure/PastMeasureDtoTest.java index 9808471c1b0..6b1176088fa 100644 --- a/sonar-core/src/test/java/org/sonar/core/measure/db/PastMeasureDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/measure/PastMeasureDtoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure.db; +package org.sonar.db.measure; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/metric/db/MetricDtoTest.java b/sonar-db/src/test/java/org/sonar/db/metric/MetricDtoTest.java index 1971940ea00..47366890df9 100644 --- a/sonar-core/src/test/java/org/sonar/core/metric/db/MetricDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/metric/MetricDtoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.metric.db; +package org.sonar.db.metric; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/notification/db/NotificationQueueDaoTest.java b/sonar-db/src/test/java/org/sonar/db/notification/NotificationQueueDaoTest.java index 39a837707b0..2c2f0ebd65c 100644 --- a/sonar-core/src/test/java/org/sonar/core/notification/db/NotificationQueueDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/notification/NotificationQueueDaoTest.java @@ -18,15 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.notification.db; +package org.sonar.db.notification; +import java.util.Arrays; +import java.util.Collection; import org.junit.Before; import org.junit.Test; import org.sonar.api.notifications.Notification; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import java.util.Arrays; -import java.util.Collection; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/permission/GroupWithPermissionDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/GroupWithPermissionDaoTest.java index 7b79f0f1600..c6f9f03760d 100644 --- a/sonar-core/src/test/java/org/sonar/core/permission/GroupWithPermissionDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/GroupWithPermissionDaoTest.java @@ -18,13 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; +import java.util.List; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/permission/GroupWithPermissionDtoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/GroupWithPermissionDtoTest.java index ef4a30aef47..04101abeb04 100644 --- a/sonar-core/src/test/java/org/sonar/core/permission/GroupWithPermissionDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/GroupWithPermissionDtoTest.java @@ -18,9 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import org.junit.Test; +import org.sonar.core.permission.GroupWithPermission; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/permission/GroupWithPermissionTemplateDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/GroupWithPermissionTemplateDaoTest.java index 28ff2c3ed32..0cb583bded5 100644 --- a/sonar-core/src/test/java/org/sonar/core/permission/GroupWithPermissionTemplateDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/GroupWithPermissionTemplateDaoTest.java @@ -18,14 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/permission/GroupWithPermissionTest.java b/sonar-db/src/test/java/org/sonar/db/permission/GroupWithPermissionTest.java index 6d2fc0fe0ff..7ddc78d1308 100644 --- a/sonar-core/src/test/java/org/sonar/core/permission/GroupWithPermissionTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/GroupWithPermissionTest.java @@ -17,9 +17,10 @@ * 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.permission; +package org.sonar.db.permission; import org.junit.Test; +import org.sonar.core.permission.GroupWithPermission; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/permission/PermissionFacadeTest.java b/sonar-db/src/test/java/org/sonar/db/permission/PermissionFacadeTest.java index 8eafb61e80c..1a965020c71 100644 --- a/sonar-core/src/test/java/org/sonar/core/permission/PermissionFacadeTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/PermissionFacadeTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import org.junit.After; import org.junit.Before; @@ -28,11 +28,11 @@ import org.junit.rules.ExpectedException; import org.sonar.api.config.Settings; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.user.RoleDao; -import org.sonar.core.user.UserDao; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.user.RoleDao; +import org.sonar.db.user.UserDao; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/sonar-core/src/test/java/org/sonar/core/permission/PermissionTemplateDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/PermissionTemplateDaoTest.java index c3bfc1fa000..14902f25566 100644 --- a/sonar-core/src/test/java/org/sonar/core/permission/PermissionTemplateDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/PermissionTemplateDaoTest.java @@ -18,23 +18,24 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.sonar.api.utils.System2; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; +package org.sonar.db.permission; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.sonar.api.utils.System2; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class PermissionTemplateDaoTest extends AbstractDaoTestCase { diff --git a/sonar-core/src/test/java/org/sonar/core/permission/UserWithPermissionDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/UserWithPermissionDaoTest.java index 852915106cd..7533cb88c83 100644 --- a/sonar-core/src/test/java/org/sonar/core/permission/UserWithPermissionDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/UserWithPermissionDaoTest.java @@ -18,17 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; +import java.util.List; +import javax.annotation.Nullable; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import javax.annotation.Nullable; - -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/permission/UserWithPermissionDtoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/UserWithPermissionDtoTest.java index ab1f38990f7..56d951ebb2d 100644 --- a/sonar-core/src/test/java/org/sonar/core/permission/UserWithPermissionDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/UserWithPermissionDtoTest.java @@ -18,9 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import org.junit.Test; +import org.sonar.core.permission.UserWithPermission; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/permission/UserWithPermissionTemplateDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/UserWithPermissionTemplateDaoTest.java index 61d1f4f9479..d142ce71cbf 100644 --- a/sonar-core/src/test/java/org/sonar/core/permission/UserWithPermissionTemplateDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/UserWithPermissionTemplateDaoTest.java @@ -18,18 +18,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.permission; +package org.sonar.db.permission; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; +import java.util.List; +import javax.annotation.Nullable; import org.junit.Before; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import javax.annotation.Nullable; - -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/permission/UserWithPermissionTest.java b/sonar-db/src/test/java/org/sonar/db/permission/UserWithPermissionTest.java index 9bb731b564c..baada745f8c 100644 --- a/sonar-core/src/test/java/org/sonar/core/permission/UserWithPermissionTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/UserWithPermissionTest.java @@ -17,9 +17,10 @@ * 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.permission; +package org.sonar.db.permission; import org.junit.Test; +import org.sonar.core.permission.UserWithPermission; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/profiling/InvocationUtilsTest.java b/sonar-db/src/test/java/org/sonar/db/profiling/InvocationUtilsTest.java index 16f58339d03..dc2110c938e 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/profiling/InvocationUtilsTest.java +++ b/sonar-db/src/test/java/org/sonar/db/profiling/InvocationUtilsTest.java @@ -17,13 +17,12 @@ * 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.persistence.profiling; - -import org.junit.Test; -import org.sonar.test.TestUtils; +package org.sonar.db.profiling; import java.sql.Connection; import java.sql.SQLException; +import org.junit.Test; +import org.sonar.test.TestUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; @@ -48,7 +47,7 @@ public class InvocationUtilsTest { when(target.prepareStatement(failSql)).thenThrow(new SQLException("Expected")); try { - InvocationUtils.invokeQuietly(target, Connection.class.getMethod("prepareStatement", String.class), new Object[] { failSql }); + InvocationUtils.invokeQuietly(target, Connection.class.getMethod("prepareStatement", String.class), new Object[] {failSql}); fail(); } catch (Throwable t) { assertThat(t).isInstanceOf(SQLException.class); diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/profiling/ProfiledDataSourceTest.java b/sonar-db/src/test/java/org/sonar/db/profiling/ProfiledDataSourceTest.java index 26d6e9dbc6e..d52e95531f0 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/profiling/ProfiledDataSourceTest.java +++ b/sonar-db/src/test/java/org/sonar/db/profiling/ProfiledDataSourceTest.java @@ -17,12 +17,7 @@ * 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.persistence.profiling; - -import org.apache.commons.dbcp.BasicDataSource; -import org.junit.Rule; -import org.junit.Test; -import org.sonar.api.utils.log.LogTester; +package org.sonar.db.profiling; import java.io.ByteArrayInputStream; import java.lang.reflect.Method; @@ -32,9 +27,14 @@ import java.sql.Date; import java.sql.PreparedStatement; import java.sql.Statement; import java.sql.Timestamp; +import org.apache.commons.dbcp.BasicDataSource; +import org.junit.Rule; +import org.junit.Test; +import org.sonar.api.utils.log.LogTester; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class ProfiledDataSourceTest { diff --git a/sonar-core/src/test/java/org/sonar/core/properties/PropertiesDaoTest.java b/sonar-db/src/test/java/org/sonar/db/property/PropertiesDaoTest.java index 15182fc4719..3ad2527f610 100644 --- a/sonar-core/src/test/java/org/sonar/core/properties/PropertiesDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/property/PropertiesDaoTest.java @@ -18,19 +18,18 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.properties; +package org.sonar.db.property; import com.google.common.collect.ImmutableMap; +import java.util.Arrays; +import java.util.List; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; - -import java.util.Arrays; -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; diff --git a/sonar-core/src/test/java/org/sonar/core/properties/PropertyDtoTest.java b/sonar-db/src/test/java/org/sonar/db/property/PropertyDtoTest.java index cd352bff05e..796260782b2 100644 --- a/sonar-core/src/test/java/org/sonar/core/properties/PropertyDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/property/PropertyDtoTest.java @@ -17,10 +17,10 @@ * 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.properties; +package org.sonar.db.property; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerTestUtils.java b/sonar-db/src/test/java/org/sonar/db/purge/DbCleanerTestUtils.java index 0097b01a98c..c148aab159d 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerTestUtils.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/DbCleanerTestUtils.java @@ -18,10 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.db.purge; import org.sonar.api.utils.DateUtils; -import org.sonar.core.purge.PurgeableSnapshotDto; public final class DbCleanerTestUtils { diff --git a/sonar-core/src/test/java/org/sonar/core/purge/IdUuidPairsTest.java b/sonar-db/src/test/java/org/sonar/db/purge/IdUuidPairsTest.java index 9a0605a2ee9..21e527c1765 100644 --- a/sonar-core/src/test/java/org/sonar/core/purge/IdUuidPairsTest.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/IdUuidPairsTest.java @@ -18,14 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.purge; +package org.sonar.db.purge; import com.google.common.collect.Lists; +import java.util.List; import org.junit.Test; import org.sonar.test.TestUtils; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; public class IdUuidPairsTest { diff --git a/sonar-core/src/test/java/org/sonar/core/purge/PurgeCommandsTest.java b/sonar-db/src/test/java/org/sonar/db/purge/PurgeCommandsTest.java index 337df8294cc..0da36e52b04 100644 --- a/sonar-core/src/test/java/org/sonar/core/purge/PurgeCommandsTest.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/PurgeCommandsTest.java @@ -17,14 +17,14 @@ * 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.purge; +package org.sonar.db.purge; import java.util.List; import org.apache.ibatis.session.SqlSession; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.MyBatis; import static com.google.common.collect.Lists.newArrayList; diff --git a/sonar-core/src/test/java/org/sonar/core/purge/PurgeConfigurationTest.java b/sonar-db/src/test/java/org/sonar/db/purge/PurgeConfigurationTest.java index 04eee676108..a150c84ebd1 100644 --- a/sonar-core/src/test/java/org/sonar/core/purge/PurgeConfigurationTest.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/PurgeConfigurationTest.java @@ -17,14 +17,14 @@ * 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.purge; +package org.sonar.db.purge; import java.util.Date; import org.junit.Test; import org.sonar.api.config.Settings; import org.sonar.api.resources.Scopes; import org.sonar.api.utils.DateUtils; -import org.sonar.core.computation.dbcleaner.DbCleanerConstants; +import org.sonar.core.config.PurgeConstants; import static org.assertj.core.api.Assertions.assertThat; @@ -53,8 +53,8 @@ public class PurgeConfigurationTest { @Test public void do_not_delete_directory_by_default() { Settings settings = new Settings(); - settings.setProperty(DbCleanerConstants.PROPERTY_CLEAN_DIRECTORY, false); - settings.setProperty(DbCleanerConstants.DAYS_BEFORE_DELETING_CLOSED_ISSUES, 5); + settings.setProperty(PurgeConstants.PROPERTY_CLEAN_DIRECTORY, false); + settings.setProperty(PurgeConstants.DAYS_BEFORE_DELETING_CLOSED_ISSUES, 5); Date now = new Date(); PurgeConfiguration sut = PurgeConfiguration.newDefaultPurgeConfiguration(settings, new IdUuidPair(42L, "any-uuid")); @@ -67,7 +67,7 @@ public class PurgeConfigurationTest { @Test public void delete_directory_if_in_settings() { Settings settings = new Settings(); - settings.setProperty(DbCleanerConstants.PROPERTY_CLEAN_DIRECTORY, true); + settings.setProperty(PurgeConstants.PROPERTY_CLEAN_DIRECTORY, true); PurgeConfiguration sut = PurgeConfiguration.newDefaultPurgeConfiguration(settings, new IdUuidPair(42L, "any-uuid")); diff --git a/sonar-core/src/test/java/org/sonar/core/purge/PurgeDaoTest.java b/sonar-db/src/test/java/org/sonar/db/purge/PurgeDaoTest.java index b8bd2786135..592e42b406e 100644 --- a/sonar-core/src/test/java/org/sonar/core/purge/PurgeDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/PurgeDaoTest.java @@ -17,19 +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.purge; +package org.sonar.db.purge; +import java.util.List; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.sonar.api.resources.Scopes; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.resource.ResourceDao; - -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; +import org.sonar.db.MyBatis; +import org.sonar.db.component.ResourceDao; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -96,7 +95,7 @@ public class PurgeDaoTest extends AbstractDaoTestCase { @Test public void shouldDeleteHistoricalDataOfDirectoriesAndFiles() { setupData("shouldDeleteHistoricalDataOfDirectoriesAndFiles"); - sut.purge(new PurgeConfiguration(new IdUuidPair(1L, "1"), new String[]{Scopes.DIRECTORY, Scopes.FILE}, 30), PurgeListener.EMPTY); + sut.purge(new PurgeConfiguration(new IdUuidPair(1L, "1"), new String[] {Scopes.DIRECTORY, Scopes.FILE}, 30), PurgeListener.EMPTY); checkTables("shouldDeleteHistoricalDataOfDirectoriesAndFiles", "projects", "snapshots"); } @@ -104,7 +103,7 @@ public class PurgeDaoTest extends AbstractDaoTestCase { public void disable_resources_without_last_snapshot() { setupData("disable_resources_without_last_snapshot"); sut.purge(newConfigurationWith30Days(system2), PurgeListener.EMPTY); - checkTables("disable_resources_without_last_snapshot", new String[]{"issue_close_date", "issue_update_date"}, "projects", "snapshots", "issues"); + checkTables("disable_resources_without_last_snapshot", new String[] {"issue_close_date", "issue_update_date"}, "projects", "snapshots", "issues"); } @Test diff --git a/sonar-core/src/test/java/org/sonar/core/purge/PurgeProfilerTest.java b/sonar-db/src/test/java/org/sonar/db/purge/PurgeProfilerTest.java index fa80b2ea735..2823ee39d75 100644 --- a/sonar-core/src/test/java/org/sonar/core/purge/PurgeProfilerTest.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/PurgeProfilerTest.java @@ -17,7 +17,7 @@ * 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.purge; +package org.sonar.db.purge; import org.junit.Before; import org.junit.Test; @@ -80,7 +80,7 @@ public class PurgeProfilerTest { verify(logger).info(contains("bar: 5ms")); } - private class MockedClock extends org.sonar.core.purge.PurgeProfiler.Clock { + private class MockedClock extends PurgeProfiler.Clock { private long now = 0; @Override diff --git a/sonar-core/src/test/java/org/sonar/core/purge/PurgeableSnapshotDtoTest.java b/sonar-db/src/test/java/org/sonar/db/purge/PurgeableSnapshotDtoTest.java index 58e3c0e3551..ec61f04f4fd 100644 --- a/sonar-core/src/test/java/org/sonar/core/purge/PurgeableSnapshotDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/PurgeableSnapshotDtoTest.java @@ -17,12 +17,12 @@ * 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.purge; +package org.sonar.db.purge; import org.junit.Test; -import static org.hamcrest.core.Is.is; import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; public class PurgeableSnapshotDtoTest { diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleanerTest.java b/sonar-db/src/test/java/org/sonar/db/purge/period/DefaultPeriodCleanerTest.java index fafd5bf23f3..1aa9d8aebcb 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleanerTest.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/period/DefaultPeriodCleanerTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.db.purge.period; import java.util.Arrays; import org.apache.commons.lang.ObjectUtils; @@ -28,10 +28,10 @@ import org.mockito.ArgumentMatcher; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.purge.PurgeDao; -import org.sonar.core.purge.PurgeSnapshotQuery; -import org.sonar.core.purge.PurgeableSnapshotDto; +import org.sonar.db.DbSession; +import org.sonar.db.purge.PurgeDao; +import org.sonar.db.purge.PurgeSnapshotQuery; +import org.sonar.db.purge.PurgeableSnapshotDto; import static org.mockito.Mockito.anyListOf; import static org.mockito.Mockito.argThat; diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilterTest.java b/sonar-db/src/test/java/org/sonar/db/purge/period/DeleteAllFilterTest.java index 57be167fc5d..7f59cb68a8c 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilterTest.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/period/DeleteAllFilterTest.java @@ -18,15 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; - -import org.junit.Test; -import org.sonar.api.utils.DateUtils; -import org.sonar.core.computation.dbcleaner.DbCleanerTestUtils; -import org.sonar.core.purge.PurgeableSnapshotDto; +package org.sonar.db.purge.period; import java.util.Arrays; import java.util.List; +import org.junit.Test; +import org.sonar.api.utils.DateUtils; +import org.sonar.db.purge.DbCleanerTestUtils; +import org.sonar.db.purge.PurgeableSnapshotDto; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/IntervalTest.java b/sonar-db/src/test/java/org/sonar/db/purge/period/IntervalTest.java index 07b0bc19579..dbae556bfa4 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/IntervalTest.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/period/IntervalTest.java @@ -18,17 +18,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; - -import org.junit.Test; -import org.sonar.api.utils.DateUtils; -import org.sonar.core.purge.PurgeableSnapshotDto; -import org.sonar.core.computation.dbcleaner.DbCleanerTestUtils; +package org.sonar.db.purge.period; import java.util.Arrays; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.List; +import org.junit.Test; +import org.sonar.api.utils.DateUtils; +import org.sonar.db.purge.DbCleanerTestUtils; +import org.sonar.db.purge.PurgeableSnapshotDto; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilterTest.java b/sonar-db/src/test/java/org/sonar/db/purge/period/KeepOneFilterTest.java index c449eddc134..94845f431ae 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilterTest.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/period/KeepOneFilterTest.java @@ -18,20 +18,18 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.db.purge.period; import com.google.common.base.Function; import com.google.common.collect.Iterables; -import org.junit.Test; -import org.sonar.api.utils.DateUtils; -import org.sonar.core.purge.PurgeableSnapshotDto; -import org.sonar.core.computation.dbcleaner.DbCleanerTestUtils; - -import javax.annotation.Nullable; - import java.util.Arrays; import java.util.Calendar; import java.util.List; +import javax.annotation.Nullable; +import org.junit.Test; +import org.sonar.api.utils.DateUtils; +import org.sonar.db.purge.DbCleanerTestUtils; +import org.sonar.db.purge.PurgeableSnapshotDto; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationDaoTest.java b/sonar-db/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java index 1be6ad63dd3..e9fc43db574 100644 --- a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest.java @@ -18,13 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualitygate.db; +package org.sonar.db.qualitygate; +import java.util.List; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationDtoTest.java b/sonar-db/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationDtoTest.java index e5213a74319..2b51c8f450c 100644 --- a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationDtoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualitygate.db; +package org.sonar.db.qualitygate; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationQueryTest.java b/sonar-db/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationQueryTest.java index 0a08efecac9..e8b12e11569 100644 --- a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/ProjectQgateAssociationQueryTest.java +++ b/sonar-db/src/test/java/org/sonar/db/qualitygate/ProjectQgateAssociationQueryTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualitygate.db; +package org.sonar.db.qualitygate; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest.java b/sonar-db/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java index 7402e5c3456..8e2840e09df 100644 --- a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java @@ -17,11 +17,11 @@ * 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.qualitygate.db; +package org.sonar.db.qualitygate; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/QualityGateConditionDtoTest.java b/sonar-db/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDtoTest.java index ea8b962caa6..84e7bbc46df 100644 --- a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/QualityGateConditionDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDtoTest.java @@ -17,14 +17,22 @@ * 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.qualitygate.db; +package org.sonar.db.qualitygate; import org.junit.Test; import org.sonar.api.measures.Metric.ValueType; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.api.measures.Metric.ValueType.*; -import static org.sonar.core.qualitygate.db.QualityGateConditionDto.isOperatorAllowed; +import static org.sonar.api.measures.Metric.ValueType.BOOL; +import static org.sonar.api.measures.Metric.ValueType.DATA; +import static org.sonar.api.measures.Metric.ValueType.FLOAT; +import static org.sonar.api.measures.Metric.ValueType.INT; +import static org.sonar.api.measures.Metric.ValueType.LEVEL; +import static org.sonar.api.measures.Metric.ValueType.MILLISEC; +import static org.sonar.api.measures.Metric.ValueType.PERCENT; +import static org.sonar.api.measures.Metric.ValueType.RATING; +import static org.sonar.api.measures.Metric.ValueType.STRING; +import static org.sonar.db.qualitygate.QualityGateConditionDto.isOperatorAllowed; public class QualityGateConditionDtoTest { @@ -43,7 +51,7 @@ public class QualityGateConditionDtoTest { assertThat(isOperatorAllowed("LT", LEVEL)).isFalse(); assertThat(isOperatorAllowed("GT", LEVEL)).isFalse(); - for (ValueType type: new ValueType[] { STRING, INT, FLOAT, PERCENT, MILLISEC, RATING }) { + for (ValueType type : new ValueType[] {STRING, INT, FLOAT, PERCENT, MILLISEC, RATING}) { assertThat(isOperatorAllowed("EQ", type)).isTrue(); assertThat(isOperatorAllowed("NE", type)).isTrue(); assertThat(isOperatorAllowed("LT", type)).isTrue(); diff --git a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/QualityGateDaoTest.java b/sonar-db/src/test/java/org/sonar/db/qualitygate/QualityGateDaoTest.java index a7ac27d5286..707bd159e5e 100644 --- a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/QualityGateDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/qualitygate/QualityGateDaoTest.java @@ -17,14 +17,13 @@ * 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.qualitygate.db; - -import org.junit.Before; -import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; +package org.sonar.db.qualitygate; import java.util.Collection; import java.util.Iterator; +import org.junit.Before; +import org.junit.Test; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest.java b/sonar-db/src/test/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java index c3d8ede823c..7c3eeaa1d08 100644 --- a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/qualityprofile/ActiveRuleDaoTest.java @@ -18,14 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualityprofile.db; +package org.sonar.db.qualityprofile; +import java.util.List; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; - -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/ActiveRuleKeyTest.java b/sonar-db/src/test/java/org/sonar/db/qualityprofile/ActiveRuleKeyTest.java index f2c1ddbf51b..e89f7d81213 100644 --- a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/ActiveRuleKeyTest.java +++ b/sonar-db/src/test/java/org/sonar/db/qualityprofile/ActiveRuleKeyTest.java @@ -17,7 +17,7 @@ * 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.qualityprofile.db; +package org.sonar.db.qualityprofile; import org.junit.Test; import org.sonar.api.rule.RuleKey; diff --git a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/ActiveRuleParamDtoTest.java b/sonar-db/src/test/java/org/sonar/db/qualityprofile/ActiveRuleParamDtoTest.java index d930967fd12..43a5ff98305 100644 --- a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/ActiveRuleParamDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/qualityprofile/ActiveRuleParamDtoTest.java @@ -17,14 +17,13 @@ * 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.qualityprofile.db; - -import org.junit.Test; +package org.sonar.db.qualityprofile; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Map; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -36,7 +35,7 @@ public class ActiveRuleParamDtoTest { Collection<ActiveRuleParamDto> dtos = Arrays.asList( new ActiveRuleParamDto().setKey("foo"), new ActiveRuleParamDto().setKey("bar") - ); + ); Map<String, ActiveRuleParamDto> group = ActiveRuleParamDto.groupByKey(dtos); assertThat(group.keySet()).containsOnly("foo", "bar"); } diff --git a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/QualityProfileDaoTest.java b/sonar-db/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java index 1839da2b120..a70307ea49e 100644 --- a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/QualityProfileDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java @@ -18,18 +18,17 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.qualityprofile.db; +package org.sonar.db.qualityprofile; +import java.util.List; import org.assertj.core.data.MapEntry; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.UtcDateUtils; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; - -import java.util.List; +import org.sonar.core.util.UtcDateUtils; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -63,7 +62,7 @@ public class QualityProfileDaoTest extends AbstractDaoTestCase { dao.insert(dto); - checkTables("insert", new String[]{"created_at", "updated_at", "rules_updated_at"}, "rules_profiles"); + checkTables("insert", new String[] {"created_at", "updated_at", "rules_updated_at"}, "rules_profiles"); } @Test @@ -79,7 +78,7 @@ public class QualityProfileDaoTest extends AbstractDaoTestCase { dao.update(dto); - checkTables("update", new String[]{"created_at", "updated_at", "rules_updated_at"}, "rules_profiles"); + checkTables("update", new String[] {"created_at", "updated_at", "rules_updated_at"}, "rules_profiles"); } @Test diff --git a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java b/sonar-db/src/test/java/org/sonar/db/rule/RuleDaoTest.java index b6e59773e8c..34736c205ac 100644 --- a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/rule/RuleDaoTest.java @@ -17,14 +17,13 @@ * 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.rule; +package org.sonar.db.rule; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.sonar.api.rule.RuleStatus; -import org.sonar.core.persistence.AbstractDaoTestCase; - -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreDaoTest.java b/sonar-db/src/test/java/org/sonar/db/semaphore/SemaphoreDaoTest.java index b12abc5da36..30adc2b980e 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/semaphore/SemaphoreDaoTest.java @@ -17,8 +17,11 @@ * 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.persistence; +package org.sonar.db.semaphore; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.atomic.AtomicInteger; import org.apache.ibatis.session.SqlSession; import org.junit.Before; import org.junit.Rule; @@ -26,10 +29,8 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.utils.Semaphores; import org.sonar.api.utils.System2; - -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.CyclicBarrier; -import java.util.concurrent.atomic.AtomicInteger; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.MyBatis; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreUpdaterTest.java b/sonar-db/src/test/java/org/sonar/db/semaphore/SemaphoreUpdaterTest.java index 170d5d59c2e..129a8914ce0 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoreUpdaterTest.java +++ b/sonar-db/src/test/java/org/sonar/db/semaphore/SemaphoreUpdaterTest.java @@ -17,13 +17,14 @@ * 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.persistence; +package org.sonar.db.semaphore; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.utils.Semaphores; +import org.sonar.db.AbstractDaoTestCase; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoresImplTest.java b/sonar-db/src/test/java/org/sonar/db/semaphore/SemaphoresImplTest.java index 416a5a8a630..a8d13641fdd 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/SemaphoresImplTest.java +++ b/sonar-db/src/test/java/org/sonar/db/semaphore/SemaphoresImplTest.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.db.semaphore; import org.junit.Test; import org.sonar.api.utils.Semaphores; diff --git a/sonar-core/src/test/java/org/sonar/core/source/db/FileSourceDtoTest.java b/sonar-db/src/test/java/org/sonar/db/source/FileSourceDtoTest.java index a9c08b44a17..624dd4262cb 100644 --- a/sonar-core/src/test/java/org/sonar/core/source/db/FileSourceDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/source/FileSourceDtoTest.java @@ -18,13 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.source.db; - -import org.junit.Test; -import org.sonar.server.source.db.FileSourceDb; +package org.sonar.db.source; import java.util.Arrays; import java.util.List; +import org.junit.Test; +import org.sonar.server.source.db.FileSourceDb; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/user/AuthorDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/AuthorDaoTest.java index 3d9fe278bb3..9cda23c3417 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/AuthorDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/AuthorDaoTest.java @@ -17,14 +17,14 @@ * 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.user; +package org.sonar.db.user; import org.junit.Before; import org.junit.Test; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.resource.ResourceDao; -import org.sonar.core.resource.ResourceDto; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.component.ResourceDao; +import org.sonar.db.component.ResourceDto; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/sonar-core/src/test/java/org/sonar/core/user/AuthorizationDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/AuthorizationDaoTest.java index b31d094e936..ce5990951f9 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/AuthorizationDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/AuthorizationDaoTest.java @@ -17,17 +17,16 @@ * 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.user; +package org.sonar.db.user; import com.google.common.collect.Sets; +import java.util.Collection; +import java.util.Collections; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; - -import java.util.Collection; -import java.util.Collections; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/user/GroupDtoTest.java b/sonar-db/src/test/java/org/sonar/db/user/GroupDtoTest.java index 41434d92e6c..35d79814cfc 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/GroupDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/GroupDtoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.user; +package org.sonar.db.user; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/user/GroupMembershipDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java index e2b45132d91..f5327223d39 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/GroupMembershipDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.user; +package org.sonar.db.user; import com.google.common.collect.Multimap; import java.util.Arrays; @@ -28,9 +28,9 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; +import org.sonar.db.MyBatis; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; @@ -234,13 +234,13 @@ public class GroupMembershipDaoTest { public void select_users_not_affected_to_a_group_by_query() { dbTester.prepareDbUnit(getClass(), "shared_plus_empty_group.xml"); - // 100 has 1 member + // 100 has 1 member assertThat(dao.selectMembers(dbSession, UserMembershipQuery.builder().groupId(100L).membership(UserMembershipQuery.OUT).build(), 0, 10)).hasSize(1); - // 101 has 2 members + // 101 has 2 members assertThat(dao.selectMembers(dbSession, UserMembershipQuery.builder().groupId(101L).membership(UserMembershipQuery.OUT).build(), 0, 10)).isEmpty(); - // 102 has 1 member + // 102 has 1 member assertThat(dao.selectMembers(dbSession, UserMembershipQuery.builder().groupId(102L).membership(UserMembershipQuery.OUT).build(), 0, 10)).hasSize(1); - // 103 has no member + // 103 has no member assertThat(dao.selectMembers(dbSession, UserMembershipQuery.builder().groupId(103L).membership(UserMembershipQuery.OUT).build(), 0, 10)).hasSize(2); } @@ -255,7 +255,7 @@ public class GroupMembershipDaoTest { assertThat(result.get(1).getName()).isEqualTo("Not Admin"); result = dao.selectMembers(dbSession, UserMembershipQuery.builder().groupId(100L).memberSearch("not").build(), 0, 10); - assertThat(result).hasSize(1); + assertThat(result).hasSize(1); } @Test diff --git a/sonar-core/src/test/java/org/sonar/core/user/GroupMembershipDtoTest.java b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDtoTest.java index a5148779db0..c8a1dadb4c3 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/GroupMembershipDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipDtoTest.java @@ -18,9 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.user; +package org.sonar.db.user; import org.junit.Test; +import org.sonar.core.user.GroupMembership; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/user/GroupMembershipQueryTest.java b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipQueryTest.java index 8478c83c10b..3edbcf430ef 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/GroupMembershipQueryTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipQueryTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.user; +package org.sonar.db.user; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/user/GroupMembershipTest.java b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipTest.java index 82bd34a88d9..9838d364417 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/GroupMembershipTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/GroupMembershipTest.java @@ -17,9 +17,10 @@ * 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.user; +package org.sonar.db.user; import org.junit.Test; +import org.sonar.core.user.GroupMembership; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/user/RoleDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/RoleDaoTest.java index 0538f277111..df2470f74f7 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/RoleDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/RoleDaoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.user; +package org.sonar.db.user; import org.junit.After; import org.junit.Before; @@ -28,8 +28,8 @@ import org.junit.experimental.categories.Category; import org.sonar.api.security.DefaultGroups; import org.sonar.api.web.UserRole; import org.sonar.core.permission.GlobalPermissions; -import org.sonar.core.persistence.DbSession; -import org.sonar.core.persistence.DbTester; +import org.sonar.db.DbSession; +import org.sonar.db.DbTester; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/user/RoleMapperTest.java b/sonar-db/src/test/java/org/sonar/db/user/RoleMapperTest.java index fc521984917..8c7f671c029 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/RoleMapperTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/RoleMapperTest.java @@ -17,14 +17,14 @@ * 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.user; +package org.sonar.db.user; import org.apache.ibatis.session.SqlSession; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.MyBatis; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.MyBatis; import static org.assertj.core.api.Assertions.assertThat; @@ -60,7 +60,6 @@ public class RoleMapperTest extends AbstractDaoTestCase { mapper.deleteUserRolesByResourceId(123L); session.commit(); - checkTables("deleteRolesByResourceId", "group_roles", "user_roles"); } diff --git a/sonar-core/src/test/java/org/sonar/core/user/UserDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/UserDaoTest.java index c1d92ffd452..01536c72643 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/UserDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/UserDaoTest.java @@ -17,21 +17,20 @@ * 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.user; +package org.sonar.db.user; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.sonar.api.user.UserQuery; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.persistence.DbSession; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; +import org.sonar.db.AbstractDaoTestCase; +import org.sonar.db.DbSession; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/sonar-core/src/test/java/org/sonar/core/user/UserDtoTest.java b/sonar-db/src/test/java/org/sonar/db/user/UserDtoTest.java index ca2ce0601bd..74e21d9fe94 100644 --- a/sonar-core/src/test/java/org/sonar/core/user/UserDtoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/UserDtoTest.java @@ -17,12 +17,11 @@ * 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.user; - -import org.junit.Test; +package org.sonar.db.user; import java.util.Arrays; import java.util.Collections; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseVersionTest.java b/sonar-db/src/test/java/org/sonar/db/version/DatabaseVersionTest.java index bf22c224c5d..05f8f056bf2 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/DatabaseVersionTest.java +++ b/sonar-db/src/test/java/org/sonar/db/version/DatabaseVersionTest.java @@ -17,10 +17,10 @@ * 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.persistence; - +package org.sonar.db.version; import org.junit.Test; +import org.sonar.db.AbstractDaoTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/migration/v44/ChangeLogTest.java b/sonar-db/src/test/java/org/sonar/db/version/v44/ChangeLogTest.java index 092c4ccf9a5..b260b793146 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/migration/v44/ChangeLogTest.java +++ b/sonar-db/src/test/java/org/sonar/db/version/v44/ChangeLogTest.java @@ -17,7 +17,7 @@ * 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.persistence.migration.v44; +package org.sonar.db.version.v44; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/migration/v44/ProfileMeasureTest.java b/sonar-db/src/test/java/org/sonar/db/version/v44/ProfileMeasureTest.java index b2fc695bc9f..050408aa4cd 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/migration/v44/ProfileMeasureTest.java +++ b/sonar-db/src/test/java/org/sonar/db/version/v44/ProfileMeasureTest.java @@ -17,7 +17,7 @@ * 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.persistence.migration.v44; +package org.sonar.db.version.v44; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/migration/v50/ComponentTest.java b/sonar-db/src/test/java/org/sonar/db/version/v50/ComponentTest.java index cea162271a0..409d2b1b35b 100644 --- a/sonar-core/src/test/java/org/sonar/core/persistence/migration/v50/ComponentTest.java +++ b/sonar-db/src/test/java/org/sonar/db/version/v50/ComponentTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.persistence.migration.v50; +package org.sonar.db.version.v50; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/jpa/test/AbstractDbUnitTestCase.java b/sonar-db/src/test/java/org/sonar/jpa/test/AbstractDbUnitTestCase.java index cb7cc117c9f..d4743f578cc 100644 --- a/sonar-core/src/test/java/org/sonar/jpa/test/AbstractDbUnitTestCase.java +++ b/sonar-db/src/test/java/org/sonar/jpa/test/AbstractDbUnitTestCase.java @@ -39,14 +39,13 @@ import org.dbunit.ext.mssql.InsertIdentityOperation; import org.dbunit.operation.DatabaseOperation; import org.junit.Before; import org.junit.BeforeClass; -import org.sonar.core.cluster.NullQueue; -import org.sonar.core.config.Logback; -import org.sonar.core.persistence.Database; -import org.sonar.core.persistence.DatabaseCommands; -import org.sonar.core.persistence.DatabaseVersion; -import org.sonar.core.persistence.H2Database; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.persistence.SchemaMigrationMapper; +import org.sonar.db.Database; +import org.sonar.db.DatabaseCommands; +import org.sonar.db.H2Database; +import org.sonar.db.MyBatis; +import org.sonar.db.deprecated.NullQueue; +import org.sonar.db.version.DatabaseVersion; +import org.sonar.db.version.SchemaMigrationMapper; import static org.junit.Assert.fail; @@ -68,7 +67,7 @@ public abstract class AbstractDbUnitTestCase { databaseCommands = DatabaseCommands.forDialect(database.getDialect()); - myBatis = new MyBatis(database, new Logback(), new NullQueue()); + myBatis = new MyBatis(database, new NullQueue()); myBatis.start(); try (SqlSession session = myBatis.openSession(false)) { session.getMapper(SchemaMigrationMapper.class).insert(String.valueOf(DatabaseVersion.LAST_VERSION)); diff --git a/sonar-core/src/test/resources/logback-test.xml b/sonar-db/src/test/resources/logback-test.xml index 8822a606d96..4b0ff6da04b 100644 --- a/sonar-core/src/test/resources/logback-test.xml +++ b/sonar-db/src/test/resources/logback-test.xml @@ -21,16 +21,11 @@ </logger> <!-- required for DryRunDatabaseFactoryTest --> - <logger name="org.sonar.core.persistence.DryRunDatabaseFactory"> - <level value="DEBUG"/> + <logger name="org.elasticsearch"> + <level value="WARN"/> </logger> - <!-- required for DryRunDatabaseFactoryTest --> - <logger name="org.elasticsearch"> - <level value="WARN"/> - </logger> - - <root> + <root> <level value="INFO"/> <appender-ref ref="STDOUT"/> </root> diff --git a/sonar-core/src/test/resources/org/sonar/api/database/configuration/DatabaseConfigurationTest/some-properties.xml b/sonar-db/src/test/resources/org/sonar/api/database/configuration/DatabaseConfigurationTest/some-properties.xml index 64c38fb55ea..64c38fb55ea 100644 --- a/sonar-core/src/test/resources/org/sonar/api/database/configuration/DatabaseConfigurationTest/some-properties.xml +++ b/sonar-db/src/test/resources/org/sonar/api/database/configuration/DatabaseConfigurationTest/some-properties.xml diff --git a/sonar-db/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml b/sonar-db/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml new file mode 100644 index 00000000000..6e9cab1c815 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml @@ -0,0 +1,13 @@ +<dataset> + <quality_models id="1" name="M1"/> + <quality_models id="2" name="M2"/> + + <characteristics id="1" kee="M1C1" name="M1C1" parent_id="[null]" root_id="[null]" rule_id="[null]" + characteristic_order="1" enabled="true"/> + <characteristics id="2" kee="M1C2" name="M1C2" parent_id="[null]" root_id="[null]" ule_id="[null]" + characteristic_order="1" enabled="true"/> + <characteristics id="3" kee="M2C1" name="M2C1" parent_id="[null]" root_id="[null]" rule_id="[null]" + characteristic_order="1" enabled="true"/> + + <characteristic_edges child_id="2" parent_id="1"/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/fail_when_no_default_template_is_defined.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/fail_when_no_default_template_is_defined.xml index 1fffc1facb2..1fffc1facb2 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/fail_when_no_default_template_is_defined.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/fail_when_no_default_template_is_defined.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles-result.xml index 5318ae07093..5318ae07093 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles.xml index 7b4f431e449..1291c08b42a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles.xml @@ -2,9 +2,9 @@ <projects id="123" kee="com.foo:bar"/> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> + <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> <!-- on other resources --> <group_roles id="1" group_id="100" resource_id="1" role="admin"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern-result.xml index 8864e90715b..9ada7f379cb 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern-result.xml @@ -3,11 +3,11 @@ <groups id="100" name="sonar-administrators"/> <groups id="101" name="sonar-users"/> - <groups id="102" name="sonar-foos" /> - <groups id="103" name="sonar-bars" /> + <groups id="102" name="sonar-foos"/> + <groups id="103" name="sonar-bars"/> - <users id="200" login="foo" name="Foo" email="[null]" active="[true]" /> - <users id="201" login="bar" name="Bar" email="[null]" active="[true]" /> + <users id="200" login="foo" name="Foo" email="[null]" active="[true]"/> + <users id="201" login="bar" name="Bar" email="[null]" active="[true]"/> <!-- on other resources --> <group_roles id="1" group_id="100" resource_id="1" role="admin"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern.xml index b7e461436b3..667ef671ce1 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern.xml @@ -1,13 +1,13 @@ <dataset> <projects id="123" kee="foo.project"/> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> - <groups id="102" name="sonar-foos" /> - <groups id="103" name="sonar-bars" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> + <groups id="102" name="sonar-foos"/> + <groups id="103" name="sonar-bars"/> - <users id="200" login="foo" name="Foo" email="[null]" active="[true]" /> - <users id="201" login="bar" name="Bar" email="[null]" active="[true]" /> + <users id="200" login="foo" name="Foo" email="[null]" active="[true]"/> + <users id="201" login="bar" name="Bar" email="[null]" active="[true]"/> <!-- on other resources --> <group_roles id="1" group_id="100" resource_id="1" role="admin"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject-result.xml index fba9c21345f..a70196dc547 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject-result.xml @@ -1,9 +1,9 @@ <dataset> <projects id="123" kee="foo.project"/> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> + <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> <!-- on other resources --> <group_roles id="1" group_id="100" resource_id="1" role="admin"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject.xml index d8299ec32f9..3b60c1c78d4 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject.xml @@ -1,9 +1,9 @@ <dataset> <projects id="123" kee="foo.project"/> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> + <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> <!-- on other resources --> <group_roles id="1" group_id="100" resource_id="1" role="admin"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesSeveralPattern.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesSeveralPattern.xml index 620fc9294db..25fdc99252c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesSeveralPattern.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesSeveralPattern.xml @@ -1,13 +1,13 @@ <dataset> <projects id="123" kee="foo.project"/> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> - <groups id="102" name="sonar-foos" /> - <groups id="103" name="sonar-bars" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> + <groups id="102" name="sonar-foos"/> + <groups id="103" name="sonar-bars"/> - <users id="200" login="foo" name="Foo" email="[null]" active="[true]" /> - <users id="201" login="bar" name="Bar" email="[null]" active="[true]" /> + <users id="200" login="foo" name="Foo" email="[null]" active="[true]"/> + <users id="201" login="bar" name="Bar" email="[null]" active="[true]"/> <!-- on other resources --> <group_roles id="1" group_id="100" resource_id="1" role="admin"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group-result.xml index ea9b6e062fc..ea9b6e062fc 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group.xml index 3511c044e53..d1b61aa180c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group.xml @@ -1,9 +1,9 @@ <dataset> <projects id="123" kee="foo.project"/> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> + <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> <!-- on other resources --> <group_roles id="1" group_id="100" resource_id="1" role="admin"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users-result.xml index 319040d44b5..319040d44b5 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users.xml index 6ba7c6c3446..72a71613609 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users.xml @@ -1,10 +1,10 @@ <dataset> <projects id="123" kee="foo.project"/> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]" /> - <users id="201" login="disabled" name="Disabled" email="[null]" active="[false]" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> + <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <users id="201" login="disabled" name="Disabled" email="[null]" active="[false]"/> <!-- on other resources --> <group_roles id="1" group_id="100" resource_id="1" role="admin"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole-result.xml index 9d3ae472eb6..9d3ae472eb6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole-result.xml diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole.xml new file mode 100644 index 00000000000..8e0c38ff39f --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole.xml @@ -0,0 +1,4 @@ +<dataset> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone-result.xml new file mode 100644 index 00000000000..62ecece0705 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone-result.xml @@ -0,0 +1,6 @@ +<dataset> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> + + <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone.xml new file mode 100644 index 00000000000..8e0c38ff39f --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_anyone.xml @@ -0,0 +1,4 @@ +<dataset> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_group_not_found-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_group_not_found-result.xml index 78695dd52b2..41ed8af1f82 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_group_not_found-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_group_not_found-result.xml @@ -1,7 +1,7 @@ <dataset> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> <!-- already existed --> <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_group_not_found.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_group_not_found.xml index 78695dd52b2..41ed8af1f82 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_group_not_found.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_group_not_found.xml @@ -1,7 +1,7 @@ <dataset> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> <!-- already existed --> <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_not_persisted-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_not_persisted-result.xml index 78695dd52b2..41ed8af1f82 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_not_persisted-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_not_persisted-result.xml @@ -1,7 +1,7 @@ <dataset> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> <!-- already existed --> <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_not_persisted.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_not_persisted.xml index 78695dd52b2..41ed8af1f82 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_not_persisted.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantGroupRole_ignore_if_not_persisted.xml @@ -1,7 +1,7 @@ <dataset> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> <!-- already existed --> <group_roles id="1" group_id="[null]" resource_id="123" role="admin"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole-result.xml index 7f154cd1915..7f154cd1915 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole.xml index d513321d554..24349836265 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole.xml @@ -1,3 +1,3 @@ <dataset> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]" /> -</dataset>
\ No newline at end of file + <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/hasRoles.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/hasRoles.xml index 3d5f9a5ecf2..3d5f9a5ecf2 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/hasRoles.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/hasRoles.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/DeprecatedUserFinderTest/fixture.xml b/sonar-db/src/test/resources/org/sonar/core/user/DeprecatedUserFinderTest/fixture.xml index 456f9305802..9d370e86a70 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/DeprecatedUserFinderTest/fixture.xml +++ b/sonar-db/src/test/resources/org/sonar/core/user/DeprecatedUserFinderTest/fixture.xml @@ -1,6 +1,6 @@ <dataset> - <users id="1" login="simon" name="Simon Brandhof" email="simon.brandhof@sonarsource.com" /> - <users id="2" login="godin" name="Evgeny Mandrikov" email="evgeny.mandrikov@sonarsource.com" /> + <users id="1" login="simon" name="Simon Brandhof" email="simon.brandhof@sonarsource.com"/> + <users id="2" login="godin" name="Evgeny Mandrikov" email="evgeny.mandrikov@sonarsource.com"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture-including-ghost-projects-and-technical-project.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/fixture-including-ghost-projects-and-technical-project.xml index df485aa2d32..01781afd684 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture-including-ghost-projects-and-technical-project.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/fixture-including-ghost-projects-and-technical-project.xml @@ -4,16 +4,17 @@ <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" - status="P" islast="[true]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" - version="[null]" path=""/> + status="P" islast="[true]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path=""/> <snapshots id="10" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" status="P" islast="[false]" purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" @@ -28,49 +29,53 @@ <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" scope="PRJ" qualifier="BRC" long_name="Struts Core" uuid="EFGH" project_uuid="ABCD" module_uuid="[null]" module_uuid_path=".ABCD." - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/> + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" - status="P" islast="[true]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="BRC" created_at="1228222680000" build_date="1228222680000" - version="[null]" path="1."/> + status="P" islast="[true]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="PRJ" qualifier="BRC" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="1."/> <!-- directory --> <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.struts:struts:org.struts" - name="org.struts" root_id="1" - description="[null]" - uuid="GHIJ" project_uuid="ABCD" module_uuid="EFGH" module_uuid_path=".ABCD.EFGH." - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/> + name="org.struts" root_id="1" + description="[null]" + uuid="GHIJ" project_uuid="ABCD" module_uuid="EFGH" module_uuid_path=".ABCD.EFGH." + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> <snapshots id="3" project_id="3" parent_snapshot_id="2" root_project_id="1" root_snapshot_id="1" - status="P" islast="[true]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="DIR" qualifier="PAC" created_at="1228222680000" build_date="1228222680000" - version="[null]" path="1.2."/> + status="P" islast="[true]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="DIR" qualifier="PAC" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="1.2."/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.struts:struts:org.struts.RequestContext" + <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" + kee="org.struts:struts:org.struts.RequestContext" name="RequestContext" root_id="1" uuid="KLMN" project_uuid="ABCD" module_uuid="EFGH" module_uuid_path=".ABCD.EFGH." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> <snapshots id="4" project_id="4" parent_snapshot_id="3" root_project_id="1" root_snapshot_id="1" - status="P" islast="[true]" purge_status="[null]" - period1_mode="[null]" period1_param="[null]" period1_date="[null]" - period2_mode="[null]" period2_param="[null]" period2_date="[null]" - period3_mode="[null]" period3_param="[null]" period3_date="[null]" - period4_mode="[null]" period4_param="[null]" period4_date="[null]" - period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="FIL" qualifier="CLA" created_at="1228222680000" build_date="1228222680000" - version="[null]" path="1.2.3."/> + status="P" islast="[true]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="FIL" qualifier="CLA" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="1.2.3."/> <!-- technical project --> <projects id="5" root_id="[null]" scope="PRJ" qualifier="TRK" kee="COPYorg.struts:struts" name="Struts" @@ -107,7 +112,8 @@ <projects id="7" root_id="[null]" kee="org.sample:sample" name="Sample" scope="PRJ" qualifier="TRK" long_name="Sample" uuid="NOSNAPSHOT" project_uuid="[null]" module_uuid="[null]" module_uuid_path="." - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/> + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> <!-- project not enabled --> <projects id="8" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.apache:tika" name="Tika" diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/fixture.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/fixture.xml new file mode 100644 index 00000000000..76692345910 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/fixture.xml @@ -0,0 +1,86 @@ +<dataset> + + <!-- Struts projects is authorized for all user --> + <group_roles id="1" group_id="[null]" resource_id="1" role="user"/> + + + <!-- root project --> + <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" + uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." + description="the description" long_name="Apache Struts" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + created_at="2008-12-02" authorization_updated_at="123456789"/> + <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" + status="P" islast="[true]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path=""/> + <snapshots id="10" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" + status="P" islast="[false]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228136280000" build_date="1228136280000" + version="[null]" path=""/> + + <!-- module --> + <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" + uuid="BCDE" project_uuid="ABCD" module_uuid="[null]" module_uuid_path=".ABCD." + scope="PRJ" qualifier="BRC" long_name="Struts Core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="2008-12-02" authorization_updated_at="[null]"/> + <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" + status="P" islast="[true]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="PRJ" qualifier="BRC" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="1."/> + + <!-- directory --> + <projects long_name="org.struts" id="3" scope="DIR" qualifier="DIR" kee="org.struts:struts-core:src/org/struts" + uuid="CDEF" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path=".ABCD.BCDE." + name="src/org/struts" root_id="2" + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts" + created_at="2008-12-02" authorization_updated_at="[null]"/> + <snapshots id="3" project_id="3" parent_snapshot_id="2" root_project_id="1" root_snapshot_id="1" + status="P" islast="[true]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="DIR" qualifier="PAC" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="1.2."/> + + <!-- file --> + <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="FIL" + kee="org.struts:struts-core:src/org/struts/RequestContext.java" + uuid="DEFG" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path=".ABCD.BCDE." + name="RequestContext.java" root_id="2" + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + path="src/org/struts/RequestContext.java" + created_at="2008-12-02" authorization_updated_at="[null]"/> + + <snapshots id="4" project_id="4" parent_snapshot_id="3" root_project_id="1" root_snapshot_id="1" + status="P" islast="[true]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="FIL" qualifier="CLA" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="1.2.3."/> + + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/getResources_exclude_disabled.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/getResources_exclude_disabled.xml index 8e4196a0306..f1bf15b6b7c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/getResources_exclude_disabled.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/getResources_exclude_disabled.xml @@ -4,11 +4,13 @@ <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" uuid="DISABLED" project_uuid="[null]" module_uuid="[null]" module_uuid_path="." - enabled="[false]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/> + enabled="[false]" language="java" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> <!-- enabled --> <projects id="2" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" uuid="ENABLED" project_uuid="[null]" module_uuid="[null]" module_uuid_path="." - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/get_last_snapshot_by_component_uuid.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/get_last_snapshot_by_component_uuid.xml new file mode 100644 index 00000000000..9304e9363b6 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/get_last_snapshot_by_component_uuid.xml @@ -0,0 +1,85 @@ +<dataset> + + <!-- Struts projects is authorized for all user --> + <group_roles id="1" group_id="[null]" resource_id="1" role="user"/> + + + <!-- root project --> + <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" + uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." + description="the description" long_name="Apache Struts" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="[null]"/> + <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" + status="P" islast="[true]" purge_status="[null]" + period1_mode="previous_analysis" period1_param="[null]" period1_date="[null]" + period2_mode="days" period2_param="30" period2_date="1316815200000" + period3_mode="days" period3_param="90" period3_date="1311631200000" + period4_mode="previous_analysis" period4_param="[null]" period4_date="[null]" + period5_mode="previous_version" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path=""/> + <snapshots id="10" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" + status="P" islast="[false]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228136280000" build_date="1228136280000" + version="[null]" path=""/> + + <!-- module --> + <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" + uuid="EFGH" project_uuid="ABCD" module_uuid="[null]" module_uuid_path=".ABCD." + scope="PRJ" qualifier="BRC" long_name="Struts Core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> + <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" + status="P" islast="[true]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="PRJ" qualifier="BRC" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="1."/> + + <!-- directory --> + <projects long_name="org.struts" id="3" scope="DIR" qualifier="DIR" kee="org.struts:struts-core:src/org/struts" + uuid="GHIJ" project_uuid="ABCD" module_uuid="EFGH" module_uuid_path=".ABCD.EFGH." + name="src/org/struts" root_id="2" + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts" + authorization_updated_at="[null]"/> + <snapshots id="3" project_id="3" parent_snapshot_id="2" root_project_id="1" root_snapshot_id="1" + status="P" islast="[true]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="DIR" qualifier="PAC" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="1.2."/> + + <!-- file --> + <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="FIL" + kee="org.struts:struts-core:src/org/struts/RequestContext.java" + uuid="KLMN" project_uuid="ABCD" module_uuid="EFGH" module_uuid_path=".ABCD.EFGH." + name="RequestContext.java" root_id="2" + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + path="src/org/struts/RequestContext.java" authorization_updated_at="[null]"/> + + <snapshots id="4" project_id="4" parent_snapshot_id="3" root_project_id="1" root_snapshot_id="1" + status="P" islast="[true]" purge_status="[null]" + period1_mode="[null]" period1_param="[null]" period1_date="[null]" + period2_mode="[null]" period2_param="[null]" period2_date="[null]" + period3_mode="[null]" period3_param="[null]" period3_date="[null]" + period4_mode="[null]" period4_param="[null]" period4_date="[null]" + period5_mode="[null]" period5_param="[null]" period5_date="[null]" + depth="[null]" scope="FIL" qualifier="CLA" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="1.2.3."/> + + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/insert-result.xml index 1758aac4fbb..1c3af66e6fd 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/insert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/insert-result.xml @@ -3,13 +3,15 @@ <projects id="1" root_id="[null]" uuid="ABCD" project_uuid="EFGH" module_uuid="EFGH" module_uuid_path=".EFGH." scope="FIL" qualifier="FIL" kee="org.struts:struts:/src/main/java/org/struts/Action.java" name="Action" description="[null]" long_name="org.struts.Action" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[ignore]" path="/foo/bar" deprecated_kee="org.struts:struts:org.struts.Action" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[ignore]" + path="/foo/bar" deprecated_kee="org.struts:struts:org.struts.Action" authorization_updated_at="123456789"/> <projects id="2" root_id="[null]" uuid="BCDE" project_uuid="FGHI" module_uuid="FGHI" module_uuid_path=".FGHI." scope="FIL" qualifier="FIL" kee="org.struts:struts:/src/main/java/org/struts/Filter.java" name="Filter" description="[null]" long_name="org.struts.Filter" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[ignore]" path="[null]" deprecated_kee="org.struts:struts:org.struts.Filter" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[ignore]" + path="[null]" deprecated_kee="org.struts:struts:org.struts.Filter" authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/insert.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/insert.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/insert.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/insert.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update-result.xml index 0953a75660b..34afce983b9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update-result.xml @@ -3,7 +3,8 @@ <projects id="1" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="MVC Framework" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="/foo/bar" deprecated_kee="deprecated key" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="/foo/bar" deprecated_kee="deprecated key" authorization_updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update.xml index 11be22fbe86..69e73cdb6df 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update.xml @@ -3,7 +3,8 @@ <projects id="1" root_id="200" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." scope="PRJ" qualifier="TRK" kee="old key" name="old name" description="old name" long_name="old long name" - enabled="[false]" language="old" copy_resource_id="2" person_id="3" created_at="[null]" path="/old/foo/bar" deprecated_kee="old deprecated key" + enabled="[false]" language="old" copy_resource_id="2" person_id="3" created_at="[null]" path="/old/foo/bar" + deprecated_kee="old deprecated key" authorization_updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update_authorization_date-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml index c838b8b6e65..a6abf2fab1b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update_authorization_date-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml @@ -3,7 +3,8 @@ <projects id="1" root_id="200" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." scope="PRJ" qualifier="TRK" kee="old key" name="old name" description="old name" long_name="old long name" - enabled="[false]" language="old" copy_resource_id="2" person_id="3" created_at="[null]" path="/old/foo/bar" deprecated_kee="old deprecated key" + enabled="[false]" language="old" copy_resource_id="2" person_id="3" created_at="[null]" path="/old/foo/bar" + deprecated_kee="old deprecated key" authorization_updated_at="987654321"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update_authorization_date.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml index 11be22fbe86..69e73cdb6df 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/update_authorization_date.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml @@ -3,7 +3,8 @@ <projects id="1" root_id="200" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." scope="PRJ" qualifier="TRK" kee="old key" name="old name" description="old name" long_name="old long name" - enabled="[false]" language="old" copy_resource_id="2" person_id="3" created_at="[null]" path="/old/foo/bar" deprecated_kee="old deprecated key" + enabled="[false]" language="old" copy_resource_id="2" person_id="3" created_at="[null]" path="/old/foo/bar" + deprecated_kee="old deprecated key" authorization_updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml index 48899d945c3..48899d945c3 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml index a1cd4ef6f5a..a1cd4ef6f5a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexProjects-result.xml index 3732bdb9e3b..ee9ab480a7c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexProjects-result.xml @@ -22,9 +22,12 @@ description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> - <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK"/> - <snapshots purge_status="[null]" id="2" islast="[true]" root_project_id="1" project_id="2" scope="DIR" qualifier="PAC"/> - <snapshots purge_status="[null]" id="3" islast="[true]" root_project_id="1" project_id="3" scope="CLA" qualifier="CLA"/> + <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" + qualifier="TRK"/> + <snapshots purge_status="[null]" id="2" islast="[true]" root_project_id="1" project_id="2" scope="DIR" + qualifier="PAC"/> + <snapshots purge_status="[null]" id="3" islast="[true]" root_project_id="1" project_id="3" scope="CLA" + qualifier="CLA"/> <!-- RequestContext --> <resource_index kee="requestcontext" position="0" name_size="14" resource_id="3" root_project_id="1" qualifier="CLA"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexProjects.xml index b06cba12a73..0043b4ced0b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexProjects.xml @@ -15,13 +15,17 @@ enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="3" scope="FIL" qualifier="CLA" kee="org.struts:struts:org.struts.RequestContext" + <projects long_name="org.struts.RequestContext" id="3" scope="FIL" qualifier="CLA" + kee="org.struts:struts:org.struts.RequestContext" uuid="CDEF" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path=".ABCD." name="RequestContext" root_id="1" description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> - <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK" /> - <snapshots purge_status="[null]" id="2" islast="[true]" root_project_id="1" project_id="2" scope="DIR" qualifier="PAC"/> - <snapshots purge_status="[null]" id="3" islast="[true]" root_project_id="1" project_id="3" scope="FIL" qualifier="CLA"/> + <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" + qualifier="TRK"/> + <snapshots purge_status="[null]" id="2" islast="[true]" root_project_id="1" project_id="2" scope="DIR" + qualifier="PAC"/> + <snapshots purge_status="[null]" id="3" islast="[true]" root_project_id="1" project_id="3" scope="FIL" + qualifier="CLA"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexResource-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexResource-result.xml index f4cf0805ede..f4cf0805ede 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexResource-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexResource-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexResource.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexResource.xml index 5a4a28b7df3..5a4a28b7df3 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexResource.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexResource.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexTwoLettersLongResource-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexTwoLettersLongResource-result.xml index c9941e492bd..c9941e492bd 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexTwoLettersLongResource-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexTwoLettersLongResource-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexTwoLettersLongResource.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexTwoLettersLongResource.xml index 5a4a28b7df3..5a4a28b7df3 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexTwoLettersLongResource.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldIndexTwoLettersLongResource.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotIndexPackages.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldNotIndexPackages.xml index a85b7da7afc..0043b4ced0b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotIndexPackages.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldNotIndexPackages.xml @@ -15,13 +15,17 @@ enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="3" scope="FIL" qualifier="CLA" kee="org.struts:struts:org.struts.RequestContext" + <projects long_name="org.struts.RequestContext" id="3" scope="FIL" qualifier="CLA" + kee="org.struts:struts:org.struts.RequestContext" uuid="CDEF" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path=".ABCD." name="RequestContext" root_id="1" description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> - <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK"/> - <snapshots purge_status="[null]" id="2" islast="[true]" root_project_id="1" project_id="2" scope="DIR" qualifier="PAC"/> - <snapshots purge_status="[null]" id="3" islast="[true]" root_project_id="1" project_id="3" scope="FIL" qualifier="CLA"/> + <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" + qualifier="TRK"/> + <snapshots purge_status="[null]" id="2" islast="[true]" root_project_id="1" project_id="2" scope="DIR" + qualifier="PAC"/> + <snapshots purge_status="[null]" id="3" islast="[true]" root_project_id="1" project_id="3" scope="FIL" + qualifier="CLA"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource-result.xml index 4292af5708d..4292af5708d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource.xml index 89a3a8c465d..89a3a8c465d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource-result.xml index 52db35f3ad4..52db35f3ad4 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource.xml index e68eb44f359..af5863edbda 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource.xml @@ -6,7 +6,8 @@ description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> - <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK"/> + <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" + qualifier="TRK"/> <!-- the index is on the old name "ST" but not on "AS" --> <resource_index id="1" kee="struts" position="0" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource-result.xml index 52db35f3ad4..52db35f3ad4 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource.xml index 101f1e2f8af..529e83c1a44 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource.xml @@ -6,7 +6,8 @@ description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> - <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK"/> + <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" + qualifier="TRK"/> <!-- the index is on the old name "ST" but not on "AS" --> <resource_index id="1" kee="st" position="0" name_size="2" resource_id="1" root_project_id="1" qualifier="TRK"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml index 6103a4be809..e28b5945816 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml @@ -6,7 +6,8 @@ description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> - <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK"/> + <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" + qualifier="TRK"/> <resource_index kee="apache struts" position="0" name_size="13" resource_id="1" root_project_id="1" qualifier="TRK"/> <resource_index kee="pache struts" position="1" name_size="13" resource_id="1" root_project_id="1" qualifier="TRK"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml index 32940882fa3..84815e52e64 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml @@ -6,7 +6,8 @@ description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> - <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK"/> + <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" + qualifier="TRK"/> <!-- the index is on the old name "Struts" but not on "Apache Struts --> <resource_index id="1" kee="struts" position="0" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexResource-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReindexResource-result.xml index b9f39157aea..b9f39157aea 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexResource-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReindexResource-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexResource.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReindexResource.xml index 89a3a8c465d..89a3a8c465d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexResource.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceIndexerDaoTest/shouldReindexResource.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shared.xml index daf6852cd6f..400243b4d19 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shared.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shared.xml @@ -1,58 +1,72 @@ <dataset> <!-- root project --> - <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" uuid="A" project_uuid="A" module_uuid="[null]" module_uuid_path="." + <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" uuid="A" + project_uuid="A" module_uuid="[null]" module_uuid_path="." description="[null]" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts" authorization_updated_at="[null]"/> <!-- **************** First sub project **************** --> - <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" uuid="B" project_uuid="A" module_uuid="[null]" module_uuid_path=".A." + <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" uuid="B" project_uuid="A" + module_uuid="[null]" module_uuid_path=".A." scope="PRJ" qualifier="BRC" long_name="Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core" authorization_updated_at="[null]"/> <!-- directory --> <projects long_name="org.struts" id="3" scope="DIR" qualifier="DIR" kee="org.struts:struts-core:/src/org/struts" name="org.struts" root_id="2" uuid="C" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-core:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.struts:struts-core:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" + kee="org.struts:struts-core:/src/org/struts/RequestContext.java" name="RequestContext" root_id="2" uuid="D" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-core:org.struts.RequestContext" authorization_updated_at="[null]"/> <!-- **************** Second sub project **************** --> - <projects id="5" root_id="1" kee="org.struts:struts-ui" name="Struts UI" uuid="E" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." + <projects id="5" root_id="1" kee="org.struts:struts-ui" name="Struts UI" uuid="E" project_uuid="[null]" + module_uuid="[null]" module_uuid_path=".E." scope="PRJ" qualifier="BRC" long_name="Struts UI" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-ui" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-ui" authorization_updated_at="[null]"/> <!-- directory --> <projects long_name="org.struts" id="6" scope="DIR" qualifier="DIR" kee="org.struts:struts-ui:/src/org/struts" name="org.struts" root_id="5" uuid="F" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-ui:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-ui:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="org.struts:struts-ui:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" + kee="org.struts:struts-ui:/src/org/struts/RequestContext.java" name="RequestContext" root_id="5" uuid="G" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-ui:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-ui:org.struts.RequestContext" authorization_updated_at="[null]"/> <!-- **************** Another independent project **************** --> - <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core" uuid="H" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".H." + <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core" uuid="H" project_uuid="[null]" + module_uuid="[null]" module_uuid_path=".H." scope="PRJ" qualifier="BRC" long_name="Foo Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo:struts-core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="foo:struts-core" authorization_updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml index 3c4acff9c8e..962995f42b6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml @@ -1,58 +1,73 @@ <dataset> <!-- root project --> - <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.apache.struts:struts" name="Struts" uuid="A" project_uuid="A" module_uuid="[null]" module_uuid_path="." + <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.apache.struts:struts" name="Struts" uuid="A" + project_uuid="A" module_uuid="[null]" module_uuid_path="." description="[null]" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.apache.struts:struts" authorization_updated_at="[null]"/> <!-- **************** First sub project **************** --> - <projects id="2" root_id="1" kee="org.apache.struts:struts-core" name="Struts Core" uuid="B" project_uuid="A" module_uuid="[null]" module_uuid_path=".A." + <projects id="2" root_id="1" kee="org.apache.struts:struts-core" name="Struts Core" uuid="B" project_uuid="A" + module_uuid="[null]" module_uuid_path=".A." scope="PRJ" qualifier="BRC" long_name="Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-core" authorization_updated_at="[null]"/> <!-- directory --> - <projects long_name="org.struts" id="3" scope="DIR" qualifier="DIR" kee="org.apache.struts:struts-core:/src/org/struts" + <projects long_name="org.struts" id="3" scope="DIR" qualifier="DIR" + kee="org.apache.struts:struts-core:/src/org/struts" name="org.struts" root_id="2" uuid="C" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-core:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.apache.struts:struts-core:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.apache.struts:struts-core:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" + kee="org.apache.struts:struts-core:/src/org/struts/RequestContext.java" name="RequestContext" root_id="2" uuid="D" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-core:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.apache.struts:struts-core:org.struts.RequestContext" authorization_updated_at="[null]"/> <!-- **************** Second sub project **************** --> - <projects id="5" root_id="1" kee="org.apache.struts:struts-ui" name="Struts UI" uuid="E" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." + <projects id="5" root_id="1" kee="org.apache.struts:struts-ui" name="Struts UI" uuid="E" project_uuid="[null]" + module_uuid="[null]" module_uuid_path=".E." scope="PRJ" qualifier="BRC" long_name="Struts UI" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-ui" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-ui" authorization_updated_at="[null]"/> <!-- directory --> <projects long_name="org.struts" id="6" scope="DIR" qualifier="DIR" kee="org.apache.struts:struts-ui:/src/org/struts" name="org.struts" root_id="5" uuid="F" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-ui:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.apache.struts:struts-ui:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="org.apache.struts:struts-ui:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" + kee="org.apache.struts:struts-ui:/src/org/struts/RequestContext.java" name="RequestContext" root_id="5" uuid="G" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-ui:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.apache.struts:struts-ui:org.struts.RequestContext" authorization_updated_at="[null]"/> <!-- **************** Another independent project **************** --> - <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core" uuid="H" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".H." + <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core" uuid="H" project_uuid="[null]" + module_uuid="[null]" module_uuid_path=".H." scope="PRJ" qualifier="BRC" long_name="Foo Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo:struts-core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="foo:struts-core" authorization_updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml index e1d46078158..81e4290832e 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml @@ -1,58 +1,72 @@ <dataset> <!-- root project --> - <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" uuid="A" project_uuid="A" module_uuid="[null]" module_uuid_path="." + <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" uuid="A" + project_uuid="A" module_uuid="[null]" module_uuid_path="." description="[null]" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts" authorization_updated_at="[null]"/> <!-- **************** First sub project **************** --> - <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" uuid="B" project_uuid="A" module_uuid="[null]" module_uuid_path=".A." + <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" uuid="B" project_uuid="A" + module_uuid="[null]" module_uuid_path=".A." scope="PRJ" qualifier="BRC" long_name="Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core" authorization_updated_at="[null]"/> <!-- directory --> <projects long_name="org.struts" id="3" scope="DIR" qualifier="DIR" kee="org.struts:struts-core:/src/org/struts" name="org.struts" root_id="2" uuid="C" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-core:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.struts:struts-core:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" + kee="org.struts:struts-core:/src/org/struts/RequestContext.java" name="RequestContext" root_id="2" uuid="D" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-core:org.struts.RequestContext" authorization_updated_at="[null]"/> <!-- **************** Second sub project **************** --> - <projects id="5" root_id="1" kee="org.struts:struts-web" name="Struts UI" uuid="E" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." + <projects id="5" root_id="1" kee="org.struts:struts-web" name="Struts UI" uuid="E" project_uuid="[null]" + module_uuid="[null]" module_uuid_path=".E." scope="PRJ" qualifier="BRC" long_name="Struts UI" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-web" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-web" authorization_updated_at="[null]"/> <!-- directory --> <projects long_name="org.struts" id="6" scope="DIR" qualifier="DIR" kee="org.struts:struts-web:/src/org/struts" name="org.struts" root_id="5" uuid="F" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-web:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-web:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="org.struts:struts-web:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" + kee="org.struts:struts-web:/src/org/struts/RequestContext.java" name="RequestContext" root_id="5" uuid="G" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-web:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-web:org.struts.RequestContext" authorization_updated_at="[null]"/> <!-- **************** Another independent project **************** --> - <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core" uuid="H" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".H." + <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core" uuid="H" project_uuid="[null]" + module_uuid="[null]" module_uuid_path=".H." scope="PRJ" qualifier="BRC" long_name="Foo Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo:struts-core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="foo:struts-core" authorization_updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml index d0914f931c3..83686f2ba90 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml @@ -1,51 +1,64 @@ <dataset> <!-- root project --> - <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.apache.struts:struts" name="Struts" uuid="A" project_uuid="A" module_uuid="[null]" module_uuid_path="." + <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.apache.struts:struts" name="Struts" uuid="A" + project_uuid="A" module_uuid="[null]" module_uuid_path="." description="[null]" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.apache.struts:struts" authorization_updated_at="[null]"/> <!-- **************** First sub project **************** --> - <projects id="2" root_id="1" kee="org.apache.struts:struts-core" name="Struts Core" uuid="B" project_uuid="A" module_uuid="[null]" module_uuid_path=".A." + <projects id="2" root_id="1" kee="org.apache.struts:struts-core" name="Struts Core" uuid="B" project_uuid="A" + module_uuid="[null]" module_uuid_path=".A." scope="PRJ" qualifier="BRC" long_name="Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-core" authorization_updated_at="[null]"/> <!-- directory --> - <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.apache.struts:struts-core:/src/org/struts" + <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" + kee="org.apache.struts:struts-core:/src/org/struts" name="org.struts" root_id="2" uuid="C" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-core:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.apache.struts:struts-core:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.apache.struts:struts-core:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" + kee="org.apache.struts:struts-core:/src/org/struts/RequestContext.java" name="RequestContext" root_id="2" uuid="D" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.apache.struts:struts-core:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.apache.struts:struts-core:org.struts.RequestContext" authorization_updated_at="[null]"/> <!-- **************** Second sub project THAT HAS A DIFFERENT GROUP ID => MUST NOT BE UPDATED **************** --> - <projects id="5" root_id="1" kee="foo:struts-ui" name="Struts UI" uuid="E" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." + <projects id="5" root_id="1" kee="foo:struts-ui" name="Struts UI" uuid="E" project_uuid="[null]" module_uuid="[null]" + module_uuid_path=".E." scope="PRJ" qualifier="BRC" long_name="Struts UI" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo:struts-ui" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="foo:struts-ui" authorization_updated_at="[null]"/> <!-- directory --> <projects long_name="org.struts" id="6" scope="DIR" qualifier="PAC" kee="foo:struts-ui:/src/org/struts" name="org.struts" root_id="5" uuid="F" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo:struts-ui:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="foo:struts-ui:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="foo:struts-ui:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" + kee="foo:struts-ui:/src/org/struts/RequestContext.java" name="RequestContext" root_id="5" uuid="G" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo:struts-ui:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="foo:struts-ui:org.struts.RequestContext" authorization_updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml index 6e91a2a7b2f..5021b0c56bc 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml @@ -1,51 +1,63 @@ <dataset> <!-- root project --> - <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" uuid="A" project_uuid="A" module_uuid="[null]" module_uuid_path="." + <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" uuid="A" + project_uuid="A" module_uuid="[null]" module_uuid_path="." description="[null]" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts" authorization_updated_at="[null]"/> <!-- **************** First sub project **************** --> - <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" uuid="B" project_uuid="A" module_uuid="[null]" module_uuid_path=".A." + <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" uuid="B" project_uuid="A" + module_uuid="[null]" module_uuid_path=".A." scope="PRJ" qualifier="BRC" long_name="Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core" authorization_updated_at="[null]"/> <!-- directory --> <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.struts:struts-core:/src/org/struts" name="org.struts" root_id="2" uuid="C" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-core:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.struts:struts-core:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" + kee="org.struts:struts-core:/src/org/struts/RequestContext.java" name="RequestContext" root_id="2" uuid="D" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-core:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-core:org.struts.RequestContext" authorization_updated_at="[null]"/> <!-- **************** Second sub project THAT HAS A DIFFERENT GROUP ID => MUST NOT BE UPDATED **************** --> - <projects id="5" root_id="1" kee="foo:struts-ui" name="Struts UI" uuid="E" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." + <projects id="5" root_id="1" kee="foo:struts-ui" name="Struts UI" uuid="E" project_uuid="[null]" module_uuid="[null]" + module_uuid_path=".E." scope="PRJ" qualifier="BRC" long_name="Struts UI" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo:struts-ui" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="foo:struts-ui" authorization_updated_at="[null]"/> <!-- directory --> <projects long_name="org.struts" id="6" scope="DIR" qualifier="PAC" kee="foo:struts-ui:/src/org/struts" name="org.struts" root_id="5" uuid="F" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo:struts-ui:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="foo:struts-ui:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="foo:struts-ui:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" + kee="foo:struts-ui:/src/org/struts/RequestContext.java" name="RequestContext" root_id="5" uuid="G" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo:struts-ui:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="foo:struts-ui:org.struts.RequestContext" authorization_updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldUpdateKey-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shouldUpdateKey-result.xml index 73e4814cfcd..a7a9d68d42a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceKeyUpdaterDaoTest/shouldUpdateKey-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceKeyUpdaterDaoTest/shouldUpdateKey-result.xml @@ -1,60 +1,74 @@ <dataset> <!-- root project --> - <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" uuid="A" project_uuid="A" module_uuid="[null]" module_uuid_path="." + <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" uuid="A" + project_uuid="A" module_uuid="[null]" module_uuid_path="." description="[null]" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts" authorization_updated_at="[null]"/> <!-- **************** First sub project **************** --> <!-- ONLY THIS PROJECT MUST HAVE BEEN UPDATED --> <!-- --> - <projects id="2" root_id="1" kee="struts:core" name="Struts Core" uuid="B" project_uuid="A" module_uuid="[null]" module_uuid_path=".A." + <projects id="2" root_id="1" kee="struts:core" name="Struts Core" uuid="B" project_uuid="A" module_uuid="[null]" + module_uuid_path=".A." scope="PRJ" qualifier="BRC" long_name="Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="struts:core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="struts:core" authorization_updated_at="[null]"/> <!-- directory --> <projects long_name="org.struts" id="3" scope="DIR" qualifier="DIR" kee="struts:core:/src/org/struts" name="org.struts" root_id="2" uuid="C" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="struts:core:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="struts:core:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="struts:core:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" + kee="struts:core:/src/org/struts/RequestContext.java" name="RequestContext" root_id="2" uuid="D" project_uuid="A" module_uuid="B" module_uuid_path=".A.B." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="struts:core:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="struts:core:org.struts.RequestContext" authorization_updated_at="[null]"/> <!-- **************** Second sub project **************** --> - <projects id="5" root_id="1" kee="org.struts:struts-ui" name="Struts UI" uuid="E" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." + <projects id="5" root_id="1" kee="org.struts:struts-ui" name="Struts UI" uuid="E" project_uuid="[null]" + module_uuid="[null]" module_uuid_path=".E." scope="PRJ" qualifier="BRC" long_name="Struts UI" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-ui" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-ui" authorization_updated_at="[null]"/> <!-- directory --> <projects long_name="org.struts" id="6" scope="DIR" qualifier="DIR" kee="org.struts:struts-ui:/src/org/struts" name="org.struts" root_id="5" uuid="F" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." - description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-ui:org.struts" - authorization_updated_at="[null]"/> + description="[null]" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-ui:org.struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" kee="org.struts:struts-ui:/src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="7" scope="FIL" qualifier="CLA" + kee="org.struts:struts-ui:/src/org/struts/RequestContext.java" name="RequestContext" root_id="5" uuid="G" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".E." description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="org.struts:struts-ui:org.struts.RequestContext" + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" + path="[null]" deprecated_kee="org.struts:struts-ui:org.struts.RequestContext" authorization_updated_at="[null]"/> <!-- **************** Another independent project **************** --> - <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core" uuid="H" project_uuid="[null]" module_uuid="[null]" module_uuid_path=".H." + <projects id="8" root_id="[null]" kee="foo:struts-core" name="Foo Struts Core" uuid="H" project_uuid="[null]" + module_uuid="[null]" module_uuid_path=".H." scope="PRJ" qualifier="BRC" long_name="Foo Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="[null]" path="[null]" deprecated_kee="foo:struts-core" + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + created_at="[null]" path="[null]" deprecated_kee="foo:struts-core" authorization_updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/empty.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/empty.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/empty.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/empty.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldGetMaxOrderIndexForNullUser.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldGetMaxOrderIndexForNullUser.xml new file mode 100644 index 00000000000..1a3d92374b6 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldGetMaxOrderIndexForNullUser.xml @@ -0,0 +1,21 @@ +<dataset> + + <active_dashboards + id="1" + dashboard_id="1" + user_id="[null]" + order_index="1"/> + + <active_dashboards + id="2" + dashboard_id="2" + user_id="[null]" + order_index="15"/> + + <active_dashboards + id="3" + dashboard_id="3" + user_id="3" + order_index="25"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldInsert-result.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldInsert-result.xml new file mode 100644 index 00000000000..75fb1670ce7 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldInsert-result.xml @@ -0,0 +1,9 @@ +<dataset> + + <active_dashboards + id="1" + dashboard_id="2" + user_id="3" + order_index="4"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldInsert.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldInsert.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldInsert.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldInsert.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldInsertWithNoUser-result.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldInsertWithNoUser-result.xml new file mode 100644 index 00000000000..a247a4f7c4d --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldInsertWithNoUser-result.xml @@ -0,0 +1,9 @@ +<dataset> + + <active_dashboards + id="1" + dashboard_id="2" + user_id="[null]" + order_index="4"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForAnonymous.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForAnonymous.xml index f817e375abb..0fbe3bcf9ec 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForAnonymous.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForAnonymous.xml @@ -1,7 +1,7 @@ <dataset> <users id="42" login="obiwan" name="Obiwan" email="obiwan@keno.bi" - created_at="1418215735482" updated_at="1418215735482" active="[true]"/> + created_at="1418215735482" updated_at="1418215735482" active="[true]"/> <dashboards id="1" @@ -11,7 +11,7 @@ column_layout="100%" shared="[true]" is_global="[true]" - /> + /> <dashboards id="2" user_id="[null]" @@ -20,7 +20,7 @@ column_layout="100%" shared="[true]" is_global="[true]" - /> + /> <dashboards id="3" user_id="[null]" @@ -29,7 +29,7 @@ column_layout="100%" shared="[true]" is_global="[false]" - /> + /> <dashboards id="4" user_id="[null]" @@ -38,7 +38,7 @@ column_layout="100%" shared="[true]" is_global="[true]" - /> + /> <!-- Dashboard with ID 1 appears after ID 2 --> <active_dashboards diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForUser.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForUser.xml index b3dc72ffb30..fd674277db0 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForUser.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForUser.xml @@ -1,9 +1,9 @@ <dataset> <users id="24" login="anakin" name="Anakin" email="anakin@skywalk.er" - created_at="1418215735482" updated_at="1418215735482" active="[true]"/> + created_at="1418215735482" updated_at="1418215735482" active="[true]"/> <users id="42" login="obiwan" name="Obiwan" email="obiwan@keno.bi" - created_at="1418215735482" updated_at="1418215735482" active="[true]"/> + created_at="1418215735482" updated_at="1418215735482" active="[true]"/> <dashboards id="1" @@ -13,7 +13,7 @@ column_layout="100%" shared="[true]" is_global="[true]" - /> + /> <dashboards id="2" user_id="[null]" @@ -22,7 +22,7 @@ column_layout="100%" shared="[true]" is_global="[true]" - /> + /> <dashboards id="3" user_id="[null]" @@ -31,7 +31,7 @@ column_layout="100%" shared="[true]" is_global="[false]" - /> + /> <dashboards id="4" user_id="[null]" @@ -40,7 +40,7 @@ column_layout="100%" shared="[true]" is_global="[true]" - /> + /> <dashboards id="5" user_id="[null]" @@ -49,7 +49,7 @@ column_layout="100%" shared="[true]" is_global="[true]" - /> + /> <!-- Dashboard with ID 1 appears after ID 2 --> <active_dashboards diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldSelectProjectDashboardsForAnonymous.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectProjectDashboardsForAnonymous.xml index 850d6a51ace..0160b3a25d4 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldSelectProjectDashboardsForAnonymous.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectProjectDashboardsForAnonymous.xml @@ -1,7 +1,7 @@ <dataset> <users id="42" login="obiwan" name="Obiwan" email="obiwan@keno.bi" - created_at="1418215735482" updated_at="1418215735482" active="[true]"/> + created_at="1418215735482" updated_at="1418215735482" active="[true]"/> <dashboards id="1" @@ -11,7 +11,7 @@ column_layout="100%" shared="[true]" is_global="[false]" - /> + /> <dashboards id="2" user_id="[null]" @@ -20,7 +20,7 @@ column_layout="100%" shared="[true]" is_global="[false]" - /> + /> <dashboards id="3" user_id="[null]" @@ -29,7 +29,7 @@ column_layout="100%" shared="[true]" is_global="[true]" - /> + /> <dashboards id="4" user_id="[null]" @@ -38,7 +38,7 @@ column_layout="100%" shared="[true]" is_global="[false]" - /> + /> <!-- Dashboard with ID 1 appears after ID 2 --> <active_dashboards diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldSelectProjectDashboardsForUser.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectProjectDashboardsForUser.xml index 88de79b9ffc..3f70d81896f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/ActiveDashboardDaoTest/shouldSelectProjectDashboardsForUser.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectProjectDashboardsForUser.xml @@ -1,9 +1,9 @@ <dataset> <users id="24" login="anakin" name="Anakin" email="anakin@skywalk.er" - created_at="1418215735482" updated_at="1418215735482" active="[true]"/> + created_at="1418215735482" updated_at="1418215735482" active="[true]"/> <users id="42" login="obiwan" name="Obiwan" email="obiwan@keno.bi" - created_at="1418215735482" updated_at="1418215735482" active="[true]"/> + created_at="1418215735482" updated_at="1418215735482" active="[true]"/> <dashboards id="1" @@ -13,7 +13,7 @@ column_layout="100%" shared="[true]" is_global="[false]" - /> + /> <dashboards id="2" user_id="[null]" @@ -22,7 +22,7 @@ column_layout="100%" shared="[true]" is_global="[false]" - /> + /> <dashboards id="3" user_id="[null]" @@ -31,7 +31,7 @@ column_layout="100%" shared="[true]" is_global="[true]" - /> + /> <dashboards id="4" user_id="[null]" @@ -40,7 +40,7 @@ column_layout="100%" shared="[true]" is_global="[false]" - /> + /> <dashboards id="5" user_id="[null]" @@ -49,7 +49,7 @@ column_layout="100%" shared="[true]" is_global="[false]" - /> + /> <!-- Dashboard with ID 1 appears after ID 2 --> <active_dashboards diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldInsert-result.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/DashboardDaoTest/shouldInsert-result.xml index 88d85435cdd..86d9180988f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldInsert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/DashboardDaoTest/shouldInsert-result.xml @@ -8,7 +8,7 @@ column_layout="100%" shared="[true]" is_global="[true]" - /> + /> <widgets id="1" @@ -20,13 +20,13 @@ row_index="14" configured="[true]" resource_id="[null]" - /> + /> <widget_properties id="1" widget_id="1" kee="displayITs" text_value="true" - /> + /> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldInsert.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/DashboardDaoTest/shouldInsert.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldInsert.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/DashboardDaoTest/shouldInsert.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldInsertWithNullableColumns-result.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/DashboardDaoTest/shouldInsertWithNullableColumns-result.xml index 35104f07356..00257e4b937 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldInsertWithNullableColumns-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/DashboardDaoTest/shouldInsertWithNullableColumns-result.xml @@ -10,7 +10,7 @@ is_global="[false]" created_at="[null]" updated_at="[null]" - /> + /> <widgets id="1" @@ -24,13 +24,13 @@ created_at="[null]" updated_at="[null]" resource_id="[null]" - /> + /> <widget_properties id="1" widget_id="1" kee="[null]" text_value="[null]" - /> + /> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldSelectGlobalDashboard.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/DashboardDaoTest/shouldSelectGlobalDashboard.xml index 110e760f9ad..110e760f9ad 100644 --- a/sonar-core/src/test/resources/org/sonar/core/dashboard/DashboardDaoTest/shouldSelectGlobalDashboard.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/DashboardDaoTest/shouldSelectGlobalDashboard.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/insert_characteristic-result.xml b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/insert_characteristic-result.xml index 51d29ef914a..f0ac4524f65 100644 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/insert_characteristic-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/insert_characteristic-result.xml @@ -1,6 +1,7 @@ <dataset> - <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="[null]" characteristic_order="1" enabled="[true]" + <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="[null]" + characteristic_order="1" enabled="[true]" created_at="2013-11-20" updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics.xml b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/select_enabled_root_characteristics.xml index ed75d063f9f..8a6e7472bc4 100644 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics.xml +++ b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/select_enabled_root_characteristics.xml @@ -4,17 +4,20 @@ enabled="[true]" created_at="2013-11-20" updated_at="2013-11-22"/> - <characteristics id="2" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="1" characteristic_order="[null]" + <characteristics id="2" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="1" + characteristic_order="[null]" enabled="[true]" created_at="2013-11-20" updated_at="2013-11-22"/> <!-- requirement --> <characteristics id="3" kee="[null]" name="[null]" parent_id="2" rule_id="1" - function_key="linear_offset" factor_value="20.0" factor_unit="mn" offset_value="30.0" offset_unit="h" enabled="[true]" + function_key="linear_offset" factor_value="20.0" factor_unit="mn" offset_value="30.0" offset_unit="h" + enabled="[true]" created_at="2013-11-20" updated_at="[null]"/> <!-- disabled characteristics --> - <characteristics id="4" kee="DISABLED_CHARACTERISTIC" name="Disabled characteristic" parent_id="1" characteristic_order="2" + <characteristics id="4" kee="DISABLED_CHARACTERISTIC" name="Disabled characteristic" parent_id="1" + characteristic_order="2" enabled="[false]" created_at="2013-11-20" updated_at="2013-11-22"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml index 59f106fe411..59f106fe411 100644 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml +++ b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/select_enabled_root_characteristics_order_by_characteristic_order.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_max_characteristic_order_when_characteristics_are_all_disabled.xml b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/select_max_characteristic_order_when_characteristics_are_all_disabled.xml index 78e951519bd..d703591428a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_max_characteristic_order_when_characteristics_are_all_disabled.xml +++ b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/select_max_characteristic_order_when_characteristics_are_all_disabled.xml @@ -6,7 +6,8 @@ created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Disabled root characteristic --> - <characteristics id="2" kee="DISABLED_ROOT_CHARACTERISTIC" name="Disabled root characteristic" parent_id="[null]" characteristic_order="2" + <characteristics id="2" kee="DISABLED_ROOT_CHARACTERISTIC" name="Disabled root characteristic" parent_id="[null]" + characteristic_order="2" enabled="[false]" created_at="2013-11-20" updated_at="2013-11-22"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_sub_characteristics_by_parent_id.xml b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/select_sub_characteristics_by_parent_id.xml index bdbec49faf3..60aa6d6fdfb 100644 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/select_sub_characteristics_by_parent_id.xml +++ b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/select_sub_characteristics_by_parent_id.xml @@ -6,10 +6,12 @@ created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Sub characteristics of root characteristic --> - <characteristics id="2" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="1" characteristic_order="[null]" + <characteristics id="2" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="1" + characteristic_order="[null]" enabled="[true]" created_at="2013-11-20" updated_at="2013-11-22"/> - <characteristics id="3" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability " parent_id="1" characteristic_order="[null]" + <characteristics id="3" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability " parent_id="1" + characteristic_order="[null]" enabled="[true]" created_at="2013-11-20" updated_at="2013-11-22"/> @@ -19,12 +21,14 @@ created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Disabled root characteristic --> - <characteristics id="10" kee="DISABLED_ROOT_CHARACTERISTIC" name="Disabled root characteristic" parent_id="[null]" characteristic_order="2" + <characteristics id="10" kee="DISABLED_ROOT_CHARACTERISTIC" name="Disabled root characteristic" parent_id="[null]" + characteristic_order="2" enabled="[false]" created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Disabled characteristic --> - <characteristics id="11" kee="DISABLED_CHARACTERISTIC" name="Disabled characteristic" parent_id="10" characteristic_order="[null]" + <characteristics id="11" kee="DISABLED_CHARACTERISTIC" name="Disabled characteristic" parent_id="10" + characteristic_order="[null]" enabled="[false]" created_at="2013-11-20" updated_at="2013-11-22"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/shared.xml index c781001c159..284d01bed45 100644 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/shared.xml +++ b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/shared.xml @@ -6,17 +6,20 @@ created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Characteristic --> - <characteristics id="2" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="1" characteristic_order="[null]" + <characteristics id="2" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="1" + characteristic_order="[null]" enabled="[true]" created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Disabled root characteristic --> - <characteristics id="4" kee="DISABLED_ROOT_CHARACTERISTIC" name="Disabled root characteristic" parent_id="[null]" characteristic_order="2" + <characteristics id="4" kee="DISABLED_ROOT_CHARACTERISTIC" name="Disabled root characteristic" parent_id="[null]" + characteristic_order="2" enabled="[false]" created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Disabled characteristic --> - <characteristics id="5" kee="DISABLED_CHARACTERISTIC" name="Disabled characteristic" parent_id="4" characteristic_order="[null]" + <characteristics id="5" kee="DISABLED_CHARACTERISTIC" name="Disabled characteristic" parent_id="4" + characteristic_order="[null]" enabled="[false]" created_at="2013-11-20" updated_at="2013-11-22"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic-result.xml b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/update_characteristic-result.xml index 0a409171a52..ff12f94cee6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/update_characteristic-result.xml @@ -1,6 +1,7 @@ <dataset> - <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="New name" parent_id="[null]" characteristic_order="2" enabled="[false]" + <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="New name" parent_id="[null]" characteristic_order="2" + enabled="[false]" created_at="2013-11-20" updated_at="2014-03-19"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic.xml b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/update_characteristic.xml index b7d53e45565..afa53fb186d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/CharacteristicDaoTest/update_characteristic.xml +++ b/sonar-db/src/test/resources/org/sonar/db/debt/CharacteristicDaoTest/update_characteristic.xml @@ -1,6 +1,7 @@ <dataset> - <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="[null]" characteristic_order="1" enabled="[true]" + <characteristics id="1" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="[null]" + characteristic_order="1" enabled="[true]" created_at="2013-11-20" updated_at="2013-11-20"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/select_requirement.xml b/sonar-db/src/test/resources/org/sonar/db/debt/RequirementDaoTest/select_requirement.xml index 844c9010c50..1a71559a016 100644 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/select_requirement.xml +++ b/sonar-db/src/test/resources/org/sonar/db/debt/RequirementDaoTest/select_requirement.xml @@ -1,8 +1,10 @@ <dataset> <!-- Requirement --> - <characteristics id="3" kee="[null]" name="[null]" parent_id="2" root_id="1" rule_id="10" characteristic_order="[null]" - function_key="linear_offset" factor_value="20.0" factor_unit="mn" offset_value="30.0" offset_unit="h" enabled="[true]" + <characteristics id="3" kee="[null]" name="[null]" parent_id="2" root_id="1" rule_id="10" + characteristic_order="[null]" + function_key="linear_offset" factor_value="20.0" factor_unit="mn" offset_value="30.0" offset_unit="h" + enabled="[true]" created_at="2013-11-20" updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/debt/RequirementDaoTest/shared.xml index 8e097ce5ad1..0ee097f0869 100644 --- a/sonar-core/src/test/resources/org/sonar/core/technicaldebt/db/RequirementDaoTest/shared.xml +++ b/sonar-db/src/test/resources/org/sonar/db/debt/RequirementDaoTest/shared.xml @@ -1,13 +1,17 @@ <dataset> <!-- Requirement --> - <characteristics id="3" kee="[null]" name="[null]" parent_id="2" root_id="1" rule_id="10" characteristic_order="[null]" - function_key="linear_offset" factor_value="20.0" factor_unit="mn" offset_value="30.0" offset_unit="h" enabled="[true]" + <characteristics id="3" kee="[null]" name="[null]" parent_id="2" root_id="1" rule_id="10" + characteristic_order="[null]" + function_key="linear_offset" factor_value="20.0" factor_unit="mn" offset_value="30.0" offset_unit="h" + enabled="[true]" created_at="2013-11-20" updated_at="[null]"/> <!-- Disabled requirement --> - <characteristics id="6" kee="[null]" name="[null]" parent_id="5" root_id="4" rule_id="10" characteristic_order="[null]" - function_key="linear_offset" factor_value="30.0" factor_unit="mn" offset_value="20.0" offset_unit="h" enabled="[false]" + <characteristics id="6" kee="[null]" name="[null]" parent_id="5" root_id="4" rule_id="10" + characteristic_order="[null]" + function_key="linear_offset" factor_value="30.0" factor_unit="mn" offset_value="20.0" offset_unit="h" + enabled="[false]" created_at="2013-11-20" updated_at="2013-11-22"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldGetByHash.xml b/sonar-db/src/test/resources/org/sonar/db/duplication/DuplicationDaoTest/shouldGetByHash.xml index 703fde5aa35..37efb6149f0 100644 --- a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldGetByHash.xml +++ b/sonar-db/src/test/resources/org/sonar/db/duplication/DuplicationDaoTest/shouldGetByHash.xml @@ -1,54 +1,61 @@ <dataset> - <snapshots id="1" project_id="1" status="P" islast="0" purge_status="[null]" /> - <snapshots id="2" project_id="1" status="P" islast="0" purge_status="[null]" /> - <projects id="1" uuid="1" kee="bar-old" enabled="1" scope="FIL" qualifier="CLA" language="java" /> + <snapshots id="1" project_id="1" status="P" islast="0" purge_status="[null]"/> + <snapshots id="2" project_id="1" status="P" islast="0" purge_status="[null]"/> + <projects id="1" uuid="1" kee="bar-old" enabled="1" scope="FIL" qualifier="CLA" language="java"/> - <snapshots id="3" project_id="2" status="P" islast="1" purge_status="[null]" /> - <snapshots id="4" project_id="2" status="P" islast="1" purge_status="[null]" /> - <projects id="2" uuid="2" kee="bar-last" enabled="1" scope="FIL" qualifier="CLA" language="java" /> + <snapshots id="3" project_id="2" status="P" islast="1" purge_status="[null]"/> + <snapshots id="4" project_id="2" status="P" islast="1" purge_status="[null]"/> + <projects id="2" uuid="2" kee="bar-last" enabled="1" scope="FIL" qualifier="CLA" language="java"/> - <snapshots id="5" project_id="3" status="P" islast="0" purge_status="[null]" /> - <snapshots id="6" project_id="3" status="P" islast="0" purge_status="[null]" /> - <projects id="3" uuid="3" kee="foo-old" enabled="1" scope="FIL" qualifier="CLA" language="java" /> + <snapshots id="5" project_id="3" status="P" islast="0" purge_status="[null]"/> + <snapshots id="6" project_id="3" status="P" islast="0" purge_status="[null]"/> + <projects id="3" uuid="3" kee="foo-old" enabled="1" scope="FIL" qualifier="CLA" language="java"/> - <snapshots id="7" project_id="4" status="P" islast="1" purge_status="[null]" /> - <snapshots id="8" project_id="4" status="P" islast="1" purge_status="[null]" /> - <projects id="4" uuid="4" kee="foo-last" enabled="1" scope="FIL" qualifier="CLA" language="java" /> + <snapshots id="7" project_id="4" status="P" islast="1" purge_status="[null]"/> + <snapshots id="8" project_id="4" status="P" islast="1" purge_status="[null]"/> + <projects id="4" uuid="4" kee="foo-last" enabled="1" scope="FIL" qualifier="CLA" language="java"/> - <snapshots id="9" project_id="5" status="U" islast="0" purge_status="[null]" /> - <snapshots id="10" project_id="5" status="U" islast="0" purge_status="[null]" /> - <projects id="5" uuid="5" kee="foo" enabled="1" scope="FIL" qualifier="CLA" language="java" /> + <snapshots id="9" project_id="5" status="U" islast="0" purge_status="[null]"/> + <snapshots id="10" project_id="5" status="U" islast="0" purge_status="[null]"/> + <projects id="5" uuid="5" kee="foo" enabled="1" scope="FIL" qualifier="CLA" language="java"/> - <snapshots id="11" project_id="6" purge_status="[null]" status="P" islast="1" /> - <projects id="6" uuid="6" kee="baz" enabled="1" scope="FIL" qualifier="CLA" language="grvy" /> + <snapshots id="11" project_id="6" purge_status="[null]" status="P" islast="1"/> + <projects id="6" uuid="6" kee="baz" enabled="1" scope="FIL" qualifier="CLA" language="grvy"/> <!-- Old snapshot of another project --> <!-- bar-old --> - <duplications_index id="1" project_snapshot_id="1" snapshot_id="2" hash="bb" index_in_file="0" start_line="0" end_line="0" /> + <duplications_index id="1" project_snapshot_id="1" snapshot_id="2" hash="bb" index_in_file="0" start_line="0" + end_line="0"/> <!-- Last snapshot of another project --> <!-- bar-last --> - <duplications_index id="2" project_snapshot_id="3" snapshot_id="4" hash="aa" index_in_file="0" start_line="1" end_line="2" /> + <duplications_index id="2" project_snapshot_id="3" snapshot_id="4" hash="aa" index_in_file="0" start_line="1" + end_line="2"/> <!-- Old snapshot of current project --> <!-- foo-old --> - <duplications_index id="3" project_snapshot_id="5" snapshot_id="6" hash="bb" index_in_file="0" start_line="0" end_line="0" /> + <duplications_index id="3" project_snapshot_id="5" snapshot_id="6" hash="bb" index_in_file="0" start_line="0" + end_line="0"/> <!-- Last snapshot of current project --> <!-- foo-last --> - <duplications_index id="4" project_snapshot_id="7" snapshot_id="8" hash="aa" index_in_file="0" start_line="0" end_line="0" /> + <duplications_index id="4" project_snapshot_id="7" snapshot_id="8" hash="aa" index_in_file="0" start_line="0" + end_line="0"/> <!-- New snapshot of current project --> <!-- foo --> - <duplications_index id="5" project_snapshot_id="9" snapshot_id="10" hash="aa" index_in_file="0" start_line="0" end_line="0" /> + <duplications_index id="5" project_snapshot_id="9" snapshot_id="10" hash="aa" index_in_file="0" start_line="0" + end_line="0"/> <!-- Note that there is two blocks with same hash for current analysis to verify that we use "SELECT DISTINCT", --> <!-- without "DISTINCT" we will select block from "bar-last" two times. --> - <duplications_index id="6" project_snapshot_id="9" snapshot_id="10" hash="aa" index_in_file="1" start_line="1" end_line="1" /> + <duplications_index id="6" project_snapshot_id="9" snapshot_id="10" hash="aa" index_in_file="1" start_line="1" + end_line="1"/> <!-- Last snapshot of project with another language --> <!-- baz --> - <duplications_index id="7" project_snapshot_id="1" snapshot_id="11" hash="aa" index_in_file="0" start_line="0" end_line="0" /> + <duplications_index id="7" project_snapshot_id="1" snapshot_id="11" hash="aa" index_in_file="0" start_line="0" + end_line="0"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert-result.xml b/sonar-db/src/test/resources/org/sonar/db/duplication/DuplicationDaoTest/shouldInsert-result.xml index ba0e8dbd0dc..797be8db59d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/duplication/DuplicationDaoTest/shouldInsert-result.xml @@ -1,9 +1,10 @@ <dataset> - <snapshots purge_status="[null]" id="1" status="U" islast="0" project_id="0" /> - <snapshots purge_status="[null]" id="2" status="U" islast="0" project_id="1" /> - <projects id="1" uuid="1" kee="foo" enabled="1" scope="FIL" qualifier="CLA" /> + <snapshots purge_status="[null]" id="1" status="U" islast="0" project_id="0"/> + <snapshots purge_status="[null]" id="2" status="U" islast="0" project_id="1"/> + <projects id="1" uuid="1" kee="foo" enabled="1" scope="FIL" qualifier="CLA"/> - <duplications_index id="1" project_snapshot_id="1" snapshot_id="2" hash="bb" index_in_file="0" start_line="1" end_line="2" /> + <duplications_index id="1" project_snapshot_id="1" snapshot_id="2" hash="bb" index_in_file="0" start_line="1" + end_line="2"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert.xml b/sonar-db/src/test/resources/org/sonar/db/duplication/DuplicationDaoTest/shouldInsert.xml index 2fe14ea1f9a..fd4fdc7b948 100644 --- a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert.xml +++ b/sonar-db/src/test/resources/org/sonar/db/duplication/DuplicationDaoTest/shouldInsert.xml @@ -1,7 +1,7 @@ <dataset> - <snapshots purge_status="[null]" id="1" status="U" islast="0" project_id="0" /> - <snapshots purge_status="[null]" id="2" status="U" islast="0" project_id="1" /> - <projects id="1" uuid="1" kee="foo" enabled="1" scope="FIL" qualifier="CLA" /> + <snapshots purge_status="[null]" id="1" status="U" islast="0" project_id="0"/> + <snapshots purge_status="[null]" id="2" status="U" islast="0" project_id="1"/> + <projects id="1" uuid="1" kee="foo" enabled="1" scope="FIL" qualifier="CLA"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/shared.xml new file mode 100644 index 00000000000..7e2de0d8076 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/shared.xml @@ -0,0 +1,5 @@ +<dataset> + + <projects id="1" kee="org.sonar.Sample" root_id="[null]"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_delete_action_plan-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_delete_action_plan-result.xml index 2e330ef5fe1..2b855c97f05 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_delete_action_plan-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_delete_action_plan-result.xml @@ -1,6 +1,6 @@ <dataset> <action_plans id="1" kee="ABC" project_id="1" name="Long term" description="Long term action plan" deadline="[null]" - user_login="arthur" status="OPEN" created_at="[null]" updated_at="[null]" /> + user_login="arthur" status="OPEN" created_at="[null]" updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_delete_action_plan.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_delete_action_plan.xml index eeb2dfd24c7..eaa959cccf9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_delete_action_plan.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_delete_action_plan.xml @@ -1,9 +1,9 @@ <dataset> <action_plans id="1" kee="ABC" project_id="1" name="Long term" description="Long term action plan" deadline="[null]" - user_login="arthur" status="OPEN" created_at="[null]" updated_at="[null]" /> + user_login="arthur" status="OPEN" created_at="[null]" updated_at="[null]"/> <action_plans id="2" kee="BCD" project_id="1" name="Short term" description="Short term action plan" deadline="[null]" - user_login="arthur" status="CLOSED" created_at="[null]" updated_at="[null]" /> + user_login="arthur" status="CLOSED" created_at="[null]" updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_find_by_key.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_find_by_key.xml index 451855f27b0..c21cd9325e4 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_find_by_key.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_find_by_key.xml @@ -1,6 +1,6 @@ <dataset> <action_plans id="1" kee="ABC" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]" - user_login="igor" status="[null]" created_at="[null]" updated_at="[null]" /> + user_login="igor" status="[null]" created_at="[null]" updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_find_by_keys.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_find_by_keys.xml index 0ce3d8d8dd9..a682d59fd17 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_find_by_keys.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_find_by_keys.xml @@ -1,12 +1,12 @@ <dataset> <action_plans id="1" kee="ABC" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]" - user_login="igor" status="[null]" created_at="[null]" updated_at="[null]" /> + user_login="igor" status="[null]" created_at="[null]" updated_at="[null]"/> <action_plans id="2" kee="ABD" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]" - user_login="igor" status="[null]" created_at="[null]" updated_at="[null]" /> + user_login="igor" status="[null]" created_at="[null]" updated_at="[null]"/> <action_plans id="3" kee="ABE" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]" - user_login="igor" status="[null]" created_at="[null]" updated_at="[null]" /> + user_login="igor" status="[null]" created_at="[null]" updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_find_by_name_and_project_id.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_find_by_name_and_project_id.xml index 621faaf57ee..e99d5b3eb3a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_find_by_name_and_project_id.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_find_by_name_and_project_id.xml @@ -1,12 +1,12 @@ <dataset> <action_plans id="1" kee="ABC" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]" - user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]" /> + user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]"/> <action_plans id="2" kee="ABD" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]" - user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]" /> + user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]"/> <action_plans id="3" kee="ABE" project_id="2" name="SHORT_TERM" description="[null]" deadline="[null]" - user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]" /> + user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_find_open_by_project_id.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_find_open_by_project_id.xml index 974a91d1808..e15d4d0bbec 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_find_open_by_project_id.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_find_open_by_project_id.xml @@ -1,12 +1,12 @@ <dataset> <action_plans id="1" kee="ABC" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]" - user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]" /> + user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]"/> <action_plans id="2" kee="ABD" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]" - user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]" /> + user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]"/> <action_plans id="3" kee="ABE" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]" - user_login="igor" status="CLOSED" created_at="[null]" updated_at="[null]" /> + user_login="igor" status="CLOSED" created_at="[null]" updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_insert_new_action_plan-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_insert_new_action_plan-result.xml index 2e330ef5fe1..2b855c97f05 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_insert_new_action_plan-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_insert_new_action_plan-result.xml @@ -1,6 +1,6 @@ <dataset> <action_plans id="1" kee="ABC" project_id="1" name="Long term" description="Long term action plan" deadline="[null]" - user_login="arthur" status="OPEN" created_at="[null]" updated_at="[null]" /> + user_login="arthur" status="OPEN" created_at="[null]" updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_update_action_plan-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_update_action_plan-result.xml index 2e330ef5fe1..2b855c97f05 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_update_action_plan-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_update_action_plan-result.xml @@ -1,6 +1,6 @@ <dataset> <action_plans id="1" kee="ABC" project_id="1" name="Long term" description="Long term action plan" deadline="[null]" - user_login="arthur" status="OPEN" created_at="[null]" updated_at="[null]" /> + user_login="arthur" status="OPEN" created_at="[null]" updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_update_action_plan.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_update_action_plan.xml index 983893dbc03..3da5c2083b5 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanDaoTest/should_update_action_plan.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanDaoTest/should_update_action_plan.xml @@ -1,6 +1,6 @@ <dataset> <action_plans id="1" kee="ABC" project_id="1" name="Old name" description="Old desc" deadline="[null]" - user_login="[null]" status="CLOSED" created_at="[null]" updated_at="[null]" /> + user_login="[null]" status="CLOSED" created_at="[null]" updated_at="[null]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanStatsDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanStatsDaoTest/shared.xml new file mode 100644 index 00000000000..7e2de0d8076 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanStatsDaoTest/shared.xml @@ -0,0 +1,5 @@ +<dataset> + + <projects id="1" kee="org.sonar.Sample" root_id="[null]"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanStatsDaoTest/should_find_by_project.xml b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanStatsDaoTest/should_find_by_project.xml new file mode 100644 index 00000000000..f38c53fea63 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/ActionPlanStatsDaoTest/should_find_by_project.xml @@ -0,0 +1,81 @@ +<dataset> + + <action_plans id="1" kee="ABC" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]" + user_login="igor" status="OPEN" created_at="[null]" updated_at="[null]"/> + + <issues + id="100" + kee="ABCDE" + component_uuid="uuid-400" + project_uuid="uuid-400" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + status="OPEN" + resolution="[null]" + checksum="XXX" + reporter="arthur" + assignee="perceval" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + action_plan_key="ABC" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="1400000000000" + /> + + <issues + id="101" + kee="ABCDF" + component_uuid="uuid-400" + project_uuid="uuid-400" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + status="CLOSED" + resolution="FIXED" + checksum="XXX" + reporter="arthur" + assignee="perceval" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + action_plan_key="ABC" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="1400000000000" + /> + + <issues + id="102" + kee="ABCDG" + component_uuid="uuid-400" + project_uuid="uuid-400" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + status="CLOSED" + resolution="FIXED" + checksum="XXX" + reporter="arthur" + assignee="perceval" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + action_plan_key="ABC" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="1400000000000" + /> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/delete-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/delete-result.xml index be1549d36f1..be1549d36f1 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/delete-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/delete-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/delete.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/delete.xml index 3277acb54ca..3277acb54ca 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/delete.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/delete.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/empty.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/empty.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/empty.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/empty.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/insert-result.xml index 06468bff8a8..06468bff8a8 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/insert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/insert-result.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml new file mode 100644 index 00000000000..ef1c47fe020 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml @@ -0,0 +1,182 @@ +<dataset> + + <!-- Unresolved. To be included --> + <issues + id="1" + kee="UNRESOLVED_ON_FILE_1" + component_uuid="FILE_1" + project_uuid="PROJECT_1" + resolution="[null]" + status="OPEN" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="[null]" + checksum="[null]" + reporter="user" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + + <!-- diff --> + <issue_changes + id="100" + kee="100" + issue_key="UNRESOLVED_ON_FILE_1" + user_login="arthur" + change_type="diff" + change_data="severity=MAJOR|BLOCKER" + created_at="1410213600000" + updated_at="1410213600000" + issue_change_creation_date="1410213600000" + /> + + <!-- comment --> + <issue_changes + id="102" + kee="102" + issue_key="UNRESOLVED_ON_FILE_1" + user_login="arthur" + change_type="comment" + change_data="recent comment" + created_at="1410213600000" + updated_at="1410213600000" + issue_change_creation_date="[null]" + /> + + <!-- Resolved but not closed. To be included --> + <issues + id="2" + kee="RESOLVED_ON_FILE_1" + component_uuid="FILE_1" + project_uuid="PROJECT_1" + resolution="FIXED" + status="RESOLVED" + rule_id="501" + severity="MAJOR" + manual_severity="[false]" + message="[null]" + line="120" + effort_to_fix="[null]" + checksum="[null]" + reporter="[null]" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + + <issue_changes + id="103" + kee="103" + issue_key="RESOLVED_ON_FILE_1" + user_login="arthur" + change_type="diff" + change_data="severity=MAJOR|BLOCKER" + created_at="1410213600000" + updated_at="1410213600000" + issue_change_creation_date="1410213600000" + /> + + <!-- Closed. To be excluded --> + <issues + id="3" + kee="CLOSED_ON_FILE_1" + component_uuid="FILE_1" + project_uuid="PROJECT_1" + resolution="FIXED" + status="CLOSED" + rule_id="501" + severity="MAJOR" + manual_severity="[false]" + message="[null]" + line="120" + effort_to_fix="[null]" + checksum="[null]" + reporter="[null]" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + + <issue_changes + id="104" + kee="104" + issue_key="CLOSED_ON_FILE_1" + user_login="arthur" + change_type="diff" + change_data="severity=MAJOR|BLOCKER" + created_at="1410213600000" + updated_at="1410213600000" + issue_change_creation_date="1410213600000" + /> + + <!-- Unresolved on other file --> + <issues + id="4" + kee="UNRESOLVED_ON_FILE_2" + component_uuid="FILE_2" + project_uuid="PROJECT_1" + resolution="[null]" + status="OPEN" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="[null]" + checksum="[null]" + reporter="user" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + + <!-- diff --> + <issue_changes + id="105" + kee="105" + issue_key="UNRESOLVED_ON_FILE_2" + user_login="arthur" + change_type="diff" + change_data="severity=MAJOR|BLOCKER" + created_at="1410213600000" + updated_at="1410213600000" + issue_change_creation_date="1410213600000" + /> + + <!-- comment --> + <issue_changes + id="106" + kee="106" + issue_key="UNRESOLVED_ON_FILE_2" + user_login="arthur" + change_type="comment" + change_data="recent comment" + created_at="1410213600000" + updated_at="1410213600000" + issue_change_creation_date="[null]" + /> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/shared.xml new file mode 100644 index 00000000000..0b181deb146 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/shared.xml @@ -0,0 +1,63 @@ +<dataset> + + <issue_changes + id="100" + kee="ABCDE" + issue_key="1000" + user_login="arthur" + change_type="comment" + change_data="old comment" + created_at="1356994800000" + updated_at="1356994800000" + issue_change_creation_date="[null]" + /> + + <issue_changes + id="101" + kee="[null]" + issue_key="1000" + user_login="arthur" + change_type="diff" + change_data="severity=MAJOR|BLOCKER" + created_at="1359759600000" + updated_at="1359759600000" + issue_change_creation_date="1359759600000" + /> + + <issue_changes + id="102" + kee="FGHIJ" + issue_key="1000" + user_login="arthur" + change_type="comment" + change_data="recent comment" + created_at="1367704800000" + updated_at="1367704800000" + issue_change_creation_date="[null]" + /> + + <issue_changes + id="103" + kee="KLMN" + issue_key="1001" + user_login="arthur" + change_type="diff" + change_data="actionPlan=1.0|1.1" + created_at="1359759600000" + updated_at="1359759600000" + issue_change_creation_date="1359759600000" + /> + + <issue_changes + id="104" + kee="OPQR" + issue_key="1001" + user_login="henry" + change_type="diff" + change_data="severity=MAJOR|BLOCKER" + created_at="1356994800000" + updated_at="1356994800000" + issue_change_creation_date="1356994800000" + /> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/update-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/update-result.xml new file mode 100644 index 00000000000..a1c436a6622 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/update-result.xml @@ -0,0 +1,38 @@ +<dataset> + + <issue_changes + id="100" + kee="COMMENT-1" + issue_key="ISSUE-1" + user_login="arthur" + change_type="comment" + change_data="old comment" + created_at="1356994800000" + updated_at="1356994800000" + issue_change_creation_date="[null]" + /> + + <issue_changes + id="101" + kee="[null]" + issue_key="1000" + user_login="arthur" + change_type="diff" + change_data="severity=MAJOR|BLOCKER" + created_at="1359759600000" + updated_at="1359759600000" + issue_change_creation_date="1359759600000" + /> + + <issue_changes + id="102" + kee="COMMENT-2" + issue_key="ISSUE-1" + user_login="arthur" + change_type="comment" + change_data="new comment" + created_at="1367704800000" + updated_at="1500000000000" + issue_change_creation_date="[null]" + /> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/update.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/update.xml index 641f333faa3..641f333faa3 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/update.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/update.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeMapperTest/insert_comment-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeMapperTest/insert_comment-result.xml new file mode 100644 index 00000000000..ed763c2952a --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeMapperTest/insert_comment-result.xml @@ -0,0 +1,13 @@ +<dataset> + <issue_changes + id="1" + kee="COMMENT-1234" + issue_key="ABCDE" + user_login="emmerik" + change_type="comment" + change_data="the comment" + created_at="1500000000000" + updated_at="1500000000000" + issue_change_creation_date="[null]" + /> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeMapperTest/insert_diff-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeMapperTest/insert_diff-result.xml new file mode 100644 index 00000000000..bbc0741292f --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeMapperTest/insert_diff-result.xml @@ -0,0 +1,13 @@ +<dataset> + <issue_changes + id="1" + kee="[null]" + issue_key="ABCDE" + user_login="emmerik" + change_type="diff" + change_data="severity=INFO|BLOCKER" + created_at="1500000000000" + updated_at="1500000000000" + issue_change_creation_date="1500000000000" + /> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml new file mode 100644 index 00000000000..deb88387a4a --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml @@ -0,0 +1,80 @@ +<dataset> + + <!-- rule 500 --> + <issues + id="100" + kee="ABCDE-1" + component_uuid="CDEF" + project_uuid="ABCD" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="4.2" + status="OPEN" + resolution="[null]" + checksum="XXX" + reporter="arthur" + assignee="perceval" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="1400000000000" + /> + + <issues + id="101" + kee="ABCDE-2" + component_uuid="CDEF" + project_uuid="ABCD" + rule_id="500" + severity="MAJOR" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="4.2" + status="OPEN" + resolution="[null]" + checksum="XXX" + reporter="arthur" + assignee="perceval" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + issue_creation_date="1366149600000" + issue_update_date="1366149600000" + issue_close_date="1366149600000" + created_at="1400000000000" + updated_at="1400000000000" + /> + + + <!-- rule 501 --> + <issues + id="102" + kee="ABCDE-3" + component_uuid="CDEF" + project_uuid="ABCD" + rule_id="501" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="4.2" + status="OPEN" + resolution="[null]" + checksum="XXX" + reporter="arthur" + assignee="perceval" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="1400000000000" + /> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/shared.xml new file mode 100644 index 00000000000..353f9651342 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/shared.xml @@ -0,0 +1,26 @@ +<dataset> + + <group_roles id="1" group_id="[null]" resource_id="399" role="user"/> + + <projects id="399" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." kee="struts" + root_id="[null]" qualifier="TRK" scope="PRJ"/> + <projects id="400" uuid="BCDE" project_uuid="ABCD" module_uuid="[null]" module_uuid_path=".ABCD." kee="struts-core" + root_id="399" qualifier="BRC" scope="PRJ"/> + <projects id="401" uuid="CDEF" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path=".ABCD.BCDE." kee="Action.java" + root_id="400" qualifier="CLA" scope="PRJ"/> + <projects id="402" uuid="DEFG" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path=".ABCD.BCDE." kee="Filter.java" + root_id="400" qualifier="CLA" scope="PRJ"/> + + <snapshots id="100" project_id="399" root_snapshot_id="[null]" parent_snapshot_id="[null]" root_project_id="399" + path="" islast="[true]"/> + <snapshots id="101" project_id="400" root_snapshot_id="100" parent_snapshot_id="100" root_project_id="399" path="100." + islast="[true]"/> + <snapshots id="102" project_id="401" root_snapshot_id="100" parent_snapshot_id="101" root_project_id="399" + path="100.101." islast="[true]"/> + <snapshots id="103" project_id="402" root_snapshot_id="100" parent_snapshot_id="101" root_project_id="399" + path="100.101." islast="[true]"/> + + <rules id="500" tags="[null]" system_tags="[null]" plugin_rule_key="AvoidCycle" plugin_name="squid" language="java"/> + <rules id="501" tags="[null]" system_tags="[null]" plugin_rule_key="NullRef" plugin_name="squid" language="xoo"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml new file mode 100644 index 00000000000..f92b8328c21 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml @@ -0,0 +1,80 @@ +<dataset> + + <!-- rule 500 --> + <issues + id="100" + kee="ABCDE-1" + component_uuid="CDEF" + project_uuid="ABCD" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="4.2" + status="OPEN" + resolution="FIXED" + checksum="XXX" + reporter="arthur" + assignee="perceval" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="1400000000000" + /> + + <issues + id="101" + kee="ABCDE-2" + component_uuid="CDEF" + project_uuid="ABCD" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="4.2" + status="OPEN" + resolution="FIXED" + checksum="XXX" + reporter="arthur" + assignee="perceval" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="1400000000000" + /> + + + <!-- rule 501 --> + <issues + id="102" + kee="ABCDE-3" + component_uuid="CDEF" + project_uuid="ABCD" + rule_id="501" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="4.2" + status="OPEN" + resolution="FIXED" + checksum="XXX" + reporter="arthur" + assignee="perceval" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="1400000000000" + /> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml new file mode 100644 index 00000000000..b3575610bd1 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml @@ -0,0 +1,133 @@ +<dataset> + + <!-- Open Issue on a file --> + <issues + id="100" + kee="100" + component_uuid="CDEF" + project_uuid="ABCD" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="[null]" + status="OPEN" + resolution="[null]" + checksum="[null]" + reporter="user" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + + <!-- Open Issue on a file --> + <issues + id="101" + kee="101" + component_uuid="DEFG" + project_uuid="ABCD" + rule_id="501" + severity="MAJOR" + manual_severity="[false]" + message="[null]" + line="120" + effort_to_fix="[null]" + status="OPEN" + resolution="[null]" + checksum="[null]" + reporter="[null]" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + + <!-- Closed Issue on a file --> + <issues + id="102" + kee="102" + component_uuid="DEFG" + project_uuid="ABCD" + rule_id="501" + severity="MAJOR" + manual_severity="[false]" + message="[null]" + line="120" + effort_to_fix="[null]" + status="CLOSED" + resolution="FIXED" + checksum="[null]" + reporter="[null]" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + + <!-- Open Issue on a sub module --> + <issues + id="103" + kee="103" + component_uuid="BCDE" + project_uuid="ABCD" + rule_id="501" + severity="MAJOR" + manual_severity="[false]" + message="[null]" + line="[null]" + effort_to_fix="[null]" + status="OPEN" + resolution="[null]" + checksum="[null]" + reporter="[null]" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + + <!-- Open Issue on a root module --> + <issues + id="104" + kee="104" + component_uuid="ABCD" + project_uuid="ABCD" + rule_id="501" + severity="MAJOR" + manual_severity="[false]" + message="[null]" + line="[null]" + effort_to_fix="[null]" + status="OPEN" + resolution="[null]" + checksum="[null]" + reporter="[null]" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml new file mode 100644 index 00000000000..b7fa286ffca --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml @@ -0,0 +1,127 @@ +<!-- + ~ SonarQube, open source software quality management tool. + ~ Copyright (C) 2008-2014 SonarSource + ~ mailto:contact AT sonarsource DOT com + ~ + ~ SonarQube is free software; you can redistribute it and/or + ~ modify it under the terms of the GNU Lesser General Public + ~ License as published by the Free Software Foundation; either + ~ version 3 of the License, or (at your option) any later version. + ~ + ~ SonarQube is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public License + ~ along with this program; if not, write to the Free Software Foundation, + ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + --> + +<dataset> + + <!-- Open Issue on a file --> + <issues + id="100" + kee="100" + component_uuid="CDEF" + project_uuid="uuid-111" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="[null]" + status="OPEN" + resolution="[null]" + checksum="[null]" + reporter="user" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + + <!-- Open Issue on a file --> + <issues + id="101" + kee="101" + component_uuid="DEFG" + project_uuid="uuid-111" + rule_id="501" + severity="MAJOR" + manual_severity="[false]" + message="[null]" + line="120" + effort_to_fix="[null]" + status="OPEN" + resolution="[null]" + checksum="[null]" + reporter="[null]" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + + <!-- Closed Issue on a file --> + <issues + id="102" + kee="102" + component_uuid="DEFG" + project_uuid="uuid-111" + rule_id="501" + severity="MAJOR" + manual_severity="[false]" + message="[null]" + line="120" + effort_to_fix="[null]" + status="CLOSED" + resolution="FIXED" + checksum="[null]" + reporter="[null]" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + + <!-- Open Issue on a sub module --> + <issues + id="103" + kee="103" + component_uuid="BCDE" + project_uuid="uuid-111" + rule_id="501" + severity="MAJOR" + manual_severity="[false]" + message="[null]" + line="[null]" + effort_to_fix="[null]" + status="OPEN" + resolution="[null]" + checksum="[null]" + reporter="[null]" + assignee="user" + author_login="[null]" + issue_attributes="[null]" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="1400000000000" + updated_at="[null]" + /> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/shared.xml new file mode 100644 index 00000000000..68f9cdc6615 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/shared.xml @@ -0,0 +1,23 @@ +<dataset> + + <issue_filters + id="1" + name="Sonar Issues" + user_login="stephane" + shared="[true]" + description="All issues of Sonar" + data="componentRoots=org.codehaus.sonar" + created_at="2013-06-10" + updated_at="2013-06-10"/> + + <issue_filters + id="2" + name="Open issues" + user_login="michael" + shared="[false]" + description="All open issues" + data="statuses=OPEN" + created_at="2013-06-10" + updated_at="2013-06-10"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_delete-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_delete-result.xml new file mode 100644 index 00000000000..7933167cf9a --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_delete-result.xml @@ -0,0 +1,13 @@ +<dataset> + + <issue_filters + id="2" + name="Open issues" + user_login="michael" + shared="[false]" + description="All open issues" + data="statuses=OPEN" + created_at="2013-06-10" + updated_at="2013-06-10"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_insert-result.xml new file mode 100644 index 00000000000..869df62a337 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_insert-result.xml @@ -0,0 +1,34 @@ +<dataset> + + <issue_filters + id="1" + name="Sonar Issues" + user_login="stephane" + shared="[true]" + description="All issues of Sonar" + data="componentRoots=org.codehaus.sonar" + created_at="2013-06-10" + updated_at="2013-06-10"/> + + <issue_filters + id="2" + name="Open issues" + user_login="michael" + shared="[false]" + description="All open issues" + data="statuses=OPEN" + created_at="2013-06-10" + updated_at="2013-06-10"/> + + + <issue_filters + id="3" + name="Sonar Open issues" + user_login="michael" + shared="[true]" + description="All open issues on Sonar" + data="statuses=OPEN|componentRoots=org.codehaus.sonar" + created_at="2013-06-10" + updated_at="2013-06-10"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_by_user.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_by_user.xml new file mode 100644 index 00000000000..0f91cec3cdd --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_by_user.xml @@ -0,0 +1,33 @@ +<dataset> + + <issue_filters + id="1" + name="Sonar Issues" + user_login="stephane" + shared="[true]" + description="All issues of Sonar" + data="componentRoots=org.codehaus.sonar" + created_at="2013-06-10" + updated_at="2013-06-10"/> + + <issue_filters + id="2" + name="Open issues" + user_login="michael" + shared="[false]" + description="All open issues" + data="statuses=OPEN" + created_at="2013-06-10" + updated_at="2013-06-10"/> + + <issue_filters + id="3" + name="Sonar Open issues" + user_login="michael" + shared="[true]" + description="All open issues on Sonar" + data="statuses=OPEN|componentRoots=org.codehaus.sonar" + created_at="2013-06-10" + updated_at="2013-06-10"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_by_user_with_only_favorite_filters.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_by_user_with_only_favorite_filters.xml new file mode 100644 index 00000000000..47d558307c3 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_by_user_with_only_favorite_filters.xml @@ -0,0 +1,39 @@ +<dataset> + + <issue_filters + id="1" + name="Sonar Issues" + user_login="stephane" + shared="[true]" + description="All issues of Sonar" + data="componentRoots=org.codehaus.sonar" + created_at="2013-06-10" + updated_at="2013-06-10"/> + + <issue_filters + id="2" + name="Open issues" + user_login="michael" + shared="[false]" + description="All open issues" + data="statuses=OPEN" + created_at="2013-06-10" + updated_at="2013-06-10"/> + + <issue_filters + id="3" + name="Sonar Open issues" + user_login="michael" + shared="[true]" + description="All open issues on Sonar" + data="statuses=OPEN|componentRoots=org.codehaus.sonar" + created_at="2013-06-10" + updated_at="2013-06-10"/> + + <issue_filter_favourites + id="10" + user_login="michael" + issue_filter_id="2" + created_at="2013-06-10"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_provided_by_name.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_provided_by_name.xml new file mode 100644 index 00000000000..81bf84aee21 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_select_provided_by_name.xml @@ -0,0 +1,58 @@ +<dataset> + + <!-- This one must be found --> + <issue_filters + id="1" + name="Unresolved Issues" + user_login="[null]" + shared="[true]" + description="[null]" + data="resolved=false" + created_at="2011-04-25 01:15:00" + updated_at="2011-04-25 01:15:00"/> + + <!-- This one must NOT be found: belongs to admin --> + <issue_filters + id="2" + name="Unresolved Issues" + user_login="admin" + shared="[true]" + description="[null]" + data="resolved=false" + created_at="2011-04-25 01:15:00" + updated_at="2011-04-25 01:15:00"/> + + <!-- This one must NOT be found: not shared --> + <issue_filters + id="3" + name="Unresolved Issues" + user_login="[null]" + shared="[false]" + description="[null]" + data="resolved=false" + created_at="2011-04-25 01:15:00" + updated_at="2011-04-25 01:15:00"/> + + <!-- This one must be found --> + <issue_filters + id="4" + name="My Unresolved Issues" + user_login="[null]" + shared="[true]" + description="[null]" + data="resolved=false|assignees=__me__" + created_at="2011-04-25 01:15:00" + updated_at="2011-04-25 01:15:00"/> + + <!-- This one must NOT be found: not shared --> + <issue_filters + id="5" + name="Unknown Filter" + user_login="[null]" + shared="[false]" + description="[null]" + data="resolved=false" + created_at="2011-04-25 01:15:00" + updated_at="2011-04-25 01:15:00"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_update-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_update-result.xml new file mode 100644 index 00000000000..0916ece3f0a --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterDaoTest/should_update-result.xml @@ -0,0 +1,23 @@ +<dataset> + + <issue_filters + id="1" + name="Sonar Issues" + user_login="stephane" + shared="[true]" + description="All issues of Sonar" + data="componentRoots=org.codehaus.sonar" + created_at="2013-06-10" + updated_at="2013-06-10"/> + + <issue_filters + id="2" + name="Closed issues" + user_login="bernard" + shared="[false]" + description="All closed issues" + data="statuses=CLOSED" + created_at="2013-06-10" + updated_at="2013-06-11"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/shared.xml new file mode 100644 index 00000000000..07d23d9fce6 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/shared.xml @@ -0,0 +1,21 @@ +<dataset> + + <issue_filter_favourites + id="1" + user_login="stephane" + issue_filter_id="10" + created_at="2013-06-10"/> + + <issue_filter_favourites + id="2" + user_login="stephane" + issue_filter_id="11" + created_at="2013-06-10"/> + + <issue_filter_favourites + id="3" + user_login="arthur" + issue_filter_id="10" + created_at="2013-06-10"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_delete-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_delete-result.xml new file mode 100644 index 00000000000..b3f03e6724e --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_delete-result.xml @@ -0,0 +1,15 @@ +<dataset> + + <issue_filter_favourites + id="1" + user_login="stephane" + issue_filter_id="10" + created_at="2013-06-10"/> + + <issue_filter_favourites + id="2" + user_login="stephane" + issue_filter_id="11" + created_at="2013-06-10"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_delete_by_issue_filter_id-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_delete_by_issue_filter_id-result.xml new file mode 100644 index 00000000000..c2a7f43e9e4 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_delete_by_issue_filter_id-result.xml @@ -0,0 +1,9 @@ +<dataset> + + <issue_filter_favourites + id="2" + user_login="stephane" + issue_filter_id="11" + created_at="2013-06-10"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_insert-result.xml new file mode 100644 index 00000000000..f9b8e27974d --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueFilterFavouriteDaoTest/should_insert-result.xml @@ -0,0 +1,27 @@ +<dataset> + + <issue_filter_favourites + id="1" + user_login="stephane" + issue_filter_id="10" + created_at="2013-06-10"/> + + <issue_filter_favourites + id="2" + user_login="stephane" + issue_filter_id="11" + created_at="2013-06-10"/> + + <issue_filter_favourites + id="3" + user_login="arthur" + issue_filter_id="10" + created_at="2013-06-10"/> + + <issue_filter_favourites + id="4" + user_login="arthur" + issue_filter_id="11" + created_at="2013-06-18"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testInsert-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testInsert-result.xml new file mode 100644 index 00000000000..816b527458c --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testInsert-result.xml @@ -0,0 +1,29 @@ +<dataset> + <issues + id="100" + kee="ABCDE" + component_uuid="uuid-123" + project_uuid="uuid-100" + rule_id="200" + severity="BLOCKER" + manual_severity="[false]" + message="the message" + line="500" + effort_to_fix="3.14" + technical_debt="10" + status="RESOLVED" + resolution="FIXED" + checksum="123456789" + reporter="emmerik" + author_login="morgan" + assignee="karadoc" + issue_attributes="JIRA=FOO-1234" + tags="[null]" + issue_creation_date="1401000000000" + issue_update_date="1402000000000" + issue_close_date="1403000000000" + created_at="1400000000000" + updated_at="1500000000000" + action_plan_key="current_sprint" + /> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate-result.xml new file mode 100644 index 00000000000..afce8a1ed86 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate-result.xml @@ -0,0 +1,29 @@ +<dataset> + <issues + id="100" + kee="ABCDE" + component_uuid="uuid-123" + project_uuid="uuid-101" + rule_id="200" + severity="BLOCKER" + manual_severity="[false]" + message="the message" + line="500" + effort_to_fix="3.14" + technical_debt="10" + status="RESOLVED" + resolution="FIXED" + checksum="123456789" + reporter="emmerik" + author_login="morgan" + assignee="karadoc" + issue_attributes="JIRA=FOO-1234" + tags="[null]" + issue_creation_date="1401000000000" + issue_update_date="1402000000000" + issue_close_date="1403000000000" + created_at="1400000000000" + updated_at="1500000000000" + action_plan_key="current_sprint" + /> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate.xml new file mode 100644 index 00000000000..5cb05d1dd96 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/testUpdate.xml @@ -0,0 +1,27 @@ +<dataset> + <issues + id="100" + kee="ABCDE" + component_uuid="uuid-123" + project_uuid="uuid-100" + rule_id="200" + severity="INFO" + manual_severity="[false]" + message="old" + line="[null]" + effort_to_fix="[null]" + technical_debt="[null]" + status="OPEN" + resolution="[null]" + checksum="[null]" + reporter="[null]" + author_login="[null]" + assignee="[null]" + issue_creation_date="1401000000000" + issue_update_date="1402000000000" + issue_close_date="1403000000000" + created_at="1400000000000" + updated_at="1500000000000" + action_plan_key="[null]" + /> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml new file mode 100644 index 00000000000..ecb26c85603 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict-result.xml @@ -0,0 +1,30 @@ +<dataset> + <!-- not updated --> + <issues + id="100" + kee="ABCDE" + component_uuid="uuid-123" + project_uuid="uuid-100" + rule_id="200" + severity="INFO" + manual_severity="[false]" + message="old" + line="[null]" + effort_to_fix="[null]" + technical_debt="[null]" + status="OPEN" + resolution="[null]" + checksum="[null]" + reporter="[null]" + author_login="[null]" + assignee="[null]" + issue_attributes="[null]" + tags="[null]" + issue_creation_date="[null]" + issue_update_date="[null]" + issue_close_date="[null]" + created_at="1400000000000" + updated_at="1450000000000" + action_plan_key="[null]" + /> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml new file mode 100644 index 00000000000..0264dc2bd7b --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueMapperTest/updateBeforeSelectedDate_with_conflict.xml @@ -0,0 +1,28 @@ +<dataset> + <issues + id="100" + kee="ABCDE" + component_uuid="uuid-123" + project_uuid="uuid-100" + rule_id="200" + severity="INFO" + manual_severity="[false]" + message="old" + line="[null]" + effort_to_fix="[null]" + technical_debt="[null]" + status="OPEN" + resolution="[null]" + checksum="[null]" + reporter="[null]" + author_login="[null]" + assignee="[null]" + issue_attributes="[null]" + issue_creation_date="[null]" + issue_update_date="[null]" + issue_close_date="[null]" + created_at="1400000000000" + updated_at="1450000000000" + action_plan_key="[null]" + /> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml new file mode 100644 index 00000000000..4cc9d077a16 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml @@ -0,0 +1,80 @@ +<dataset> + + <group_roles id="1" group_id="[null]" resource_id="399" role="user"/> + <projects id="399" kee="my.project:kee" root_id="[null]" qualifier="TRK" scope="PRJ"/> + + <issues + id="100" + kee="ABCDE-1" + component_uuid="uuid-401" + project_uuid="uuid-399" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="4.2" + status="OPEN" + resolution="FIXED" + checksum="XXX" + reporter="arthur" + assignee="perceval" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="2013-04-16" + updated_at="2013-04-16" + /> + + <issues + id="101" + kee="ABCDE-2" + component_uuid="uuid-401" + project_uuid="uuid-399" + rule_id="500" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="4.2" + status="OPEN" + resolution="FIXED" + checksum="XXX" + reporter="arthur" + assignee="[null]" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="2013-04-16" + updated_at="2013-04-16" + /> + + <issues + id="102" + kee="ABCDE-3" + component_uuid="uuid-401" + project_uuid="uuid-399" + rule_id="501" + severity="BLOCKER" + manual_severity="[false]" + message="[null]" + line="200" + effort_to_fix="4.2" + status="OPEN" + resolution="FIXED" + checksum="XXX" + reporter="arthur" + assignee="perceval" + author_login="[null]" + issue_attributes="JIRA=FOO-1234" + issue_creation_date="1366063200000" + issue_update_date="1366063200000" + issue_close_date="1366063200000" + created_at="2013-04-16" + updated_at="2013-04-16" + /> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/template/LoadedTemplateDaoTest/shouldCountByTypeAndKey.xml b/sonar-db/src/test/resources/org/sonar/db/loadedtemplate/LoadedTemplateDaoTest/shouldCountByTypeAndKey.xml index f4b6b01f4ab..f4b6b01f4ab 100644 --- a/sonar-core/src/test/resources/org/sonar/core/template/LoadedTemplateDaoTest/shouldCountByTypeAndKey.xml +++ b/sonar-db/src/test/resources/org/sonar/db/loadedtemplate/LoadedTemplateDaoTest/shouldCountByTypeAndKey.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/loadedtemplate/LoadedTemplateDaoTest/shouldInsert-result.xml b/sonar-db/src/test/resources/org/sonar/db/loadedtemplate/LoadedTemplateDaoTest/shouldInsert-result.xml new file mode 100644 index 00000000000..6881dd82799 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/loadedtemplate/LoadedTemplateDaoTest/shouldInsert-result.xml @@ -0,0 +1,8 @@ +<dataset> + + <loaded_templates + id="1" + kee="SQALE" + template_type="DASHBOARD"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/template/LoadedTemplateDaoTest/shouldInsert.xml b/sonar-db/src/test/resources/org/sonar/db/loadedtemplate/LoadedTemplateDaoTest/shouldInsert.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/template/LoadedTemplateDaoTest/shouldInsert.xml +++ b/sonar-db/src/test/resources/org/sonar/db/loadedtemplate/LoadedTemplateDaoTest/shouldInsert.xml diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/measure/MeasureFilterDaoTest/shared.xml index 94d22922788..8814a1c894d 100644 --- a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shared.xml +++ b/sonar-db/src/test/resources/org/sonar/db/measure/MeasureFilterDaoTest/shared.xml @@ -8,7 +8,7 @@ description="All projects" data="qualifiers=TRK" created_at="2012-12-25" - updated_at="2012-12-25" /> + updated_at="2012-12-25"/> <measure_filters id="2" @@ -18,6 +18,6 @@ description="All files" data="qualifiers=FIL" created_at="2012-01-25" - updated_at="2012-01-25" /> + updated_at="2012-01-25"/> </dataset> diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shouldInsert-result.xml b/sonar-db/src/test/resources/org/sonar/db/measure/MeasureFilterDaoTest/shouldInsert-result.xml index 1100b166b82..1100b166b82 100644 --- a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shouldInsert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/measure/MeasureFilterDaoTest/shouldInsert-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/notification/db/NotificationQueueDaoTest/should_delete_notification-result.xml b/sonar-db/src/test/resources/org/sonar/db/notification/NotificationQueueDaoTest/should_delete_notification-result.xml index e4a095e42cd..81662a5913d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/notification/db/NotificationQueueDaoTest/should_delete_notification-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/notification/NotificationQueueDaoTest/should_delete_notification-result.xml @@ -3,11 +3,11 @@ <notifications id="2" data="rO0ABXNyAChvcmcuc29uYXIuYXBpLm5vdGlmaWNhdGlvbnMuTm90aWZpY2F0aW9uTppHnJFK4aAC AAJMAAZmaWVsZHN0AA9MamF2YS91dGlsL01hcDtMAAR0eXBldAASTGphdmEvbGFuZy9TdHJpbmc7 eHBzcgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hv -bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDI=" /> +bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDI="/> <notifications id="4" data="rO0ABXNyAChvcmcuc29uYXIuYXBpLm5vdGlmaWNhdGlvbnMuTm90aWZpY2F0aW9uTppHnJFK4aAC AAJMAAZmaWVsZHN0AA9MamF2YS91dGlsL01hcDtMAAR0eXBldAASTGphdmEvbGFuZy9TdHJpbmc7 eHBzcgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hv -bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDQ=" /> +bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDQ="/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/notification/db/NotificationQueueDaoTest/should_delete_notification.xml b/sonar-db/src/test/resources/org/sonar/db/notification/NotificationQueueDaoTest/should_delete_notification.xml index 2eec750134c..6611a054610 100644 --- a/sonar-core/src/test/resources/org/sonar/core/notification/db/NotificationQueueDaoTest/should_delete_notification.xml +++ b/sonar-db/src/test/resources/org/sonar/db/notification/NotificationQueueDaoTest/should_delete_notification.xml @@ -3,21 +3,21 @@ <notifications id="1" data="rO0ABXNyAChvcmcuc29uYXIuYXBpLm5vdGlmaWNhdGlvbnMuTm90aWZpY2F0aW9uTppHnJFK4aAC AAJMAAZmaWVsZHN0AA9MamF2YS91dGlsL01hcDtMAAR0eXBldAASTGphdmEvbGFuZy9TdHJpbmc7 eHBzcgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hv -bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDE=" /> +bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDE="/> <notifications id="2" data="rO0ABXNyAChvcmcuc29uYXIuYXBpLm5vdGlmaWNhdGlvbnMuTm90aWZpY2F0aW9uTppHnJFK4aAC AAJMAAZmaWVsZHN0AA9MamF2YS91dGlsL01hcDtMAAR0eXBldAASTGphdmEvbGFuZy9TdHJpbmc7 eHBzcgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hv -bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDI=" /> +bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDI="/> <notifications id="3" data="rO0ABXNyAChvcmcuc29uYXIuYXBpLm5vdGlmaWNhdGlvbnMuTm90aWZpY2F0aW9uTppHnJFK4aAC AAJMAAZmaWVsZHN0AA9MamF2YS91dGlsL01hcDtMAAR0eXBldAASTGphdmEvbGFuZy9TdHJpbmc7 eHBzcgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hv -bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDM=" /> +bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDM="/> <notifications id="4" data="rO0ABXNyAChvcmcuc29uYXIuYXBpLm5vdGlmaWNhdGlvbnMuTm90aWZpY2F0aW9uTppHnJFK4aAC AAJMAAZmaWVsZHN0AA9MamF2YS91dGlsL01hcDtMAAR0eXBldAASTGphdmEvbGFuZy9TdHJpbmc7 eHBzcgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hv -bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDQ=" /> +bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDQ="/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/notification/db/NotificationQueueDaoTest/should_findOldest.xml b/sonar-db/src/test/resources/org/sonar/db/notification/NotificationQueueDaoTest/should_findOldest.xml index 2eec750134c..6611a054610 100644 --- a/sonar-core/src/test/resources/org/sonar/core/notification/db/NotificationQueueDaoTest/should_findOldest.xml +++ b/sonar-db/src/test/resources/org/sonar/db/notification/NotificationQueueDaoTest/should_findOldest.xml @@ -3,21 +3,21 @@ <notifications id="1" data="rO0ABXNyAChvcmcuc29uYXIuYXBpLm5vdGlmaWNhdGlvbnMuTm90aWZpY2F0aW9uTppHnJFK4aAC AAJMAAZmaWVsZHN0AA9MamF2YS91dGlsL01hcDtMAAR0eXBldAASTGphdmEvbGFuZy9TdHJpbmc7 eHBzcgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hv -bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDE=" /> +bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDE="/> <notifications id="2" data="rO0ABXNyAChvcmcuc29uYXIuYXBpLm5vdGlmaWNhdGlvbnMuTm90aWZpY2F0aW9uTppHnJFK4aAC AAJMAAZmaWVsZHN0AA9MamF2YS91dGlsL01hcDtMAAR0eXBldAASTGphdmEvbGFuZy9TdHJpbmc7 eHBzcgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hv -bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDI=" /> +bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDI="/> <notifications id="3" data="rO0ABXNyAChvcmcuc29uYXIuYXBpLm5vdGlmaWNhdGlvbnMuTm90aWZpY2F0aW9uTppHnJFK4aAC AAJMAAZmaWVsZHN0AA9MamF2YS91dGlsL01hcDtMAAR0eXBldAASTGphdmEvbGFuZy9TdHJpbmc7 eHBzcgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hv -bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDM=" /> +bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDM="/> <notifications id="4" data="rO0ABXNyAChvcmcuc29uYXIuYXBpLm5vdGlmaWNhdGlvbnMuTm90aWZpY2F0aW9uTppHnJFK4aAC AAJMAAZmaWVsZHN0AA9MamF2YS91dGlsL01hcDtMAAR0eXBldAASTGphdmEvbGFuZy9TdHJpbmc7 eHBzcgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hv -bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDQ=" /> +bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAZlbWFpbDQ="/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/notification/db/NotificationQueueDaoTest/should_insert_new_notification_queue-result.xml b/sonar-db/src/test/resources/org/sonar/db/notification/NotificationQueueDaoTest/should_insert_new_notification_queue-result.xml index cf030f42632..7afce2d8263 100644 --- a/sonar-core/src/test/resources/org/sonar/core/notification/db/NotificationQueueDaoTest/should_insert_new_notification_queue-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/notification/NotificationQueueDaoTest/should_insert_new_notification_queue-result.xml @@ -3,6 +3,6 @@ <notifications id="1" data="rO0ABXNyAChvcmcuc29uYXIuYXBpLm5vdGlmaWNhdGlvbnMuTm90aWZpY2F0aW9uTppHnJFK4aAC AAJMAAZmaWVsZHN0AA9MamF2YS91dGlsL01hcDtMAAR0eXBldAASTGphdmEvbGFuZy9TdHJpbmc7 eHBzcgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hv -bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAVlbWFpbA==" /> +bGR4cD9AAAAAAAAMdwgAAAAQAAAAAHh0AAVlbWFpbA=="/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/GroupWithPermissionDaoTest/groups_with_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/permission/GroupWithPermissionDaoTest/groups_with_permissions.xml index 418d5e69fac..418d5e69fac 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/GroupWithPermissionDaoTest/groups_with_permissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/GroupWithPermissionDaoTest/groups_with_permissions.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/GroupWithPermissionDaoTest/groups_with_permissions_should_be_sorted_by_group_name.xml b/sonar-db/src/test/resources/org/sonar/db/permission/GroupWithPermissionDaoTest/groups_with_permissions_should_be_sorted_by_group_name.xml index 10ab0e21e3f..10ab0e21e3f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/GroupWithPermissionDaoTest/groups_with_permissions_should_be_sorted_by_group_name.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/GroupWithPermissionDaoTest/groups_with_permissions_should_be_sorted_by_group_name.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/GroupWithPermissionTemplateDaoTest/groups_with_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/permission/GroupWithPermissionTemplateDaoTest/groups_with_permissions.xml index 8d6592cbc11..8d6592cbc11 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/GroupWithPermissionTemplateDaoTest/groups_with_permissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/GroupWithPermissionTemplateDaoTest/groups_with_permissions.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/GroupWithPermissionTemplateDaoTest/groups_with_permissions_should_be_sorted_by_group_name.xml b/sonar-db/src/test/resources/org/sonar/db/permission/GroupWithPermissionTemplateDaoTest/groups_with_permissions_should_be_sorted_by_group_name.xml index c98d45aece0..baf745a5028 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/GroupWithPermissionTemplateDaoTest/groups_with_permissions_should_be_sorted_by_group_name.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/GroupWithPermissionTemplateDaoTest/groups_with_permissions_should_be_sorted_by_group_name.xml @@ -1,7 +1,7 @@ <dataset> - <groups id="200" name="sonar-reviewers" /> - <groups id="201" name="sonar-users" /> + <groups id="200" name="sonar-reviewers"/> + <groups id="201" name="sonar-users"/> <groups id="202" name="sonar-administrators"/> <perm_templates_groups id="1" group_id="200" permission_reference="user" template_id="50"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_add_user_permission-result.xml index dbd5e8b636c..793d16b3bae 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_add_user_permission-result.xml @@ -7,6 +7,7 @@ <projects id="100" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_add_user_permission.xml index d40ea59c0ba..8f079ec590c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_add_user_permission.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_add_user_permission.xml @@ -6,6 +6,7 @@ <projects id="123" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_apply_permission_template-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_apply_permission_template-result.xml index c8bae886cc7..b70b4ac31a0 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_apply_permission_template-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_apply_permission_template-result.xml @@ -1,9 +1,9 @@ <dataset> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]" /> + <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> <!-- on other resources --> <group_roles id="1" group_id="100" resource_id="1" role="admin"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_apply_permission_template.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_apply_permission_template.xml index 7d07da03f61..ef9212b8087 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_apply_permission_template.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_apply_permission_template.xml @@ -2,12 +2,13 @@ <projects id="123" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="123456789"/> - <groups id="100" name="sonar-administrators" /> - <groups id="101" name="sonar-users" /> + <groups id="100" name="sonar-administrators"/> + <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]" /> + <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> <!-- on other resources --> <group_roles id="1" group_id="100" resource_id="1" role="admin"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_count_component_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_count_component_permissions.xml index aea672478c6..aea672478c6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_count_component_permissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_count_component_permissions.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_delete_group_permission-result.xml index d280edba4a5..e77f558dc36 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_delete_group_permission-result.xml @@ -6,6 +6,7 @@ <projects id="123" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_delete_group_permission.xml index aa0328516a4..9c3bcfce197 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_group_permission.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_delete_group_permission.xml @@ -7,6 +7,7 @@ <projects id="123" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_delete_user_permission-result.xml index d40ea59c0ba..8f079ec590c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_delete_user_permission-result.xml @@ -6,6 +6,7 @@ <projects id="123" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_delete_user_permission.xml index fd37d39cbab..fe3e01186db 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_delete_user_permission.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_delete_user_permission.xml @@ -7,6 +7,7 @@ <projects id="123" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_insert_anyone_group_permission-result.xml index 9b43d347c46..276e8d7da3f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_insert_anyone_group_permission-result.xml @@ -7,7 +7,8 @@ <projects id="123" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_insert_anyone_group_permission.xml index 8fb097772df..4552a5339ee 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_anyone_group_permission.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_insert_anyone_group_permission.xml @@ -6,7 +6,8 @@ <projects id="123" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_insert_group_permission-result.xml index aa0328516a4..9c3bcfce197 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_insert_group_permission-result.xml @@ -7,6 +7,7 @@ <projects id="123" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_insert_group_permission.xml index d280edba4a5..e77f558dc36 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_insert_group_permission.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_insert_group_permission.xml @@ -6,6 +6,7 @@ <projects id="123" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="123456789"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_remove_all_permissions-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_remove_all_permissions-result.xml index 38def462ed1..38def462ed1 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_remove_all_permissions-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_remove_all_permissions-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_remove_all_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_remove_all_permissions.xml index aea672478c6..aea672478c6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionFacadeTest/should_remove_all_permissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionFacadeTest/should_remove_all_permissions.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addGroupPermissionToTemplate-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addGroupPermissionToTemplate-result.xml index c80216743b1..c80216743b1 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addGroupPermissionToTemplate-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addGroupPermissionToTemplate-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addGroupPermissionToTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addGroupPermissionToTemplate.xml index 6645e851711..6645e851711 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addGroupPermissionToTemplate.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addGroupPermissionToTemplate.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate-result.xml index 7d42701d39f..7d42701d39f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate.xml index 6645e851711..6645e851711 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addUserPermissionToTemplate-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addUserPermissionToTemplate-result.xml index 40bf5d45d4e..40bf5d45d4e 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addUserPermissionToTemplate-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addUserPermissionToTemplate-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addUserPermissionToTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addUserPermissionToTemplate.xml index 6645e851711..6645e851711 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/addUserPermissionToTemplate.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/addUserPermissionToTemplate.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate-result.xml new file mode 100644 index 00000000000..8596137c817 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate-result.xml @@ -0,0 +1,4 @@ +<dataset> + <permission_templates id="1" name="Môü Gnô Gnèçà ß" kee="mou_gno_gneca_20130102_010405" description="my description" + key_pattern="[null]"/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate.xml index 5ed00ba028b..5ed00ba028b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createNonAsciiPermissionTemplate.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createPermissionTemplate-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createPermissionTemplate-result.xml new file mode 100644 index 00000000000..4f889d5ba48 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createPermissionTemplate-result.xml @@ -0,0 +1,4 @@ +<dataset> + <permission_templates id="1" name="my template" kee="my_template_20130102_010405" description="my description" + key_pattern="myregexp"/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createPermissionTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createPermissionTemplate.xml index 5ed00ba028b..5ed00ba028b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/createPermissionTemplate.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/createPermissionTemplate.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml new file mode 100644 index 00000000000..115b732cb64 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml @@ -0,0 +1,8 @@ +<dataset> + <permission_templates id="2" name="other template" kee="my_template_20130102_030405" description="other description" + created_at="[null]" updated_at="[null]"/> + + <perm_templates_users/> + + <perm_templates_groups/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/deletePermissionTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/deletePermissionTemplate.xml index b5a8064cd11..0520355af31 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/deletePermissionTemplate.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/deletePermissionTemplate.xml @@ -1,6 +1,8 @@ <dataset> - <permission_templates id="1" name="my template" kee="my_template_20130102_030405" description="my description" created_at="[null]" updated_at="[null]"/> - <permission_templates id="2" name="other template" kee="my_template_20130102_030405" description="other description" created_at="[null]" updated_at="[null]"/> + <permission_templates id="1" name="my template" kee="my_template_20130102_030405" description="my description" + created_at="[null]" updated_at="[null]"/> + <permission_templates id="2" name="other template" kee="my_template_20130102_030405" description="other description" + created_at="[null]" updated_at="[null]"/> <perm_templates_users id="1" template_id="1" user_id="1" permission_reference="user_permission1"/> <perm_templates_users id="2" template_id="1" user_id="2" permission_reference="user_permission1"/> @@ -9,4 +11,4 @@ <perm_templates_groups id="1" template_id="1" group_id="1" permission_reference="group_permission1"/> <perm_templates_groups id="2" template_id="1" group_id="2" permission_reference="group_permission1"/> <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="group_permission2"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeGroupPermissionFromTemplate-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeGroupPermissionFromTemplate-result.xml index 140738df7db..140738df7db 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeGroupPermissionFromTemplate-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeGroupPermissionFromTemplate-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeGroupPermissionFromTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeGroupPermissionFromTemplate.xml index 3258dcc22e5..3258dcc22e5 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeGroupPermissionFromTemplate.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeGroupPermissionFromTemplate.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeNullGroupPermissionFromTemplate-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeNullGroupPermissionFromTemplate-result.xml index cc62050281b..c37bf10135a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeNullGroupPermissionFromTemplate-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeNullGroupPermissionFromTemplate-result.xml @@ -2,5 +2,6 @@ <permission_templates id="1" name="my template" kee="my_template_20130102_030405" description="my description"/> <perm_templates_users/> <perm_templates_groups id="1" template_id="1" group_id="1" permission_reference="remaining_permission_other_group"/> - <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="remaining_permission_same_group"/> -</dataset>
\ No newline at end of file + <perm_templates_groups id="3" template_id="1" group_id="[null]" + permission_reference="remaining_permission_same_group"/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeNullGroupPermissionFromTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeNullGroupPermissionFromTemplate.xml index 3e3289534fe..9e28fa9e458 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeNullGroupPermissionFromTemplate.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeNullGroupPermissionFromTemplate.xml @@ -3,5 +3,6 @@ <perm_templates_users/> <perm_templates_groups id="1" template_id="1" group_id="1" permission_reference="remaining_permission_other_group"/> <perm_templates_groups id="2" template_id="1" group_id="[null]" permission_reference="permission_to_remove"/> - <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="remaining_permission_same_group"/> -</dataset>
\ No newline at end of file + <perm_templates_groups id="3" template_id="1" group_id="[null]" + permission_reference="remaining_permission_same_group"/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeUserPermissionFromTemplate-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeUserPermissionFromTemplate-result.xml index 89983781b67..89983781b67 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeUserPermissionFromTemplate-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeUserPermissionFromTemplate-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeUserPermissionFromTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeUserPermissionFromTemplate.xml index 779bd770de8..779bd770de8 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/removeUserPermissionFromTemplate.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/removeUserPermissionFromTemplate.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/remove_by_group-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/remove_by_group-result.xml index 94ab2fde7ed..94ab2fde7ed 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/remove_by_group-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/remove_by_group-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/remove_by_group.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/remove_by_group.xml index 2ff5815d855..2ff5815d855 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/remove_by_group.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/remove_by_group.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml new file mode 100644 index 00000000000..e2e93914e09 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml @@ -0,0 +1,8 @@ +<dataset> + <permission_templates id="1" name="template1" kee="template1_20130102_030405" description="description1" + created_at="[null]" updated_at="[null]"/> + <permission_templates id="2" name="template2" kee="template2_20130102_030405" description="description2" + created_at="[null]" updated_at="[null]"/> + <permission_templates id="3" name="template3" kee="template3_20130102_030405" description="description3" + created_at="[null]" updated_at="[null]"/> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml new file mode 100644 index 00000000000..ab25dd40192 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml @@ -0,0 +1,10 @@ +<dataset> + <permission_templates id="1" name="my template" kee="my_template_20130102_030405" description="my description" + created_at="[null]" updated_at="[null]"/> + + <users id="1" login="user1" name="user1"/> + <users id="2" login="user2" name="user2"/> + + <groups id="1" name="group1"/> + <groups id="2" name="group2"/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/selectPermissionTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/selectPermissionTemplate.xml index 8cfb9606511..2c82c31400e 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionTemplateDaoTest/selectPermissionTemplate.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/selectPermissionTemplate.xml @@ -1,12 +1,13 @@ <dataset> - <permission_templates id="1" name="my template" kee="my_template_20130102_030405" description="my description" created_at="[null]" updated_at="[null]"/> + <permission_templates id="1" name="my template" kee="my_template_20130102_030405" description="my description" + created_at="[null]" updated_at="[null]"/> <perm_templates_users id="1" template_id="1" user_id="1" permission_reference="user_permission1"/> <perm_templates_users id="2" template_id="1" user_id="2" permission_reference="user_permission1"/> <perm_templates_users id="3" template_id="1" user_id="2" permission_reference="user_permission2"/> - <users id="1" login="login1" name="user1" /> - <users id="2" login="login2" name="user2" /> + <users id="1" login="login1" name="user1"/> + <users id="2" login="login2" name="user2"/> <perm_templates_groups id="1" template_id="1" group_id="1" permission_reference="group_permission1"/> <perm_templates_groups id="2" template_id="1" group_id="2" permission_reference="group_permission1"/> @@ -17,4 +18,4 @@ <groups id="1" name="group1"/> <groups id="2" name="group2"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml new file mode 100644 index 00000000000..2449862a0a8 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml @@ -0,0 +1,6 @@ +<dataset> + <permission_templates id="1" name="new_name" kee="template1_20130102_030405" description="new_description" + key_pattern="new_regexp" created_at="[null]" updated_at="[null]"/> + <permission_templates id="2" name="template2" kee="template2_20130102_030405" description="description2" + key_pattern="barregexp" created_at="[null]" updated_at="[null]"/> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/updatePermissionTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/updatePermissionTemplate.xml new file mode 100644 index 00000000000..c14e8b61e8b --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionTemplateDaoTest/updatePermissionTemplate.xml @@ -0,0 +1,6 @@ +<dataset> + <permission_templates id="1" name="template1" kee="template1_20130102_030405" description="description1" + key_pattern="fooregexp" created_at="[null]" updated_at="[null]"/> + <permission_templates id="2" name="template2" kee="template2_20130102_030405" description="description2" + key_pattern="barregexp" created_at="[null]" updated_at="[null]"/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionDaoTest/select_only_enable_users.xml b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionDaoTest/select_only_enable_users.xml index 662af1a0a8c..662af1a0a8c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionDaoTest/select_only_enable_users.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionDaoTest/select_only_enable_users.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionDaoTest/users_with_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionDaoTest/users_with_permissions.xml index 6f40d31f21d..6f40d31f21d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionDaoTest/users_with_permissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionDaoTest/users_with_permissions.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml index 6b39124ce6c..6b39124ce6c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionTemplateDaoTest/select_only_enable_users.xml b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionTemplateDaoTest/select_only_enable_users.xml index 14833919475..14833919475 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionTemplateDaoTest/select_only_enable_users.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionTemplateDaoTest/select_only_enable_users.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionTemplateDaoTest/users_with_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionTemplateDaoTest/users_with_permissions.xml index e886636bd9b..e886636bd9b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionTemplateDaoTest/users_with_permissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionTemplateDaoTest/users_with_permissions.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionTemplateDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionTemplateDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml index fd8b981c203..fd8b981c203 100644 --- a/sonar-core/src/test/resources/org/sonar/core/permission/UserWithPermissionTemplateDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/UserWithPermissionTemplateDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteAllProperties-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteAllProperties-result.xml index ba4619fbedd..ba4619fbedd 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteAllProperties-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteAllProperties-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteAllProperties.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteAllProperties.xml index 0953b0ecd9f..0953b0ecd9f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteAllProperties.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteAllProperties.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteGlobalProperties-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteGlobalProperties-result.xml index a5cfed3378b..a5cfed3378b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteGlobalProperties-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteGlobalProperties-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteGlobalProperties.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteGlobalProperties.xml index 3e5eb87705c..3e5eb87705c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteGlobalProperties.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteGlobalProperties.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteGlobalProperty-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteGlobalProperty-result.xml index 0428139feb6..0428139feb6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteGlobalProperty-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteGlobalProperty-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteGlobalProperty.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteGlobalProperty.xml index aaf0fd642d3..aaf0fd642d3 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/deleteGlobalProperty.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/deleteGlobalProperty.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_properties-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/delete_project_properties-result.xml index 97b8b6f02b3..97b8b6f02b3 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_properties-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/delete_project_properties-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_properties.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/delete_project_properties.xml index 4e07f27e283..4e07f27e283 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_properties.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/delete_project_properties.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/delete_project_property-result.xml index 0b889b14bb3..0b889b14bb3 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/delete_project_property-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/delete_project_property.xml index 99bd75917c1..99bd75917c1 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/delete_project_property.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/findNotificationSubscribers.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/findNotificationSubscribers.xml new file mode 100644 index 00000000000..9bfd1dc3001 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/findNotificationSubscribers.xml @@ -0,0 +1,55 @@ +<dataset> + + <users + id="1" + login="eric" + /> + + <users + id="2" + login="simon" + /> + + <projects id="42" uuid="PROJECT_A" kee="org.apache:struts"/> + + <!-- global subscription --> + <properties + id="1" + prop_key="notification.DispatcherWithGlobalSubscribers.Email" + text_value="true" + resource_id="[null]" + user_id="2"/> + + <!-- project subscription --> + <properties + id="2" + prop_key="notification.DispatcherWithProjectSubscribers.Email" + text_value="true" + resource_id="42" + user_id="1"/> + + <!-- project subscription --> + <properties + id="3" + prop_key="notification.DispatcherWithGlobalAndProjectSubscribers.Email" + text_value="true" + resource_id="56" + user_id="1"/> + + <!-- project subscription --> + <properties + id="4" + prop_key="notification.DispatcherWithGlobalAndProjectSubscribers.Email" + text_value="true" + resource_id="42" + user_id="1"/> + + <!-- global subscription --> + <properties + id="5" + prop_key="notification.DispatcherWithGlobalAndProjectSubscribers.Email" + text_value="true" + resource_id="[null]" + user_id="2"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/insert-result.xml index 3e5eb87705c..3e5eb87705c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/insert-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insert.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/insert.xml index 5ed00ba028b..5ed00ba028b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insert.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/insert.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insertGlobalProperties-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/insertGlobalProperties-result.xml index 5594180c370..5594180c370 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insertGlobalProperties-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/insertGlobalProperties-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insertGlobalProperties.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/insertGlobalProperties.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insertGlobalProperties.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/insertGlobalProperties.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/renamePropertyKey-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/renamePropertyKey-result.xml index 0877b0035fe..0877b0035fe 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/renamePropertyKey-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/renamePropertyKey-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/renamePropertyKey.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/renamePropertyKey.xml index 6ab761e2c6f..6ab761e2c6f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/renamePropertyKey.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/renamePropertyKey.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/selectGlobalProperties.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/selectGlobalProperties.xml index e5aa737e9a0..e5aa737e9a0 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/selectGlobalProperties.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/selectGlobalProperties.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/selectProjectProperties.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/selectProjectProperties.xml index 99bd75917c1..99bd75917c1 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/selectProjectProperties.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/selectProjectProperties.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/selectProjectPropertiesByResourceId.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/selectProjectPropertiesByResourceId.xml index 52fec852a8d..52fec852a8d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/selectProjectPropertiesByResourceId.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/selectProjectPropertiesByResourceId.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/select_by_query.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/select_by_query.xml index 2873d69a5bc..2873d69a5bc 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/select_by_query.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/select_by_query.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/select_module_properties_tree.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/select_module_properties_tree.xml index 61333a6de4a..938910a0e01 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/select_module_properties_tree.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/select_module_properties_tree.xml @@ -23,33 +23,39 @@ <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." description="the description" long_name="Apache Struts" - enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" authorization_updated_at="[null]" /> + enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="[null]" + authorization_updated_at="[null]"/> <!-- module --> <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" uuid="EFGH" project_uuid="ABCD" module_uuid="[null]" module_uuid_path=".ABCD." scope="PRJ" qualifier="BRC" long_name="Struts Core" - description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]" /> + description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> <!-- sub module --> <projects id="3" root_id="1" kee="org.struts:struts-data" name="Struts Data" uuid="FGHI" project_uuid="ABCD" module_uuid="EFGH" module_uuid_path=".ABCD.EFGH." scope="PRJ" qualifier="BRC" long_name="Struts Data" - description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]" /> + description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> <!-- directory --> <projects long_name="org.struts" id="4" scope="DIR" qualifier="DIR" kee="org.struts:struts-core:src/org/struts" uuid="GHIJ" project_uuid="ABCD" module_uuid="FGHI" module_uuid_path=".ABCD.EFGH.FGHI." name="src/org/struts" root_id="3" description="[null]" - enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="src/org/struts" authorization_updated_at="[null]" /> + enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]" path="src/org/struts" + authorization_updated_at="[null]"/> <!-- file --> - <projects long_name="org.struts.RequestContext" id="5" scope="FIL" qualifier="FIL" kee="org.struts:struts-core:src/org/struts/RequestContext.java" + <projects long_name="org.struts.RequestContext" id="5" scope="FIL" qualifier="FIL" + kee="org.struts:struts-core:src/org/struts/RequestContext.java" uuid="HIJK" project_uuid="ABCD" module_uuid="GHIJ" module_uuid_path=".ABCD.EFGH.FGHI." name="RequestContext.java" root_id="3" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="src/org/struts/RequestContext.java" authorization_updated_at="[null]" /> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" + path="src/org/struts/RequestContext.java" authorization_updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/shouldFindUsersForNotification.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/shouldFindUsersForNotification.xml index 18c4d691284..891d895d7f2 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/shouldFindUsersForNotification.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/shouldFindUsersForNotification.xml @@ -30,15 +30,15 @@ text_value="true" resource_id="56" user_id="3"/> - + <users id="1" login="user1"/> - + <users id="2" login="user2"/> - + <users id="3" login="user3"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/should_not_rename_if_same_key-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/should_not_rename_if_same_key-result.xml index b4fc11a8cdb..b4fc11a8cdb 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/should_not_rename_if_same_key-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/should_not_rename_if_same_key-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/should_not_rename_if_same_key.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/should_not_rename_if_same_key.xml index b4fc11a8cdb..b4fc11a8cdb 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/should_not_rename_if_same_key.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/should_not_rename_if_same_key.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/update-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/update-result.xml index c3268596de3..c3268596de3 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/update-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/update-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/update.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/update.xml index 5229a2b791a..5229a2b791a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/update.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/update.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/updateGlobalProperties-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/updateGlobalProperties-result.xml index 12033fdc629..12033fdc629 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/updateGlobalProperties-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/updateGlobalProperties-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/updateGlobalProperties.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/updateGlobalProperties.xml index 4616072f3d9..4616072f3d9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/updateGlobalProperties.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/updateGlobalProperties.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/updatePropertiesFromKeyAndValueToNewValue-result.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/updatePropertiesFromKeyAndValueToNewValue-result.xml index 194761a6b2d..194761a6b2d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/updatePropertiesFromKeyAndValueToNewValue-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/updatePropertiesFromKeyAndValueToNewValue-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/updatePropertiesFromKeyAndValueToNewValue.xml b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/updatePropertiesFromKeyAndValueToNewValue.xml index 5567744e146..5567744e146 100644 --- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/updatePropertiesFromKeyAndValueToNewValue.xml +++ b/sonar-db/src/test/resources/org/sonar/db/property/PropertiesDaoTest/updatePropertiesFromKeyAndValueToNewValue.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteResource.xml index 00363eb0100..02a88004d9b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteResource.xml @@ -28,7 +28,7 @@ issue_close_date="1366063200000" created_at="[null]" updated_at="[null]" - /> + /> <issue_changes id="1" kee="ABDA" issue_key="ABCDE" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="this is a comment"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml index f17226a159a..f17226a159a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml index 3f756fc37d3..3f756fc37d3 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml index c59e34d5c8b..c59e34d5c8b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml index d4931b9a343..d4931b9a343 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml index 370f4d3ab34..370f4d3ab34 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml index 53144869569..53144869569 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources-result.xml index 6d5aea37b00..2cb6b58826f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources-result.xml @@ -1,7 +1,9 @@ <dataset> - <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" data_hash="321654988" - created_at="123456789" updated_at="123456789" src_hash="123456" data_type="SOURCE" /> - <file_sources id="4" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" data_hash="321654988" - created_at="123456789" updated_at="123456789" src_hash="123456" data_type="TEST" /> + <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" + data_hash="321654988" + created_at="123456789" updated_at="123456789" src_hash="123456" data_type="SOURCE"/> + <file_sources id="4" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" + data_hash="321654988" + created_at="123456789" updated_at="123456789" src_hash="123456" data_type="TEST"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources.xml index 927b57d41c3..5307fc8219a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources.xml @@ -72,12 +72,16 @@ depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> - <file_sources id="1" project_uuid="ABCD" file_uuid="GHIJ" binary_data="[null]" line_hashes="[null]" data_hash="321654987" - created_at="123456789" updated_at="123456789" src_hash="12345" data_type="SOURCE" /> - <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" data_hash="321654988" - created_at="123456789" updated_at="123456789" src_hash="123456" data_type="SOURCE" /> - <file_sources id="3" project_uuid="ABCD" file_uuid="GHIJ" binary_data="[null]" line_hashes="[null]" data_hash="321654987" - created_at="123456789" updated_at="123456789" src_hash="12345" data_type="TEST" /> - <file_sources id="4" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" data_hash="321654988" - created_at="123456789" updated_at="123456789" src_hash="123456" data_type="TEST" /> + <file_sources id="1" project_uuid="ABCD" file_uuid="GHIJ" binary_data="[null]" line_hashes="[null]" + data_hash="321654987" + created_at="123456789" updated_at="123456789" src_hash="12345" data_type="SOURCE"/> + <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" + data_hash="321654988" + created_at="123456789" updated_at="123456789" src_hash="123456" data_type="SOURCE"/> + <file_sources id="3" project_uuid="ABCD" file_uuid="GHIJ" binary_data="[null]" line_hashes="[null]" + data_hash="321654987" + created_at="123456789" updated_at="123456789" src_hash="12345" data_type="TEST"/> + <file_sources id="4" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" + data_hash="321654988" + created_at="123456789" updated_at="123456789" src_hash="123456" data_type="TEST"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml index 530dafeedaa..530dafeedaa 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml index 46f8dbc543c..0cfef24e585 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/disable_resources_without_last_snapshot.xml @@ -1,19 +1,25 @@ <dataset> <!-- the project --> - <projects id="1" enabled="[true]" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." created_at="[null]" + <projects id="1" enabled="[true]" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" + module_uuid_path="." created_at="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + deprecated_kee="[null]" authorization_updated_at="[null]"/> <!-- the directory --> - <projects id="2" enabled="[true]" root_id="1" uuid="EFGH" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="." created_at="[null]" + <projects id="2" enabled="[true]" root_id="1" uuid="EFGH" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="." + created_at="[null]" long_name="[null]" scope="DIR" qualifier="DIR" kee="project:my/dir" name="my/dir" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + deprecated_kee="[null]" authorization_updated_at="[null]"/> <!-- the file --> - <projects id="3" enabled="[true]" root_id="1" uuid="GHIJ" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path=".ABCD." created_at="[null]" + <projects id="3" enabled="[true]" root_id="1" uuid="GHIJ" project_uuid="ABCD" module_uuid="ABCD" + module_uuid_path=".ABCD." created_at="[null]" long_name="[null]" scope="FIL" qualifier="FIL" kee="project:my/dir/File.java" name="my/dir/File.java" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + deprecated_kee="[null]" authorization_updated_at="[null]"/> <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" @@ -23,7 +29,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" @@ -33,7 +40,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <snapshots id="3" @@ -44,7 +52,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- Open issue on file --> <issues id="1" kee="ISSUE-1" @@ -52,9 +61,12 @@ project_uuid="ABCD" status="OPEN" issue_close_date="[null]" - resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]" - message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]" - updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" created_at="1450000000000"/> + resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" + manual_severity="[false]" + message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" + issue_attributes="[null]" checksum="[null]" author_login="[null]" + updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" + created_at="1450000000000"/> <!-- Open issue on directory --> <issues id="2" kee="ISSUE-2" @@ -62,9 +74,12 @@ project_uuid="ABCD" status="OPEN" issue_close_date="[null]" - resolution="[null]" line="[null]" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]" - message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]" - updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" created_at="1450000000000"/> + resolution="[null]" line="[null]" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" + manual_severity="[false]" + message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" + issue_attributes="[null]" checksum="[null]" author_login="[null]" + updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" + created_at="1450000000000"/> <!-- Open issue on project --> <issues id="3" kee="ISSUE-3" @@ -72,9 +87,12 @@ project_uuid="ABCD" status="CONFIRM" issue_close_date="[null]" - resolution="[null]" line="[null]" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]" - message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]" - updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" created_at="1450000000000"/> + resolution="[null]" line="[null]" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" + manual_severity="[false]" + message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" + issue_attributes="[null]" checksum="[null]" author_login="[null]" + updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" + created_at="1450000000000"/> <!-- Resolved issue on file -> not to be updated --> <issues id="4" kee="ISSUE-4" @@ -82,8 +100,11 @@ project_uuid="ABCD" status="CLOSED" issue_close_date="1449529200000" - resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]" - message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]" - updated_at="1450000000000" issue_creation_date="1366063200000" issue_update_date="1396908000000" created_at="1450000000000"/> + resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" + manual_severity="[false]" + message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" + issue_attributes="[null]" checksum="[null]" author_login="[null]" + updated_at="1450000000000" issue_creation_date="1366063200000" issue_update_date="1396908000000" + created_at="1450000000000"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/select_purgeable_file_uuids.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/select_purgeable_file_uuids.xml index f6573e509dd..b3bca4514fb 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/select_purgeable_file_uuids.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/select_purgeable_file_uuids.xml @@ -79,8 +79,10 @@ depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> - <file_sources id="1" project_uuid="ABCD" file_uuid="GHIJ" binary_data="[null]" line_hashes="[null]" data_hash="321654987" - created_at="123456789" updated_at="123456789" data_type="SOURCE" /> - <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" data_hash="321654988" - created_at="123456789" updated_at="123456789" data_type="SOURCE" /> + <file_sources id="1" project_uuid="ABCD" file_uuid="GHIJ" binary_data="[null]" line_hashes="[null]" + data_hash="321654987" + created_at="123456789" updated_at="123456789" data_type="SOURCE"/> + <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" + data_hash="321654988" + created_at="123456789" updated_at="123456789" data_type="SOURCE"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml index 346e3d61b94..041565fc171 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml @@ -8,7 +8,8 @@ Snapshot 2 has been deleted <!-- the project --> <projects id="1" enabled="[true]" root_id="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> <!-- past snapshot with status "processed" and already purged --> <snapshots id="1" @@ -19,18 +20,19 @@ Snapshot 2 has been deleted period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- snapshot with status "unprocessed" -> to be deleted --> <!--<snapshots id="2"--> - <!--project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]"--> - <!--status="U" islast="[false]" purge_status="0"--> - <!--period1_mode="[null]" period1_param="[null]" period1_date="[null]"--> - <!--period2_mode="[null]" period2_param="[null]" period2_date="[null]"--> - <!--period3_mode="[null]" period3_param="[null]" period3_date="[null]"--> - <!--period4_mode="[null]" period4_param="[null]" period4_date="[null]"--> - <!--period5_mode="[null]" period5_param="[null]" period5_date="[null]"--> - <!--depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/>--> + <!--project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]"--> + <!--status="U" islast="[false]" purge_status="0"--> + <!--period1_mode="[null]" period1_param="[null]" period1_date="[null]"--> + <!--period2_mode="[null]" period2_param="[null]" period2_date="[null]"--> + <!--period3_mode="[null]" period3_param="[null]" period3_date="[null]"--> + <!--period4_mode="[null]" period4_param="[null]" period4_date="[null]"--> + <!--period5_mode="[null]" period5_param="[null]" period5_date="[null]"--> + <!--depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/>--> <!-- snapshot with status "processed" and flagged as "last" -> do not purge and do not delete --> <snapshots id="3" @@ -41,6 +43,7 @@ Snapshot 2 has been deleted period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml index ef09ea6795d..0c821011796 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds.xml @@ -3,7 +3,8 @@ <!-- the project --> <projects id="1" enabled="[true]" root_id="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> <!-- past snapshot with status "processed" and already purged --> <snapshots id="1" @@ -14,7 +15,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- snapshot with status "unprocessed" -> to be deleted --> <snapshots id="2" @@ -25,7 +27,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- snapshot with status "processed" and flagged as "last" -> do not purge and do not delete --> <snapshots id="3" @@ -36,6 +39,7 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml index 3ae58b4fe94..a43778f76a0 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml @@ -7,19 +7,25 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6 <dataset> <!-- the project --> - <projects id="1" enabled="[true]" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." created_at="[null]" + <projects id="1" enabled="[true]" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" + module_uuid_path="." created_at="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + deprecated_kee="[null]" authorization_updated_at="[null]"/> <!-- the directory --> - <projects id="2" enabled="[true]" root_id="1" uuid="EFGH" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="." created_at="[null]" + <projects id="2" enabled="[true]" root_id="1" uuid="EFGH" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="." + created_at="[null]" long_name="[null]" scope="DIR" qualifier="DIR" kee="project:my/dir" name="my/dir" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + deprecated_kee="[null]" authorization_updated_at="[null]"/> <!-- the file --> - <projects id="3" enabled="[true]" root_id="1" uuid="GHIJ" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path=".ABCD." created_at="[null]" + <projects id="3" enabled="[true]" root_id="1" uuid="GHIJ" project_uuid="ABCD" module_uuid="ABCD" + module_uuid_path=".ABCD." created_at="[null]" long_name="[null]" scope="FIL" qualifier="FIL" kee="project:my/dir/File.java" name="my/dir/File.java" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + deprecated_kee="[null]" authorization_updated_at="[null]"/> <!-- do not purge last snapshots --> <snapshots id="1" @@ -30,7 +36,8 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6 period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" @@ -40,7 +47,8 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6 period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="DIR" qualifier="DIR" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="DIR" qualifier="DIR" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <snapshots id="3" @@ -51,7 +59,8 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6 period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="FIL" qualifier="FIL" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="FIL" qualifier="FIL" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- snapshots to be purged --> <snapshots id="4" @@ -62,27 +71,28 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6 period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!--<snapshots id="5"--> - <!--project_id="2" parent_snapshot_id="4" root_project_id="1" root_snapshot_id="4"--> - <!--status="P" islast="[false]" purge_status="1"--> - <!--period1_mode="[null]" period1_param="[null]" period1_date="[null]"--> - <!--period2_mode="[null]" period2_param="[null]" period2_date="[null]"--> - <!--period3_mode="[null]" period3_param="[null]" period3_date="[null]"--> - <!--period4_mode="[null]" period4_param="[null]" period4_date="[null]"--> - <!--period5_mode="[null]" period5_param="[null]" period5_date="[null]"--> - <!--depth="[null]" scope="DIR" qualifier="DIR" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/>--> + <!--project_id="2" parent_snapshot_id="4" root_project_id="1" root_snapshot_id="4"--> + <!--status="P" islast="[false]" purge_status="1"--> + <!--period1_mode="[null]" period1_param="[null]" period1_date="[null]"--> + <!--period2_mode="[null]" period2_param="[null]" period2_date="[null]"--> + <!--period3_mode="[null]" period3_param="[null]" period3_date="[null]"--> + <!--period4_mode="[null]" period4_param="[null]" period4_date="[null]"--> + <!--period5_mode="[null]" period5_param="[null]" period5_date="[null]"--> + <!--depth="[null]" scope="DIR" qualifier="DIR" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/>--> <!--<snapshots id="6"--> - <!--project_id="3" parent_snapshot_id="5" root_project_id="1" root_snapshot_id="4"--> - <!--status="P" islast="[false]" purge_status="1"--> - <!--period1_mode="[null]" period1_param="[null]" period1_date="[null]"--> - <!--period2_mode="[null]" period2_param="[null]" period2_date="[null]"--> - <!--period3_mode="[null]" period3_param="[null]" period3_date="[null]"--> - <!--period4_mode="[null]" period4_param="[null]" period4_date="[null]"--> - <!--period5_mode="[null]" period5_param="[null]" period5_date="[null]"--> - <!--depth="[null]" scope="FIL" qualifier="FIL" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/>--> + <!--project_id="3" parent_snapshot_id="5" root_project_id="1" root_snapshot_id="4"--> + <!--status="P" islast="[false]" purge_status="1"--> + <!--period1_mode="[null]" period1_param="[null]" period1_date="[null]"--> + <!--period2_mode="[null]" period2_param="[null]" period2_date="[null]"--> + <!--period3_mode="[null]" period3_param="[null]" period3_date="[null]"--> + <!--period4_mode="[null]" period4_param="[null]" period4_date="[null]"--> + <!--period5_mode="[null]" period5_param="[null]" period5_date="[null]"--> + <!--depth="[null]" scope="FIL" qualifier="FIL" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/>--> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml index b3449c545fe..b7089187ced 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml @@ -1,19 +1,25 @@ <dataset> <!-- the project --> - <projects id="1" enabled="[true]" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." created_at="[null]" + <projects id="1" enabled="[true]" root_id="[null]" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" + module_uuid_path="." created_at="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + deprecated_kee="[null]" authorization_updated_at="[null]"/> <!-- the directory --> - <projects id="2" enabled="[true]" root_id="1" uuid="EFGH" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="." created_at="[null]" + <projects id="2" enabled="[true]" root_id="1" uuid="EFGH" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="." + created_at="[null]" long_name="[null]" scope="DIR" qualifier="DIR" kee="project:my/dir" name="my/dir" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + deprecated_kee="[null]" authorization_updated_at="[null]"/> <!-- the file --> - <projects id="3" enabled="[true]" root_id="1" uuid="GHIJ" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path=".ABCD." created_at="[null]" + <projects id="3" enabled="[true]" root_id="1" uuid="GHIJ" project_uuid="ABCD" module_uuid="ABCD" + module_uuid_path=".ABCD." created_at="[null]" long_name="[null]" scope="FIL" qualifier="FIL" kee="project:my/dir/File.java" name="my/dir/File.java" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" + deprecated_kee="[null]" authorization_updated_at="[null]"/> <!-- do not purge last snapshots --> <snapshots id="1" @@ -24,7 +30,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" @@ -34,7 +41,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="DIR" qualifier="DIR" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="DIR" qualifier="DIR" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <snapshots id="3" @@ -45,7 +53,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="FIL" qualifier="FIL" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="FIL" qualifier="FIL" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- snapshots to be purged --> <snapshots id="4" @@ -56,7 +65,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <snapshots id="5" project_id="2" parent_snapshot_id="4" root_project_id="1" root_snapshot_id="4" @@ -66,7 +76,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="DIR" qualifier="DIR" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="DIR" qualifier="DIR" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <snapshots id="6" @@ -77,6 +88,7 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="FIL" qualifier="FIL" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="FIL" qualifier="FIL" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteProject.xml index 26abe5662f0..1f554aded5d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteProject.xml @@ -32,7 +32,7 @@ issue_creation_date="1366063200000" issue_update_date="1366063200000" issue_close_date="1366063200000" - /> + /> <issues id="2" kee="ABCDF" component_uuid="A" project_uuid="A" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER" @@ -45,7 +45,7 @@ issue_creation_date="1366063200000" issue_update_date="1366063200000" issue_close_date="1366063200000" - /> + /> <issue_changes id="1" kee="[null]" issue_key="ABCDF" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc"/> @@ -104,5 +104,5 @@ build_date="1228222680000" version="[null]" path="[null]"/> <file_sources id="1" project_uuid="A" file_uuid="D" binary_data="[null]" line_hashes="[null]" data_hash="321654987" - created_at="123456789" updated_at="123456789" data_type="SOURCE" /> + created_at="123456789" updated_at="123456789" data_type="SOURCE"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteSnapshots-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteSnapshots-result.xml index 50d28695d3f..18f56865b25 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteSnapshots-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteSnapshots-result.xml @@ -9,7 +9,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- delete only resource 1 --> <snapshots id="2" @@ -20,7 +21,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- to be deleted --> <!--<snapshots id="3" @@ -32,4 +34,4 @@ period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/>--> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteSnapshots.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteSnapshots.xml index d5ff7433484..b22f1e45c20 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteSnapshots.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteSnapshots.xml @@ -9,7 +9,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- delete only resource 1 --> <snapshots id="2" @@ -20,7 +21,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- to be deleted --> <snapshots id="3" @@ -31,5 +33,6 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml index aca3885c1db..1072cf24714 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml @@ -1,9 +1,11 @@ <dataset> <!-- the project --> - <projects id="1" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." enabled="[true]" created_at="[null]" + <projects id="1" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." enabled="[true]" + created_at="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" + root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" + path="[null]" deprecated_kee="[null]" authorization_updated_at="[null]"/> @@ -16,7 +18,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- do not purge snapshot with islast=true--> @@ -28,7 +31,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- snapshot to be purged --> <snapshots id="3" @@ -39,6 +43,7 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject.xml index bbc7fb8b041..034d3856aaf 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject.xml @@ -1,10 +1,12 @@ <dataset> <!-- the project --> - <projects id="1" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." enabled="[true]" created_at="[null]" + <projects id="1" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="." enabled="[true]" + created_at="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]" - authorization_updated_at="[null]" /> + root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" + path="[null]" deprecated_kee="[null]" + authorization_updated_at="[null]"/> <!-- snapshot already purged --> @@ -16,7 +18,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- do not purge snapshot with islast=true--> @@ -28,7 +31,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- snapshot to be purged --> <snapshots id="3" @@ -39,6 +43,7 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldSelectPurgeableSnapshots.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldSelectPurgeableSnapshots.xml index 6a924f7f98a..d523d563dc7 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldSelectPurgeableSnapshots.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldSelectPurgeableSnapshots.xml @@ -9,7 +9,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- not processed -> exclude --> <snapshots id="2" @@ -20,7 +21,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- on other resource -> exclude --> <snapshots id="3" @@ -31,7 +33,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- without event -> select --> <snapshots id="4" @@ -42,7 +45,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- with event -> select --> <snapshots id="5" @@ -53,10 +57,12 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <events id="2" component_uuid="1" snapshot_id="5" - category="Version" description="[null]" name="Version 1.0" event_date="1228222680000" created_at="1228222680000" + category="Version" description="[null]" name="Version 1.0" event_date="1228222680000" + created_at="1228222680000" event_data="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml index 142d23dcfe0..142d23dcfe0 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues.xml index 9fe05024ebd..9fe05024ebd 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_all_closed_issues.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_all_closed_issues.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml index 1b0bcc3857b..7b79eaacc03 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues-result.xml @@ -2,7 +2,8 @@ <projects id="1" uuid="1" enabled="[true]" root_id="[null]" created_at="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" + authorization_updated_at="[null]"/> <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" @@ -12,7 +13,8 @@ period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" - depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" version="[null]" path="[null]"/> + depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000" build_date="1228222680000" + version="[null]" path="[null]"/> <!-- old closed issues on file and project -> to be purged --> <!-- @@ -43,10 +45,14 @@ project_uuid="1" status="OPEN" issue_close_date="[null]" - resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]" tags="[null]" - message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]" - updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" created_at="1400000000000"/> - <issue_changes id="3" kee="[null]" issue_key="ISSUE-3" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/> + resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" + manual_severity="[false]" tags="[null]" + message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" + issue_attributes="[null]" checksum="[null]" author_login="[null]" + updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" + created_at="1400000000000"/> + <issue_changes id="3" kee="[null]" issue_key="ISSUE-3" created_at="[null]" updated_at="[null]" user_login="admin" + change_type="comment" change_data="abc" issue_change_creation_date="[null]"/> <!-- recent open and closed issues -> do not purge --> <issues id="4" kee="ISSUE-4" @@ -54,19 +60,27 @@ project_uuid="1" status="OPEN" issue_close_date="[null]" - resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]" tags="[null]" - message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]" - updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" created_at="1400000000000"/> - <issue_changes id="4" kee="[null]" issue_key="ISSUE-4" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/> + resolution="[null]" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" + manual_severity="[false]" tags="[null]" + message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" + issue_attributes="[null]" checksum="[null]" author_login="[null]" + updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" + created_at="1400000000000"/> + <issue_changes id="4" kee="[null]" issue_key="ISSUE-4" created_at="[null]" updated_at="[null]" user_login="admin" + change_type="comment" change_data="abc" issue_change_creation_date="[null]"/> <issues id="5" kee="ISSUE-5" component_uuid="100" project_uuid="1" status="CLOSED" issue_close_date="1735686000000" - resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" manual_severity="[false]" tags="[null]" - message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" issue_attributes="[null]" checksum="[null]" author_login="[null]" - updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" created_at="1400000000000"/> - <issue_changes id="5" kee="[null]" issue_key="ISSUE-5" created_at="[null]" updated_at="[null]" user_login="admin" change_type="comment" change_data="abc" issue_change_creation_date="[null]"/> + resolution="FIXED" line="200" severity="BLOCKER" reporter="perceval" assignee="arthur" rule_id="500" + manual_severity="[false]" tags="[null]" + message="[null]" action_plan_key="[null]" effort_to_fix="[null]" technical_debt="[null]" + issue_attributes="[null]" checksum="[null]" author_login="[null]" + updated_at="[null]" issue_creation_date="1366063200000" issue_update_date="1366063200000" + created_at="1400000000000"/> + <issue_changes id="5" kee="[null]" issue_key="ISSUE-5" created_at="[null]" updated_at="[null]" user_login="admin" + change_type="comment" change_data="abc" issue_change_creation_date="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues.xml index 95d56051843..95d56051843 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/should_delete_old_closed_issues.xml +++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/should_delete_old_closed_issues.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/ProjectQgateAssociationDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest/shared.xml index 811480c23cc..9fb6b533775 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/ProjectQgateAssociationDaoTest/shared.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/ProjectQgateAssociationDaoTest/shared.xml @@ -11,20 +11,29 @@ <projects id="6" uuid="F" name="View Six" qualifier="VW" scope="PRJ"/> <projects id="7" uuid="G" name="Project One" qualifier="TRK" scope="FIL"/> - <resource_index id="1" kee="project one" resource_id="1" root_project_id="1" position="0" name_size="11" qualifier="TRK"/> - <resource_index id="2" kee="roject one" resource_id="1" root_project_id="1" position="1" name_size="11" qualifier="TRK"/> - <resource_index id="3" kee="oject one" resource_id="1" root_project_id="1" position="2" name_size="11" qualifier="TRK"/> - <resource_index id="4" kee="ject one" resource_id="1" root_project_id="1" position="3" name_size="11" qualifier="TRK"/> + <resource_index id="1" kee="project one" resource_id="1" root_project_id="1" position="0" name_size="11" + qualifier="TRK"/> + <resource_index id="2" kee="roject one" resource_id="1" root_project_id="1" position="1" name_size="11" + qualifier="TRK"/> + <resource_index id="3" kee="oject one" resource_id="1" root_project_id="1" position="2" name_size="11" + qualifier="TRK"/> + <resource_index id="4" kee="ject one" resource_id="1" root_project_id="1" position="3" name_size="11" + qualifier="TRK"/> <resource_index id="5" kee="ect one" resource_id="1" root_project_id="1" position="4" name_size="11" qualifier="TRK"/> <resource_index id="6" kee="ct one" resource_id="1" root_project_id="1" position="5" name_size="11" qualifier="TRK"/> <resource_index id="7" kee="t one" resource_id="1" root_project_id="1" position="6" name_size="11" qualifier="TRK"/> <resource_index id="8" kee=" one" resource_id="1" root_project_id="1" position="7" name_size="11" qualifier="TRK"/> <resource_index id="9" kee="one" resource_id="1" root_project_id="1" position="8" name_size="11" qualifier="TRK"/> - <resource_index id="10" kee="project two" resource_id="2" root_project_id="2" position="0" name_size="11" qualifier="TRK"/> - <resource_index id="11" kee="roject two" resource_id="2" root_project_id="2" position="1" name_size="11" qualifier="TRK"/> - <resource_index id="12" kee="oject two" resource_id="2" root_project_id="2" position="2" name_size="11" qualifier="TRK"/> - <resource_index id="13" kee="ject two" resource_id="2" root_project_id="2" position="3" name_size="11" qualifier="TRK"/> - <resource_index id="14" kee="ect two" resource_id="2" root_project_id="2" position="4" name_size="11" qualifier="TRK"/> + <resource_index id="10" kee="project two" resource_id="2" root_project_id="2" position="0" name_size="11" + qualifier="TRK"/> + <resource_index id="11" kee="roject two" resource_id="2" root_project_id="2" position="1" name_size="11" + qualifier="TRK"/> + <resource_index id="12" kee="oject two" resource_id="2" root_project_id="2" position="2" name_size="11" + qualifier="TRK"/> + <resource_index id="13" kee="ject two" resource_id="2" root_project_id="2" position="3" name_size="11" + qualifier="TRK"/> + <resource_index id="14" kee="ect two" resource_id="2" root_project_id="2" position="4" name_size="11" + qualifier="TRK"/> <resource_index id="15" kee="ct two" resource_id="2" root_project_id="2" position="5" name_size="11" qualifier="TRK"/> <resource_index id="16" kee="t two" resource_id="2" root_project_id="2" position="6" name_size="11" qualifier="TRK"/> <resource_index id="17" kee=" two" resource_id="2" root_project_id="2" position="7" name_size="11" qualifier="TRK"/> diff --git a/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/delete-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/delete-result.xml new file mode 100644 index 00000000000..62f82411cd7 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/delete-result.xml @@ -0,0 +1,12 @@ +<dataset> + + <quality_gate_conditions id="2" qgate_id="1" metric_id="3" operator="<" value_warning="10" value_error="20" + period="[null]"/> + <quality_gate_conditions id="3" qgate_id="1" metric_id="4" operator="<" value_warning="10" value_error="[null]" + period="1"/> + <quality_gate_conditions id="4" qgate_id="2" metric_id="5" operator="<" value_warning="[null]" value_error="20" + period="3"/> + <quality_gate_conditions id="5" qgate_id="2" metric_id="6" operator="<" value_warning="[null]" value_error="20" + period="[null]"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/insert-result.xml index b6c99280a4e..20aa1a86ee7 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/insert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/insert-result.xml @@ -1,5 +1,6 @@ <dataset> - <quality_gate_conditions id="1" qgate_id="1" metric_id="2" operator="GT" value_warning="10" value_error="20" period="3" /> + <quality_gate_conditions id="1" qgate_id="1" metric_id="2" operator="GT" value_warning="10" value_error="20" + period="3"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/insert.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/insert.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateDaoTest/insert.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/insert.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/selectForQualityGate.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/selectForQualityGate.xml new file mode 100644 index 00000000000..82faf6d5f15 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/selectForQualityGate.xml @@ -0,0 +1,14 @@ +<dataset> + + <quality_gate_conditions id="1" qgate_id="1" metric_id="2" operator="<" value_warning="10" value_error="20" + period="3"/> + <quality_gate_conditions id="2" qgate_id="1" metric_id="3" operator="<" value_warning="10" value_error="20" + period="[null]"/> + <quality_gate_conditions id="3" qgate_id="1" metric_id="4" operator="<" value_warning="10" value_error="[null]" + period="1"/> + <quality_gate_conditions id="4" qgate_id="2" metric_id="5" operator="<" value_warning="[null]" value_error="20" + period="3"/> + <quality_gate_conditions id="5" qgate_id="2" metric_id="6" operator="<" value_warning="[null]" value_error="20" + period="[null]"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/shouldCleanConditions-result.xml index dec565c9b87..7179362495c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/shouldCleanConditions-result.xml @@ -1,14 +1,19 @@ <dataset> - <metrics delete_historical_data="false" id="1" name="key1" val_type="INT" description="description" domain="domain" - short_name="name1" qualitative="false" user_managed="false" enabled="true" worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false" /> + <metrics delete_historical_data="false" id="1" name="key1" val_type="INT" description="description" domain="domain" + short_name="name1" qualitative="false" user_managed="false" enabled="true" worst_value="[null]" + optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/> - <metrics delete_historical_data="false" id="2" name="disabledkey2" val_type="INT" description="description" domain="domain" - short_name="name2" qualitative="false" user_managed="false" enabled="false" worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/> + <metrics delete_historical_data="false" id="2" name="disabledkey2" val_type="INT" description="description" + domain="domain" + short_name="name2" qualitative="false" user_managed="false" enabled="false" worst_value="[null]" + optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/> <!-- ok --> - <quality_gate_conditions id="1" qgate_id="1" metric_id="1" operator="GT" value_error="30" value_warning="[null]" period="[null]"/> - <quality_gate_conditions id="2" qgate_id="2" metric_id="1" operator="GT" value_error="[null]" value_warning="150" period="[null]"/> + <quality_gate_conditions id="1" qgate_id="1" metric_id="1" operator="GT" value_error="30" value_warning="[null]" + period="[null]"/> + <quality_gate_conditions id="2" qgate_id="2" metric_id="1" operator="GT" value_error="[null]" value_warning="150" + period="[null]"/> <!-- disabled metric --> <!--<quality_gate_conditions id="3" qgate_id="1" metric_id="2" operator="GT" value_error="30" value_warning="[null]" period="[null]"/>--> diff --git a/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/shouldCleanConditions.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/shouldCleanConditions.xml new file mode 100644 index 00000000000..402d75a704c --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/shouldCleanConditions.xml @@ -0,0 +1,26 @@ +<dataset> + + <metrics delete_historical_data="false" id="1" name="key1" val_type="INT" description="description" domain="domain" + short_name="name1" qualitative="false" user_managed="false" enabled="true" worst_value="[null]" + optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/> + + <metrics delete_historical_data="false" id="2" name="disabledkey2" val_type="INT" description="description" + domain="domain" + short_name="name2" qualitative="false" user_managed="false" enabled="false" worst_value="[null]" + optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/> + + <!-- ok --> + <quality_gate_conditions id="1" qgate_id="1" metric_id="1" operator="GT" value_error="30" value_warning="[null]" + period="[null]"/> + <quality_gate_conditions id="2" qgate_id="2" metric_id="1" operator="GT" value_error="[null]" value_warning="150" + period="[null]"/> + + <!-- disabled metric --> + <quality_gate_conditions id="3" qgate_id="1" metric_id="2" operator="GT" value_error="30" value_warning="[null]" + period="[null]"/> + + <!-- unknown metric --> + <quality_gate_conditions id="4" qgate_id="1" metric_id="999" operator="GT" value_error="30" value_warning="[null]" + period="[null]"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/update-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/update-result.xml new file mode 100644 index 00000000000..1364e7c51e9 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateConditionDaoTest/update-result.xml @@ -0,0 +1,14 @@ +<dataset> + + <quality_gate_conditions id="1" qgate_id="1" metric_id="7" operator=">" value_warning="50" value_error="80" + period="1"/> + <quality_gate_conditions id="2" qgate_id="1" metric_id="3" operator="<" value_warning="10" value_error="20" + period="[null]"/> + <quality_gate_conditions id="3" qgate_id="1" metric_id="4" operator="<" value_warning="10" value_error="[null]" + period="1"/> + <quality_gate_conditions id="4" qgate_id="2" metric_id="5" operator="<" value_warning="[null]" value_error="20" + period="3"/> + <quality_gate_conditions id="5" qgate_id="2" metric_id="6" operator="<" value_warning="[null]" value_error="20" + period="[null]"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/delete-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/delete-result.xml new file mode 100644 index 00000000000..3c0ddc793c1 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/delete-result.xml @@ -0,0 +1,6 @@ +<dataset> + + <quality_gates id="2" name="Balanced"/> + <quality_gates id="3" name="Lenient"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/insert-result.xml new file mode 100644 index 00000000000..00881f2945b --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/insert-result.xml @@ -0,0 +1,5 @@ +<dataset> + + <quality_gates id="1" name="My Quality Gate"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/insert.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/insert.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/insert.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/insert.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/selectAll.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/selectAll.xml new file mode 100644 index 00000000000..6eb3e577e4e --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/selectAll.xml @@ -0,0 +1,7 @@ +<dataset> + + <quality_gates id="1" name="Very strict"/> + <quality_gates id="2" name="Balanced"/> + <quality_gates id="3" name="Lenient"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/update-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/update-result.xml new file mode 100644 index 00000000000..4f80f313eae --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/qualitygate/QualityGateDaoTest/update-result.xml @@ -0,0 +1,7 @@ +<dataset> + + <quality_gates id="1" name="Not so strict"/> + <quality_gates id="2" name="Balanced"/> + <quality_gates id="3" name="Lenient"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete-result.xml index 81ed9b7884a..2283bba7d52 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete-result.xml @@ -2,8 +2,10 @@ <!--<active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"--> - <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"/> + <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" + inheritance="[null]"/> - <active_rules created_at="[null]" updated_at="[null]" id="3" profile_id="2" rule_id="11" failure_level="1" inheritance="[null]"/> + <active_rules created_at="[null]" updated_at="[null]" id="3" profile_id="2" rule_id="11" failure_level="1" + inheritance="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_from_profile-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_from_profile-result.xml index 7c678e3f49e..617cd7e08b0 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_from_profile-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_from_profile-result.xml @@ -1,6 +1,7 @@ <dataset> - <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"/> + <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" + inheritance="INHERITED"/> <!--<active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"--> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_from_rule-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_from_rule-result.xml index d69ba08b710..a06288e57b6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_from_rule-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_from_rule-result.xml @@ -1,8 +1,10 @@ <dataset> - <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"/> + <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" + inheritance="INHERITED"/> - <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"/> + <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" + inheritance="[null]"/> <!--<active_rules created_at="[null]" updated_at="[null]" id="3" profile_id="2" rule_id="11" failure_level="1" inheritance="[null]"/>--> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameter-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_parameter-result.xml index 2fda189a9b4..900eb2c2874 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameter-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_parameter-result.xml @@ -1,8 +1,10 @@ <dataset> - <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"/> + <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" + inheritance="INHERITED"/> - <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"/> + <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" + inheritance="[null]"/> <!--<active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" rules_parameter_key="max" value="20"/>--> <active_rule_parameters id="2" active_rule_id="1" rules_parameter_id="2" rules_parameter_key="format" value="html"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_parameters-result.xml index 21b52c9dad7..b8aba08833d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_parameters-result.xml @@ -1,8 +1,10 @@ <dataset> - <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"/> + <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" + inheritance="INHERITED"/> - <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"/> + <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" + inheritance="[null]"/> <!--<active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" rules_parameter_key="max" value="20"/>--> <!--<active_rule_parameters id="2" active_rule_id="1" rules_parameter_id="2" rules_parameter_key="format" value="html"/>--> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml index 843e2452204..d1bbff5912e 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_parameters_from_profile_id-result.xml @@ -1,11 +1,14 @@ <dataset> - <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"/> + <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" + inheritance="INHERITED"/> <!-- Parent of Active rule 1 --> - <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"/> + <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" + inheritance="[null]"/> - <active_rules created_at="[null]" updated_at="[null]" id="3" profile_id="2" rule_id="11" failure_level="1" inheritance="[null]"/> + <active_rules created_at="[null]" updated_at="[null]" id="3" profile_id="2" rule_id="11" failure_level="1" + inheritance="[null]"/> <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" rules_parameter_key="max" value="20"/> <active_rule_parameters id="2" active_rule_id="1" rules_parameter_id="2" rules_parameter_key="format" value="html"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml index 8e12efd7f25..47c6ceeac24 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/delete_parameters_from_profile_id.xml @@ -1,11 +1,14 @@ <dataset> - <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"/> + <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" + inheritance="INHERITED"/> <!-- Parent of Active rule 1 --> - <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"/> + <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" + inheritance="[null]"/> - <active_rules created_at="[null]" updated_at="[null]" id="3" profile_id="2" rule_id="11" failure_level="1" inheritance="[null]"/> + <active_rules created_at="[null]" updated_at="[null]" id="3" profile_id="2" rule_id="11" failure_level="1" + inheritance="[null]"/> <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" rules_parameter_key="max" value="20"/> <active_rule_parameters id="2" active_rule_id="1" rules_parameter_id="2" rules_parameter_key="format" value="html"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/empty.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/empty.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/empty.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/empty.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/insert-result.xml index b2e08355fe3..574cbabdd56 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/insert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/insert-result.xml @@ -1,5 +1,6 @@ <dataset> - <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"/> + <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" + inheritance="INHERITED"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/insert_parameter-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/insert_parameter-result.xml index ed2e17d48d3..ed2e17d48d3 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/insert_parameter-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/insert_parameter-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/shared.xml index f53e679661b..b6d5461c10d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/shared.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/shared.xml @@ -1,11 +1,14 @@ <dataset> - <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED"/> + <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="2" + inheritance="INHERITED"/> <!-- Parent of Active rule 1 --> - <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" inheritance="[null]"/> + <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" + inheritance="[null]"/> - <active_rules created_at="[null]" updated_at="[null]" id="3" profile_id="2" rule_id="11" failure_level="1" inheritance="[null]"/> + <active_rules created_at="[null]" updated_at="[null]" id="3" profile_id="2" rule_id="11" failure_level="1" + inheritance="[null]"/> <active_rule_parameters id="1" active_rule_id="1" rules_parameter_id="1" rules_parameter_key="max" value="20"/> <active_rule_parameters id="2" active_rule_id="1" rules_parameter_id="2" rules_parameter_key="format" value="html"/> diff --git a/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/update-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/update-result.xml new file mode 100644 index 00000000000..30111d636a7 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/update-result.xml @@ -0,0 +1,12 @@ +<dataset> + + <active_rules created_at="[null]" updated_at="[null]" id="1" profile_id="1" rule_id="10" failure_level="4" + inheritance="[null]"/> + + <active_rules created_at="[null]" updated_at="[null]" id="2" profile_id="2" rule_id="10" failure_level="0" + inheritance="[null]"/> + + <active_rules created_at="[null]" updated_at="[null]" id="3" profile_id="2" rule_id="11" failure_level="1" + inheritance="[null]"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/update_parameter-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/update_parameter-result.xml index 289da2f39f2..289da2f39f2 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/ActiveRuleDaoTest/update_parameter-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/ActiveRuleDaoTest/update_parameter-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/delete-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/delete-result.xml index fac2543235e..fac2543235e 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/delete-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/delete-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/inheritance.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/inheritance.xml index 4768bc64707..4768bc64707 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/inheritance.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/inheritance.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/insert-result.xml index 8a9e9ce1ada..8a9e9ce1ada 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/insert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/insert-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/projects.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/projects.xml index 94df8ad98ee..94df8ad98ee 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/projects.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/projects.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/select_all_is_sorted_by_profile_name.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/select_all_is_sorted_by_profile_name.xml index 94e35a7f936..94e35a7f936 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/select_all_is_sorted_by_profile_name.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/select_all_is_sorted_by_profile_name.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/select_by_language.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/select_by_language.xml index d533645288a..05dbd930efd 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/select_by_language.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/select_by_language.xml @@ -1,12 +1,14 @@ <dataset> - <rules_profiles id="1" name="Sonar Way 1" language="java" parent_kee="[null]" kee="java_sonar_way" is_default="[false]" + <rules_profiles id="1" name="Sonar Way 1" language="java" parent_kee="[null]" kee="java_sonar_way" + is_default="[false]" rules_updated_at="[null]" created_at="[null]" updated_at="[null]"/> <rules_profiles id="2" name="Sonar Way" language="js" parent_kee="[null]" kee="js_sonar_way" is_default="[false]" rules_updated_at="[null]" created_at="[null]" updated_at="[null]"/> - <rules_profiles id="3" name="Sonar Way 2" language="java" parent_kee="[null]" kee="java_sonar_way2" is_default="[false]" + <rules_profiles id="3" name="Sonar Way 2" language="java" parent_kee="[null]" kee="java_sonar_way2" + is_default="[false]" rules_updated_at="[null]" created_at="[null]" updated_at="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/shared.xml index bf8e0113b24..bf8e0113b24 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/shared.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/shared.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/update-result.xml b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/update-result.xml index 3d54167f58d..3d54167f58d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/update-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/qualityprofile/QualityProfileDaoTest/update-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/empty.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/empty.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/empty.xml +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/empty.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert-result.xml index 56f9fbc44ad..708daeb2aa8 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert-result.xml @@ -1,13 +1,15 @@ <dataset> - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED" - plugin_config_key="NewConfigKey" priority="0" is_template="[true]" language="dart" created_at="2013-12-16" updated_at="2013-12-17" template_id="3" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" + description="new description" status="DEPRECATED" + plugin_config_key="NewConfigKey" priority="0" is_template="[true]" language="dart" created_at="2013-12-16" + updated_at="2013-12-17" template_id="3" note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]" characteristic_id="100" default_characteristic_id="101" remediation_function="linear" default_remediation_function="linear_offset" remediation_coeff="1h" default_remediation_coeff="5d" remediation_offset="5min" default_remediation_offset="10h" effort_to_fix_description="squid.S115.effortToFix" - /> + /> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert_all-result.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_all-result.xml index 22178ac22b8..71c46fb15b7 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert_all-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_all-result.xml @@ -20,24 +20,28 @@ <dataset> - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED" - plugin_config_key="NewConfigKey" priority="0" is_template="[true]" language="dart" created_at="2013-12-16" updated_at="2013-12-17" template_id="3" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" + description="new description" status="DEPRECATED" + plugin_config_key="NewConfigKey" priority="0" is_template="[true]" language="dart" created_at="2013-12-16" + updated_at="2013-12-17" template_id="3" note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]" characteristic_id="100" default_characteristic_id="101" remediation_function="linear" default_remediation_function="linear_offset" remediation_coeff="1h" default_remediation_coeff="5d" remediation_offset="5min" default_remediation_offset="10h" effort_to_fix_description="squid.S115.effortToFix" - /> + /> - <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="NewRuleKey2" plugin_name="plugin2" name="new name2" description="new description2" status="BETA" - plugin_config_key="NewConfigKey2" priority="2" is_template="[false]" language="js" created_at="2013-12-14" updated_at="2013-12-15" template_id="[null]" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="NewRuleKey2" plugin_name="plugin2" name="new name2" + description="new description2" status="BETA" + plugin_config_key="NewConfigKey2" priority="2" is_template="[false]" language="js" created_at="2013-12-14" + updated_at="2013-12-15" template_id="[null]" note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]" characteristic_id="102" default_characteristic_id="103" remediation_function="linear_offset" default_remediation_function="linear" remediation_coeff="5d" default_remediation_coeff="1h" remediation_offset="10h" default_remediation_offset="5min" effort_to_fix_description="squid.S115.effortToFix2" - /> + /> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert_parameter-result.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter-result.xml index 5208b7a4a4c..5208b7a4a4c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert_parameter-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert_parameter.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter.xml index 871dedcb5e9..871dedcb5e9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert_parameter.xml +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectAll.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectAll.xml new file mode 100644 index 00000000000..d957463ec95 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectAll.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<dataset> + + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" + name="Avoid Null" description="Should avoid NULL" status="READY" + note_data="Rule note with accents éèà " note_user_login="polop.palap" note_created_at="2013-12-25" + characteristic_id="100" default_characteristic_id="101" + remediation_function="linear" default_remediation_function="linear_offset" + remediation_coeff="1h" default_remediation_coeff="5d" + remediation_offset="5min" default_remediation_offset="10h" + effort_to_fix_description="squid.S115.effortToFix" + /> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectById.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectById.xml new file mode 100644 index 00000000000..b4a2a04621d --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectById.xml @@ -0,0 +1,8 @@ +<dataset> + + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" + name="Avoid Comparison" description="Should avoid ==" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" + name="Avoid Null" description="Should avoid NULL" status="READY"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectNonManual.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectNonManual.xml new file mode 100644 index 00000000000..22f7c745985 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectNonManual.xml @@ -0,0 +1,8 @@ +<dataset> + + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" + name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" + description="Should not appear" status="READY"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectParameters.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectParameters.xml new file mode 100644 index 00000000000..8f5e8a92b95 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectParameters.xml @@ -0,0 +1,8 @@ +<dataset> + + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" + name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules_parameters id="1" rule_id="1" name="myParameter" param_type="plop" default_value="plouf" + description="My Parameter"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_by_name.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_by_name.xml new file mode 100644 index 00000000000..b4a2a04621d --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_by_name.xml @@ -0,0 +1,8 @@ +<dataset> + + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" + name="Avoid Comparison" description="Should avoid ==" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" + name="Avoid Null" description="Should avoid NULL" status="READY"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_by_rule_key.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_by_rule_key.xml new file mode 100644 index 00000000000..b4a2a04621d --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_by_rule_key.xml @@ -0,0 +1,8 @@ +<dataset> + + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" + name="Avoid Comparison" description="Should avoid ==" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" + name="Avoid Null" description="Should avoid NULL" status="READY"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_sub_characteristic_id.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_by_sub_characteristic_id.xml index 55795399ec2..1dbd55a539f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_sub_characteristic_id.xml +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_by_sub_characteristic_id.xml @@ -6,53 +6,66 @@ created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Sub characteristics of root characteristic --> - <characteristics id="2" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="1" characteristic_order="[null]" + <characteristics id="2" kee="COMPILER_RELATED_PORTABILITY" name="Compiler related portability" parent_id="1" + characteristic_order="[null]" enabled="[true]" created_at="2013-11-20" updated_at="2013-11-22"/> - <characteristics id="3" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability " parent_id="1" characteristic_order="[null]" + <characteristics id="3" kee="HARDWARE_RELATED_PORTABILITY" name="Hardware related portability " parent_id="1" + characteristic_order="[null]" enabled="[true]" created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Disabled root characteristic --> - <characteristics id="10" kee="DISABLED_ROOT_CHARACTERISTIC" name="Disabled root characteristic" parent_id="[null]" characteristic_order="2" + <characteristics id="10" kee="DISABLED_ROOT_CHARACTERISTIC" name="Disabled root characteristic" parent_id="[null]" + characteristic_order="2" enabled="[false]" created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Disabled characteristic --> - <characteristics id="11" kee="DISABLED_CHARACTERISTIC" name="Disabled characteristic" parent_id="10" characteristic_order="[null]" + <characteristics id="11" kee="DISABLED_CHARACTERISTIC" name="Disabled characteristic" parent_id="10" + characteristic_order="[null]" enabled="[false]" created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Rule linked to a sub characteristic --> - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" + name="UselessImportCheck" description="Useless imports should be removed" status="READY" characteristic_id="2" default_characteristic_id="50" remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5d" remediation_offset="10h" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a sub characteristic --> - <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" + name="LeftCurlyBraceStartLineCheck" + description="Left curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="3" default_characteristic_id="50" remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5d" remediation_offset="10h" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a disabled sub characteristic -> should never be returned --> - <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="READY" + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" + name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="READY" characteristic_id="11" default_characteristic_id="50" remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Removed rule linked to one enable sub characteristic --> - <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="REMOVED" + <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" + plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" + description="super.finalize() should be called at the end of Object.finalize() implementations" + status="REMOVED" characteristic_id="3" default_characteristic_id="50" remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5min" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a sub characteristic, but only default characteristic is linked --> - <rules tags="[null]" system_tags="[null]" id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY" + <rules tags="[null]" system_tags="[null]" id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" + name="RightCurlyBraceStartLineCheck" + description="Right curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="[null]" default_characteristic_id="3" remediation_function="[null]" default_remediation_function="LINEAR" remediation_coeff="[null]" default_remediation_coeff="5d" diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_enables_and_non_manual.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_enables_and_non_manual.xml index fe85e591078..9d7df0a738b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_enables_and_non_manual.xml +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_enables_and_non_manual.xml @@ -1,14 +1,17 @@ <dataset> - <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" - note_data="Rule note with accents éèà " note_user_login="polop.palap" note_created_at="2013-12-25" description_format="HTML" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" + name="Avoid Null" description="Should avoid NULL" status="READY" + note_data="Rule note with accents éèà " note_user_login="polop.palap" note_created_at="2013-12-25" + description_format="HTML" characteristic_id="100" default_characteristic_id="101" remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET" remediation_coeff="1h" default_remediation_coeff="5d" remediation_offset="5min" default_remediation_offset="10h" effort_to_fix_description="squid.S115.effortToFix"/> - <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="squid" name="Avoid Null" description="Should avoid NULL" status="REMOVED" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="squid" name="Avoid Null" + description="Should avoid NULL" status="REMOVED" note_data="[null]" note_user_login="[null]" note_created_at="[null]" description_format="HTML" characteristic_id="[null]" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" @@ -16,7 +19,8 @@ remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> - <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY" + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" + description="Should not appear" status="READY" note_data="[null]" note_user_login="[null]" note_created_at="[null]" description_format="HTML" characteristic_id="[null]" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_parameters_by_rule_id.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_parameters_by_rule_id.xml new file mode 100644 index 00000000000..c137ab0e4cf --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_parameters_by_rule_id.xml @@ -0,0 +1,12 @@ +<dataset> + + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" + name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules_parameters id="1" rule_id="1" name="myParameter" param_type="plop" default_value="plouf" + description="My Parameter"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Unused" plugin_name="unused" name="Unused Rule" + description="Not used" status="REMOVED"/> + <rules_parameters id="2" rule_id="2" name="otherParam" param_type="plop" default_value="plouf" + description="Other Parameter"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_parameters_by_rule_ids.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_parameters_by_rule_ids.xml new file mode 100644 index 00000000000..f2c208ef87b --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/select_parameters_by_rule_ids.xml @@ -0,0 +1,9 @@ +<dataset> + + <rules_parameters id="1" rule_id="1" name="myParameter" param_type="plop" default_value="plouf" + description="My Parameter"/> + + <rules_parameters id="2" rule_id="2" name="otherParam" param_type="plop" default_value="plouf" + description="Other Parameter"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update-result.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update-result.xml new file mode 100644 index 00000000000..13a9ef4b6eb --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update-result.xml @@ -0,0 +1,27 @@ +<dataset> + + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" + description="new description" status="DEPRECATED" + plugin_config_key="NewConfigKey" priority="0" is_template="[true]" language="dart" + created_at="2011-04-25 01:05:00" updated_at="2013-12-17" template_id="3" + note_data="My note" note_user_login="admin" note_created_at="2013-12-19" note_updated_at="2013-12-20" + characteristic_id="100" default_characteristic_id="101" + remediation_function="linear" default_remediation_function="linear_offset" + remediation_coeff="1h" default_remediation_coeff="5d" + remediation_offset="5min" default_remediation_offset="10h" + effort_to_fix_description="squid.S115.effortToFix" + /> + + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" + name="Parent Rule 1" description="Parent Rule 1" status="READY" + plugin_config_key="Parent1" priority="2" is_template="[false]" language="golo" created_at="1981-10-24 15:20:00" + updated_at="[null]" template_id="[null]" + note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]"/> + + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" + name="Parent Rule 2" description="Parent Rule 2" status="READY" + plugin_config_key="Parent2" priority="2" is_template="[false]" language="dart" created_at="1982-12-14 03:15:00" + updated_at="[null]" template_id="[null]" + note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update.xml new file mode 100644 index 00000000000..5813974016a --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update.xml @@ -0,0 +1,18 @@ +<dataset> + + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" + name="Avoid Null" description="Should avoid NULL" status="READY" + plugin_config_key="AvoidNull" priority="2" is_template="[false]" language="golo" + created_at="2011-04-25 01:05:00" template_id="2"/> + + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" + name="Parent Rule 1" description="Parent Rule 1" status="READY" + plugin_config_key="Parent1" priority="2" is_template="[false]" language="golo" + created_at="1981-10-24 15:20:00"/> + + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" + name="Parent Rule 2" description="Parent Rule 2" status="READY" + plugin_config_key="Parent2" priority="2" is_template="[false]" language="dart" + created_at="1982-12-14 03:15:00"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update_parameter-result.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update_parameter-result.xml new file mode 100644 index 00000000000..25188f3a97e --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update_parameter-result.xml @@ -0,0 +1,4 @@ +<dataset> + <rules_parameters id="1" rule_id="1" name="format" param_type="STRING" default_value="^[a-z]+(\.[a-z][a-z0-9]*)*$" + description="Regular expression used to check the package names against."/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update_parameter.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update_parameter.xml index 5208b7a4a4c..5208b7a4a4c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update_parameter.xml +++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/update_parameter.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/semaphore/SemaphoreDaoTest/old_semaphore.xml b/sonar-db/src/test/resources/org/sonar/db/semaphore/SemaphoreDaoTest/old_semaphore.xml new file mode 100644 index 00000000000..ac6cf63ee0e --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/semaphore/SemaphoreDaoTest/old_semaphore.xml @@ -0,0 +1,4 @@ +<dataset> + <semaphores id="1" name="foo" checksum="acbd18db4cc2f85cedef654fccc4a4d8" created_at="1264374000000" + updated_at="1264374000000" locked_at="1264374000000"/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/add_missing_module_uuid_path-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/add_missing_module_uuid_path-result.xml index 742ae70faad..912c502b3f9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/add_missing_module_uuid_path-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/add_missing_module_uuid_path-result.xml @@ -1,7 +1,9 @@ <dataset> - <projects id="1" name="developer@company.net" qualifier="DEV" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path=".ABCD."/> + <projects id="1" name="developer@company.net" qualifier="DEV" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" + module_uuid_path=".ABCD."/> <authors id="1" person_id="1" login="developer@company.net"/> - <projects id="2" name="developer2@company.net" qualifier="DEV" uuid="BCDE" project_uuid="BCDE" module_uuid="[null]" module_uuid_path=".BCDE."/> + <projects id="2" name="developer2@company.net" qualifier="DEV" uuid="BCDE" project_uuid="BCDE" module_uuid="[null]" + module_uuid_path=".BCDE."/> <authors id="2" person_id="2" login="developer2@company.net"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/add_missing_module_uuid_path.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/add_missing_module_uuid_path.xml index fb0854fccbe..fb0854fccbe 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/add_missing_module_uuid_path.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/add_missing_module_uuid_path.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/countDeveloperLogins.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/countDeveloperLogins.xml new file mode 100644 index 00000000000..42776255866 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/countDeveloperLogins.xml @@ -0,0 +1,7 @@ +<dataset> + + <authors id="1" person_id="1" login="godin"/> + <authors id="2" person_id="1" login="evgeny"/> + <authors id="3" person_id="2" login="simon"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldInsertAuthor-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldInsertAuthor-result.xml index a129400b266..40e855c7588 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldInsertAuthor-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldInsertAuthor-result.xml @@ -3,6 +3,6 @@ <authors id="1" person_id="13" - login="godin" /> + login="godin"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldInsertAuthor.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldInsertAuthor.xml index fb0854fccbe..fb0854fccbe 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldInsertAuthor.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldInsertAuthor.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper-result.xml new file mode 100644 index 00000000000..c7c3436d390 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper-result.xml @@ -0,0 +1,5 @@ +<dataset> + <projects id="1" name="developer@company.net" qualifier="DEV" uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" + module_uuid_path="."/> + <authors id="1" person_id="1" login="developer@company.net"/> +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper.xml index fb0854fccbe..fb0854fccbe 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldInsertAuthorAndDeveloper.xml diff --git a/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication-result.xml new file mode 100644 index 00000000000..ddca7b45c66 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication-result.xml @@ -0,0 +1,8 @@ +<dataset> + + <projects id="1" name="developer@company.net" qualifier="DEV" uuid="[null]" project_uuid="[null]" module_uuid="[null]" + module_uuid_path="."/> + + <authors id="1" person_id="1" login="developer@company.net"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication.xml new file mode 100644 index 00000000000..ddca7b45c66 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsAndDevelopersDuplication.xml @@ -0,0 +1,8 @@ +<dataset> + + <projects id="1" name="developer@company.net" qualifier="DEV" uuid="[null]" project_uuid="[null]" module_uuid="[null]" + module_uuid_path="."/> + + <authors id="1" person_id="1" login="developer@company.net"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsDuplication-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsDuplication-result.xml new file mode 100644 index 00000000000..8203f8edbc2 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsDuplication-result.xml @@ -0,0 +1,5 @@ +<dataset> + + <authors id="1" person_id="10" login="godin"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsDuplication.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsDuplication.xml new file mode 100644 index 00000000000..8203f8edbc2 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldPreventAuthorsDuplication.xml @@ -0,0 +1,5 @@ +<dataset> + + <authors id="1" person_id="10" login="godin"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldSelectByLogin.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldSelectByLogin.xml index a129400b266..40e855c7588 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorDaoTest/shouldSelectByLogin.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorDaoTest/shouldSelectByLogin.xml @@ -3,6 +3,6 @@ <authors id="1" person_id="13" - login="godin" /> + login="godin"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/anonymous_should_be_authorized.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/anonymous_should_be_authorized.xml index f5730087a21..f5730087a21 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/anonymous_should_be_authorized.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/anonymous_should_be_authorized.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/group_should_be_authorized.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/group_should_be_authorized.xml index 7ffca0d6f5e..7ffca0d6f5e 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/group_should_be_authorized.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/group_should_be_authorized.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/is_authorized_component_key_for_global_permission.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/is_authorized_component_key_for_global_permission.xml index c5cd325ea5e..c5cd325ea5e 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/is_authorized_component_key_for_global_permission.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/is_authorized_component_key_for_global_permission.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/keep_authorized_project_ids_for_anonymous.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/keep_authorized_project_ids_for_anonymous.xml index 1c21104a7b6..1c21104a7b6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/keep_authorized_project_ids_for_anonymous.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/keep_authorized_project_ids_for_anonymous.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/keep_authorized_project_ids_for_group.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/keep_authorized_project_ids_for_group.xml index 17e6323ccd6..17e6323ccd6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/keep_authorized_project_ids_for_group.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/keep_authorized_project_ids_for_group.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/keep_authorized_project_ids_for_user.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/keep_authorized_project_ids_for_user.xml index 515adaa8f48..515adaa8f48 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/keep_authorized_project_ids_for_user.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/keep_authorized_project_ids_for_user.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_global_permissions_for_anonymous.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_global_permissions_for_anonymous.xml index 515b647b270..515b647b270 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_global_permissions_for_anonymous.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_global_permissions_for_anonymous.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_global_permissions_for_group_anyone.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_global_permissions_for_group_anyone.xml index 970dbec08fb..bd166a7e669 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_global_permissions_for_group_anyone.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_global_permissions_for_group_anyone.xml @@ -1,6 +1,6 @@ <dataset> - <users id="10" login="anyone_user" /> + <users id="10" login="anyone_user"/> <user_roles id="1" user_id="10" resource_id="[null]" role="user"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_group_global_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_group_global_permissions.xml index 424fa45ea82..0ff49e9417c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_group_global_permissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_group_global_permissions.xml @@ -1,9 +1,9 @@ <dataset> <!-- user 10 has no direct grant access, but is in the 'user' group 200 and in the 'admin' group 201 --> - <users id="10" login="john" /> + <users id="10" login="john"/> <!-- user 11 has no direct grant access, but is in the 'user' group 200 --> - <users id="11" login="arthur" /> + <users id="11" login="arthur"/> <user_roles id="1" user_id="999" resource_id="[null]" role="user"/> <user_roles id="2" user_id="999" resource_id="[null]" role="user"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_root_project_keys_for_anonymous.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_root_project_keys_for_anonymous.xml index ed6f133f679..a1aa1f05a76 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_root_project_keys_for_anonymous.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_root_project_keys_for_anonymous.xml @@ -5,9 +5,12 @@ <group_roles id="1" group_id="[null]" resource_id="300" role="user"/> <projects id="300" uuid="ABCD" module_uuid="[null]" kee="pj-w-snapshot" scope="PRJ" qualifier="TRK" enabled="[true]"/> - <projects id="301" uuid="BCDE" module_uuid="[null]" kee="pj-w-snapshot1" scope="PRJ" qualifier="TRK" enabled="[true]"/> - <projects id="302" uuid="CDEF" module_uuid="[null]" kee="pj-w-snapshot2" scope="PRJ" qualifier="TRK" enabled="[true]"/> + <projects id="301" uuid="BCDE" module_uuid="[null]" kee="pj-w-snapshot1" scope="PRJ" qualifier="TRK" + enabled="[true]"/> + <projects id="302" uuid="CDEF" module_uuid="[null]" kee="pj-w-snapshot2" scope="PRJ" qualifier="TRK" + enabled="[true]"/> - <projects id="303" uuid="DEFG" module_uuid="[null]" kee="pj-w-snapshot3" scope="PRJ" qualifier="TRK" enabled="[true]"/> + <projects id="303" uuid="DEFG" module_uuid="[null]" kee="pj-w-snapshot3" scope="PRJ" qualifier="TRK" + enabled="[true]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_root_project_keys_for_group.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_root_project_keys_for_group.xml index 65b2ad7d372..93682166701 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_root_project_keys_for_group.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_root_project_keys_for_group.xml @@ -7,9 +7,12 @@ <group_roles id="1" group_id="200" resource_id="300" role="user"/> <projects id="300" uuid="ABCD" module_uuid="[null]" kee="pj-w-snapshot" scope="PRJ" qualifier="TRK" enabled="[true]"/> - <projects id="301" uuid="BCDE" module_uuid="[null]" kee="pj-w-snapshot1" scope="PRJ" qualifier="TRK" enabled="[true]"/> - <projects id="302" uuid="CDEF" module_uuid="[null]" kee="pj-w-snapshot2" scope="PRJ" qualifier="TRK" enabled="[true]"/> + <projects id="301" uuid="BCDE" module_uuid="[null]" kee="pj-w-snapshot1" scope="PRJ" qualifier="TRK" + enabled="[true]"/> + <projects id="302" uuid="CDEF" module_uuid="[null]" kee="pj-w-snapshot2" scope="PRJ" qualifier="TRK" + enabled="[true]"/> - <projects id="303" uuid="DEFG" module_uuid="[null]" kee="pj-w-snapshot3" scope="PRJ" qualifier="TRK" enabled="[true]"/> + <projects id="303" uuid="DEFG" module_uuid="[null]" kee="pj-w-snapshot3" scope="PRJ" qualifier="TRK" + enabled="[true]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_root_project_keys_for_user.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_root_project_keys_for_user.xml index 706c9300fee..060223cdfbd 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_root_project_keys_for_user.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_root_project_keys_for_user.xml @@ -6,9 +6,12 @@ <group_roles id="1" group_id="200" resource_id="999" role="user"/> <projects id="300" uuid="ABCD" module_uuid="[null]" kee="pj-w-snapshot" scope="PRJ" qualifier="TRK" enabled="[true]"/> - <projects id="301" uuid="BCDE" module_uuid="[null]" kee="pj-w-snapshot1" scope="PRJ" qualifier="TRK" enabled="[true]"/> - <projects id="302" uuid="CDEF" module_uuid="[null]" kee="pj-w-snapshot2" scope="PRJ" qualifier="TRK" enabled="[true]"/> + <projects id="301" uuid="BCDE" module_uuid="[null]" kee="pj-w-snapshot1" scope="PRJ" qualifier="TRK" + enabled="[true]"/> + <projects id="302" uuid="CDEF" module_uuid="[null]" kee="pj-w-snapshot2" scope="PRJ" qualifier="TRK" + enabled="[true]"/> - <projects id="303" uuid="DEFG" module_uuid="[null]" kee="pj-w-snapshot3" scope="PRJ" qualifier="TRK" enabled="[true]"/> + <projects id="303" uuid="DEFG" module_uuid="[null]" kee="pj-w-snapshot3" scope="PRJ" qualifier="TRK" + enabled="[true]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_user_global_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_user_global_permissions.xml index 44c6a6b6ff7..5b8e83ba208 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/should_return_user_global_permissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/should_return_user_global_permissions.xml @@ -1,9 +1,9 @@ <dataset> <!-- user 10 has no group, but has direct role 'user' and 'admin' --> - <users id="10" login="john" /> + <users id="10" login="john"/> <!-- user 11 has no group, but has direct role 'user' --> - <users id="11" login="arthur" /> + <users id="11" login="arthur"/> <user_roles id="1" user_id="10" resource_id="[null]" role="user"/> <user_roles id="2" user_id="10" resource_id="[null]" role="admin"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/user_should_be_authorized.xml b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/user_should_be_authorized.xml index 3771e09738d..3771e09738d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/user_should_be_authorized.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/AuthorizationDaoTest/user_should_be_authorized.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/GroupMembershipDaoTest/select_user_group.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/select_user_group.xml index 5993aae1121..5993aae1121 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/GroupMembershipDaoTest/select_user_group.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/select_user_group.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/GroupMembershipDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared.xml index a882f396f6c..a882f396f6c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/GroupMembershipDaoTest/shared.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/GroupMembershipDaoTest/shared_plus_empty_group.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared_plus_empty_group.xml index 36b89224326..36b89224326 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/GroupMembershipDaoTest/shared_plus_empty_group.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared_plus_empty_group.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/GroupMembershipDaoTest/should_be_sorted_by_group_name.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/should_be_sorted_by_group_name.xml index baaecdb40d4..baaecdb40d4 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/GroupMembershipDaoTest/should_be_sorted_by_group_name.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/should_be_sorted_by_group_name.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/deleteGroupPermissionsByGroupId-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId-result.xml index a9effb1ea47..a9effb1ea47 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/deleteGroupPermissionsByGroupId-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/deleteGroupPermissionsByGroupId.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId.xml index f05b0aebecf..f05b0aebecf 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/deleteGroupPermissionsByGroupId.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/globalGroupPermissions-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions-result.xml index d87bfe95e07..d87bfe95e07 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/globalGroupPermissions-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/globalGroupPermissions.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions.xml index 2e76afcd3be..2e76afcd3be 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/globalGroupPermissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/globalUserPermissions-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalUserPermissions-result.xml index 5fd4509c330..5fd4509c330 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/globalUserPermissions-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalUserPermissions-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/globalUserPermissions.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalUserPermissions.xml index 4d95c91f03d..4d95c91f03d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/globalUserPermissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalUserPermissions.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/resourceGroupPermissions-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions-result.xml index 71650eb675a..71650eb675a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/resourceGroupPermissions-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/resourceGroupPermissions.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions.xml index 8fb07128af7..8fb07128af7 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/resourceGroupPermissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/resourceUserPermissions-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceUserPermissions-result.xml index 7e0ac55287b..7e0ac55287b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/resourceUserPermissions-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceUserPermissions-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/resourceUserPermissions.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceUserPermissions.xml index a5f72708fb6..a5f72708fb6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleDaoTest/resourceUserPermissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceUserPermissions.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleMapperTest/countRoles.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/countRoles.xml index ec1ed3b076f..ec1ed3b076f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleMapperTest/countRoles.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/countRoles.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleMapperTest/deleteRolesByResourceId-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId-result.xml index dae82ddd8f8..dae82ddd8f8 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleMapperTest/deleteRolesByResourceId-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleMapperTest/deleteRolesByResourceId.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId.xml index ec1ed3b076f..ec1ed3b076f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleMapperTest/deleteRolesByResourceId.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleMapperTest/insertRoles-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles-result.xml index 7a7e6f8e196..7a7e6f8e196 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleMapperTest/insertRoles-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/RoleMapperTest/insertRoles.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles.xml index b99df83bc15..b99df83bc15 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/RoleMapperTest/insertRoles.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/deactivate_user-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/deactivate_user-result.xml index 1ae33d01ee8..60e55e6494f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/deactivate_user-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/deactivate_user-result.xml @@ -1,6 +1,7 @@ <dataset> <!-- deactivated --> - <users id="100" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" updated_at="1500000000000" active="[false]"/> + <users id="100" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" + updated_at="1500000000000" active="[false]"/> <!-- deleted <dashboards id="1" user_id="100" NAME="[null]" COLUMN_LAYOUT="[null]" CREATED_AT="[null]" DESCRIPTION="[null]" IS_GLOBAL="[false]" SHARED="[false]" UPDATED_AT="[null]"/> @@ -14,14 +15,18 @@ <user_roles id="1" user_id="100" role="admin" RESOURCE_ID="[null]"/> --> - <users id="101" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[true]"/> - <dashboards id="2" user_id="101" NAME="[null]" COLUMN_LAYOUT="[null]" CREATED_AT="[null]" DESCRIPTION="[null]" IS_GLOBAL="[false]" SHARED="[false]" UPDATED_AT="[null]"/> + <users id="101" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[true]"/> + <dashboards id="2" user_id="101" NAME="[null]" COLUMN_LAYOUT="[null]" CREATED_AT="[null]" DESCRIPTION="[null]" + IS_GLOBAL="[false]" SHARED="[false]" UPDATED_AT="[null]"/> <active_dashboards id="2" user_id="101" dashboard_id="2" ORDER_INDEX="[null]"/> <active_dashboards id="4" user_id="101" dashboard_id="3" ORDER_INDEX="[null]"/> - <issue_filters id="2" user_login="jcdus" name="My issues" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" SHARED="[false]" UPDATED_AT="[null]"/> + <issue_filters id="2" user_login="jcdus" name="My issues" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" + SHARED="[false]" UPDATED_AT="[null]"/> <issue_filter_favourites id="2" user_login="jcdus" issue_filter_id="2" CREATED_AT="[null]"/> <issue_filter_favourites id="4" user_login="jcdus" issue_filter_id="3" CREATED_AT="[null]"/> - <measure_filters id="2" user_id="101" name="My measures" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" SHARED="[false]" UPDATED_AT="[null]"/> + <measure_filters id="2" user_id="101" name="My measures" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" + SHARED="[false]" UPDATED_AT="[null]"/> <measure_filter_favourites id="2" user_id="101" measure_filter_id="2" CREATED_AT="[null]"/> <measure_filter_favourites id="4" user_id="101" measure_filter_id="3" CREATED_AT="[null]"/> <properties id="2" user_id="101" PROP_KEY="[null]" RESOURCE_ID="[null]" TEXT_VALUE="[null]"/> @@ -29,9 +34,12 @@ <user_roles id="2" user_id="101" role="admin" RESOURCE_ID="[null]"/> <!-- Not deleted because shared --> - <dashboards id="3" user_id="100" NAME="[null]" COLUMN_LAYOUT="[null]" CREATED_AT="[null]" DESCRIPTION="[null]" IS_GLOBAL="[false]" SHARED="[true]" UPDATED_AT="[null]"/> - <issue_filters id="3" user_login="marius" name="My shared issues" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" SHARED="[true]" UPDATED_AT="[null]"/> - <measure_filters id="3" user_id="100" name="My shared measures" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" SHARED="[true]" UPDATED_AT="[null]"/> + <dashboards id="3" user_id="100" NAME="[null]" COLUMN_LAYOUT="[null]" CREATED_AT="[null]" DESCRIPTION="[null]" + IS_GLOBAL="[false]" SHARED="[true]" UPDATED_AT="[null]"/> + <issue_filters id="3" user_login="marius" name="My shared issues" CREATED_AT="[null]" DATA="[null]" + DESCRIPTION="[null]" SHARED="[true]" UPDATED_AT="[null]"/> + <measure_filters id="3" user_id="100" name="My shared measures" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" + SHARED="[true]" UPDATED_AT="[null]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/deactivate_user.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/deactivate_user.xml index 285b4f3c7ed..804838dfa2a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/deactivate_user.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/deactivate_user.xml @@ -1,29 +1,40 @@ <dataset> - <users id="100" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[true]"/> - <dashboards id="1" user_id="100" NAME="[null]" COLUMN_LAYOUT="[null]" CREATED_AT="[null]" DESCRIPTION="[null]" IS_GLOBAL="[false]" SHARED="[false]" UPDATED_AT="[null]"/> - <dashboards id="3" user_id="100" NAME="[null]" COLUMN_LAYOUT="[null]" CREATED_AT="[null]" DESCRIPTION="[null]" IS_GLOBAL="[false]" SHARED="[true]" UPDATED_AT="[null]"/> + <users id="100" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[true]"/> + <dashboards id="1" user_id="100" NAME="[null]" COLUMN_LAYOUT="[null]" CREATED_AT="[null]" DESCRIPTION="[null]" + IS_GLOBAL="[false]" SHARED="[false]" UPDATED_AT="[null]"/> + <dashboards id="3" user_id="100" NAME="[null]" COLUMN_LAYOUT="[null]" CREATED_AT="[null]" DESCRIPTION="[null]" + IS_GLOBAL="[false]" SHARED="[true]" UPDATED_AT="[null]"/> <active_dashboards id="1" user_id="100" dashboard_id="1" ORDER_INDEX="[null]"/> <active_dashboards id="3" user_id="100" dashboard_id="3" ORDER_INDEX="[null]"/> - <issue_filters id="1" user_login="marius" name="My issues" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" SHARED="[false]" UPDATED_AT="[null]"/> - <issue_filters id="3" user_login="marius" name="My shared issues" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" SHARED="[true]" UPDATED_AT="[null]"/> + <issue_filters id="1" user_login="marius" name="My issues" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" + SHARED="[false]" UPDATED_AT="[null]"/> + <issue_filters id="3" user_login="marius" name="My shared issues" CREATED_AT="[null]" DATA="[null]" + DESCRIPTION="[null]" SHARED="[true]" UPDATED_AT="[null]"/> <issue_filter_favourites id="1" user_login="marius" issue_filter_id="1" CREATED_AT="[null]"/> <issue_filter_favourites id="3" user_login="marius" issue_filter_id="3" CREATED_AT="[null]"/> - <measure_filters id="1" user_id="100" name="My measures" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" SHARED="[false]" UPDATED_AT="[null]"/> - <measure_filters id="3" user_id="100" name="My shared measures" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" SHARED="[true]" UPDATED_AT="[null]"/> + <measure_filters id="1" user_id="100" name="My measures" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" + SHARED="[false]" UPDATED_AT="[null]"/> + <measure_filters id="3" user_id="100" name="My shared measures" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" + SHARED="[true]" UPDATED_AT="[null]"/> <measure_filter_favourites id="1" user_id="100" measure_filter_id="1" CREATED_AT="[null]"/> <measure_filter_favourites id="3" user_id="100" measure_filter_id="3" CREATED_AT="[null]"/> <properties id="1" user_id="100" PROP_KEY="[null]" RESOURCE_ID="[null]" TEXT_VALUE="[null]"/> <groups_users user_id="100" group_id="200"/> <user_roles id="1" user_id="100" role="admin" RESOURCE_ID="[null]"/> - <users id="101" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482" updated_at="1418215735485" active="[true]"/> - <dashboards id="2" user_id="101" NAME="[null]" COLUMN_LAYOUT="[null]" CREATED_AT="[null]" DESCRIPTION="[null]" IS_GLOBAL="[false]" SHARED="[false]" UPDATED_AT="[null]"/> + <users id="101" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[true]"/> + <dashboards id="2" user_id="101" NAME="[null]" COLUMN_LAYOUT="[null]" CREATED_AT="[null]" DESCRIPTION="[null]" + IS_GLOBAL="[false]" SHARED="[false]" UPDATED_AT="[null]"/> <active_dashboards id="2" user_id="101" dashboard_id="2" ORDER_INDEX="[null]"/> <active_dashboards id="4" user_id="101" dashboard_id="3" ORDER_INDEX="[null]"/> - <issue_filters id="2" user_login="jcdus" name="My issues" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" SHARED="[false]" UPDATED_AT="[null]"/> + <issue_filters id="2" user_login="jcdus" name="My issues" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" + SHARED="[false]" UPDATED_AT="[null]"/> <issue_filter_favourites id="2" user_login="jcdus" issue_filter_id="2" CREATED_AT="[null]"/> <issue_filter_favourites id="4" user_login="jcdus" issue_filter_id="3" CREATED_AT="[null]"/> - <measure_filters id="2" user_id="101" name="My measures" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" SHARED="[false]" UPDATED_AT="[null]"/> + <measure_filters id="2" user_id="101" name="My measures" CREATED_AT="[null]" DATA="[null]" DESCRIPTION="[null]" + SHARED="[false]" UPDATED_AT="[null]"/> <measure_filter_favourites id="2" user_id="101" measure_filter_id="2" CREATED_AT="[null]"/> <measure_filter_favourites id="4" user_id="101" measure_filter_id="3" CREATED_AT="[null]"/> <properties id="2" user_id="101" PROP_KEY="[null]" RESOURCE_ID="[null]" TEXT_VALUE="[null]"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/insert-result.xml index f5b642f4fed..621e018f88b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/insert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/insert-result.xml @@ -1,3 +1,4 @@ <dataset> - <users id="1" login="john" name="John" email="jo@hn.com" created_at="1418215735482" updated_at="1418215735482" active="[true]"/> + <users id="1" login="john" name="John" email="jo@hn.com" created_at="1418215735482" updated_at="1418215735482" + active="[true]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectActiveUserByLogin.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectActiveUserByLogin.xml new file mode 100644 index 00000000000..dc029ad46d6 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectActiveUserByLogin.xml @@ -0,0 +1,14 @@ +<dataset> + <!-- inactive --> + <users id="50" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[false]"/> + + <!-- active --> + <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[true]"/> + + <users id="102" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[true]"/> + + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectGroupByName.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectGroupByName.xml index 01755d808c0..4148c50491d 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/selectGroupByName.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectGroupByName.xml @@ -1,4 +1,5 @@ <dataset> <groups id="1" name="sonar-users" description="Sonar Users" created_at="2011-05-18" updated_at="2012-07-21"/> - <groups id="2" name="sonar-administrators" description="Sonar Administrators" created_at="2011-05-18" updated_at="2012-07-21"/> + <groups id="2" name="sonar-administrators" description="Sonar Administrators" created_at="2011-05-18" + updated_at="2012-07-21"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByLogins.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByLogins.xml new file mode 100644 index 00000000000..3be84a27b69 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByLogins.xml @@ -0,0 +1,9 @@ +<dataset> + <users id="100" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[false]"/> + <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[true]"/> + <users id="102" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[true]"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByQuery.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByQuery.xml new file mode 100644 index 00000000000..7107ad4ed36 --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByQuery.xml @@ -0,0 +1,7 @@ +<dataset> + <users id="100" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[false]"/> + <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[true]"/> + +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByText.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByText.xml new file mode 100644 index 00000000000..1c685cc787c --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByText.xml @@ -0,0 +1,7 @@ +<dataset> + <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[true]"/> + <users id="102" login="sbrandhof" name="Simon Brandhof" email="marius@lesbronzes.fr" created_at="1418215735482" + updated_at="1418215735485" active="[true]"/> + +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/update_user.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/update_user.xml index f5b642f4fed..621e018f88b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/user/UserDaoTest/update_user.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/update_user.xml @@ -1,3 +1,4 @@ <dataset> - <users id="1" login="john" name="John" email="jo@hn.com" created_at="1418215735482" updated_at="1418215735482" active="[true]"/> + <users id="1" login="john" name="John" email="jo@hn.com" created_at="1418215735482" updated_at="1418215735482" + active="[true]"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/DatabaseVersionTest/getVersion.xml b/sonar-db/src/test/resources/org/sonar/db/version/DatabaseVersionTest/getVersion.xml index 867616dc080..867616dc080 100644 --- a/sonar-core/src/test/resources/org/sonar/core/persistence/DatabaseVersionTest/getVersion.xml +++ b/sonar-db/src/test/resources/org/sonar/db/version/DatabaseVersionTest/getVersion.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/DatabaseVersionTest/getVersion_no_rows.xml b/sonar-db/src/test/resources/org/sonar/db/version/DatabaseVersionTest/getVersion_no_rows.xml index 5ed00ba028b..5ed00ba028b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/persistence/DatabaseVersionTest/getVersion_no_rows.xml +++ b/sonar-db/src/test/resources/org/sonar/db/version/DatabaseVersionTest/getVersion_no_rows.xml diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml b/sonar-db/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml index aeb851beb8e..aeb851beb8e 100644 --- a/sonar-core/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml +++ b/sonar-db/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml |