From 1c6c5ac69aed0f7dd35f5007105ed9ac6f1f568d Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Wed, 3 Dec 2014 17:34:21 +0100 Subject: [PATCH] =?utf8?q?compute=20engine=20=E2=80=93=20move=20ProjectPur?= =?utf8?q?geTask=20on=20the=20server=20side?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../server/computation/DataCleanerStep.java | 2 +- .../dbcleaner/ProjectPurgeTask.java | 4 +-- .../server/platform/ServerComponents.java | 6 ++-- .../DataCleanerStepMediumTest.java | 4 +-- .../computation/DataCleanerStepTest.java | 2 +- .../dbcleaner/ProjectPurgeTaskTest.java | 4 +-- .../batch/bootstrap/BatchComponents.java | 4 +-- .../core/config/CorePropertyDefinitions.java | 2 +- .../sonar/core/purge/PurgeConfiguration.java | 2 +- .../dbcleaner/api/DbCleanerConstants.java | 2 +- .../dbcleaner/DataCleanerProperties.java | 2 +- .../dbcleaner/DbCleanerConstants.java | 2 +- .../dbcleaner/DefaultPurgeTask.java | 4 +-- .../computation/dbcleaner/package-info.java | 2 +- .../period/DefaultPeriodCleaner.java | 2 +- .../dbcleaner/period/DeleteAllFilter.java | 2 +- .../computation/dbcleaner/period/Filter.java | 2 +- .../computation/dbcleaner/period/Filters.java | 4 +-- .../dbcleaner/period/Interval.java | 2 +- .../dbcleaner/period/KeepOneFilter.java | 2 +- .../dbcleaner/period/package-info.java | 2 +- .../dbcleaner/DataCleanerPropertiesTest.java | 2 +- .../dbcleaner/DbCleanerTestUtils.java | 2 +- .../dbcleaner/DefaultPurgeTaskTest.java | 4 +-- .../period/DefaultPeriodCleanerTest.java | 2 +- .../dbcleaner/period/DeleteAllFilterTest.java | 4 +-- .../dbcleaner/period/IntervalTest.java | 27 ++++++++--------- .../dbcleaner/period/KeepOneFilterTest.java | 30 +++++++++---------- 28 files changed, 64 insertions(+), 65 deletions(-) rename {sonar-core/src/main/java/org/sonar/core => server/sonar-server/src/main/java/org/sonar/server}/computation/dbcleaner/ProjectPurgeTask.java (96%) rename {sonar-core/src/test/java/org/sonar/core => server/sonar-server/src/test/java/org/sonar/server}/computation/dbcleaner/ProjectPurgeTaskTest.java (96%) rename sonar-core/src/main/java/org/sonar/{core => server}/computation/dbcleaner/DataCleanerProperties.java (98%) rename sonar-core/src/main/java/org/sonar/{core => server}/computation/dbcleaner/DbCleanerConstants.java (97%) rename sonar-core/src/main/java/org/sonar/{core => server}/computation/dbcleaner/DefaultPurgeTask.java (97%) rename sonar-core/src/main/java/org/sonar/{core => server}/computation/dbcleaner/package-info.java (95%) rename sonar-core/src/main/java/org/sonar/{core => server}/computation/dbcleaner/period/DefaultPeriodCleaner.java (98%) rename sonar-core/src/main/java/org/sonar/{core => server}/computation/dbcleaner/period/DeleteAllFilter.java (96%) rename sonar-core/src/main/java/org/sonar/{core => server}/computation/dbcleaner/period/Filter.java (95%) rename sonar-core/src/main/java/org/sonar/{core => server}/computation/dbcleaner/period/Filters.java (95%) rename sonar-core/src/main/java/org/sonar/{core => server}/computation/dbcleaner/period/Interval.java (97%) rename sonar-core/src/main/java/org/sonar/{core => server}/computation/dbcleaner/period/KeepOneFilter.java (98%) rename sonar-core/src/main/java/org/sonar/{core => server}/computation/dbcleaner/period/package-info.java (94%) rename sonar-core/src/test/java/org/sonar/{core => server}/computation/dbcleaner/DataCleanerPropertiesTest.java (95%) rename sonar-core/src/test/java/org/sonar/{core => server}/computation/dbcleaner/DbCleanerTestUtils.java (97%) rename sonar-core/src/test/java/org/sonar/{core => server}/computation/dbcleaner/DefaultPurgeTaskTest.java (97%) rename sonar-core/src/test/java/org/sonar/{core => server}/computation/dbcleaner/period/DefaultPeriodCleanerTest.java (98%) rename sonar-core/src/test/java/org/sonar/{core => server}/computation/dbcleaner/period/DeleteAllFilterTest.java (93%) rename sonar-core/src/test/java/org/sonar/{core => server}/computation/dbcleaner/period/IntervalTest.java (78%) rename sonar-core/src/test/java/org/sonar/{core => server}/computation/dbcleaner/period/KeepOneFilterTest.java (66%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/DataCleanerStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/DataCleanerStep.java index 8636b0ae74c..bcb7b7f4454 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/DataCleanerStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/DataCleanerStep.java @@ -23,7 +23,7 @@ package org.sonar.server.computation; import org.sonar.api.config.Settings; import org.sonar.core.component.ComponentDto; import org.sonar.core.computation.db.AnalysisReportDto; -import org.sonar.core.computation.dbcleaner.ProjectPurgeTask; +import org.sonar.server.computation.dbcleaner.ProjectPurgeTask; import org.sonar.core.persistence.DbSession; import org.sonar.core.purge.PurgeConfiguration; import org.sonar.server.issue.index.IssueIndex; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/ProjectPurgeTask.java b/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectPurgeTask.java similarity index 96% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/ProjectPurgeTask.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectPurgeTask.java index 931a746b620..d6e13f36e37 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/ProjectPurgeTask.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectPurgeTask.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.server.computation.dbcleaner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,7 +26,7 @@ import org.sonar.api.CoreProperties; import org.sonar.api.ServerComponent; import org.sonar.api.config.Settings; import org.sonar.api.utils.TimeUtils; -import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; +import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.core.persistence.DbSession; import org.sonar.core.purge.PurgeConfiguration; import org.sonar.core.purge.PurgeDao; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java index 922cdc96ae0..a68960db2eb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java @@ -37,9 +37,9 @@ import org.sonar.api.utils.System2; import org.sonar.api.utils.UriReader; import org.sonar.api.utils.internal.TempFolderCleaner; import org.sonar.core.component.SnapshotPerspectives; -import org.sonar.core.computation.dbcleaner.DefaultPurgeTask; -import org.sonar.core.computation.dbcleaner.ProjectPurgeTask; -import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; +import org.sonar.server.computation.dbcleaner.DefaultPurgeTask; +import org.sonar.server.computation.dbcleaner.ProjectPurgeTask; +import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.core.config.CorePropertyDefinitions; import org.sonar.core.config.Logback; import org.sonar.core.i18n.DefaultI18n; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/DataCleanerStepMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/DataCleanerStepMediumTest.java index 7e6cfbefa71..512285c8911 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/DataCleanerStepMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/DataCleanerStepMediumTest.java @@ -29,8 +29,8 @@ import org.sonar.core.component.ComponentDto; import org.sonar.core.component.SnapshotDto; import org.sonar.core.computation.db.AnalysisReportDto; import org.sonar.core.computation.db.AnalysisReportDto.Status; -import org.sonar.core.computation.dbcleaner.DbCleanerConstants; -import org.sonar.core.computation.dbcleaner.ProjectPurgeTask; +import org.sonar.server.computation.dbcleaner.DbCleanerConstants; +import org.sonar.server.computation.dbcleaner.ProjectPurgeTask; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; import org.sonar.core.properties.PropertyDto; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/DataCleanerStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/DataCleanerStepTest.java index 3c6523d6d95..800b1f7ff47 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/DataCleanerStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/DataCleanerStepTest.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.sonar.api.config.Settings; import org.sonar.core.component.ComponentDto; import org.sonar.core.computation.db.AnalysisReportDto; -import org.sonar.core.computation.dbcleaner.ProjectPurgeTask; +import org.sonar.server.computation.dbcleaner.ProjectPurgeTask; import org.sonar.core.persistence.DbSession; import org.sonar.core.purge.PurgeConfiguration; import org.sonar.server.issue.index.IssueIndex; diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/ProjectPurgeTaskTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectPurgeTaskTest.java similarity index 96% rename from sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/ProjectPurgeTaskTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectPurgeTaskTest.java index de25c313d07..74cafe743f7 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/ProjectPurgeTaskTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectPurgeTaskTest.java @@ -18,14 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.server.computation.dbcleaner; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; -import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; +import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.core.persistence.DbSession; import org.sonar.core.purge.PurgeConfiguration; import org.sonar.core.purge.PurgeDao; 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 8d0f2bfb00d..a3bf5ed529e 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 @@ -32,8 +32,8 @@ import org.sonar.batch.maven.MavenProjectBuilder; import org.sonar.batch.maven.MavenProjectConverter; import org.sonar.batch.scm.ScmConfiguration; import org.sonar.batch.scm.ScmSensor; -import org.sonar.core.computation.dbcleaner.DefaultPurgeTask; -import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; +import org.sonar.server.computation.dbcleaner.DefaultPurgeTask; +import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.core.config.CorePropertyDefinitions; import java.util.Collection; 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 d10afcf4cf9..0bb4bb69e0a 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 @@ -24,7 +24,7 @@ import com.google.common.collect.Lists; import org.sonar.api.CoreProperties; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.resources.Qualifiers; -import org.sonar.core.computation.dbcleaner.DataCleanerProperties; +import org.sonar.server.computation.dbcleaner.DataCleanerProperties; import java.util.List; diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeConfiguration.java b/sonar-core/src/main/java/org/sonar/core/purge/PurgeConfiguration.java index d3fc9c1c4bd..37886b30732 100644 --- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeConfiguration.java +++ b/sonar-core/src/main/java/org/sonar/core/purge/PurgeConfiguration.java @@ -24,7 +24,7 @@ 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 org.sonar.server.computation.dbcleaner.DbCleanerConstants; import javax.annotation.CheckForNull; diff --git a/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/DbCleanerConstants.java b/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/DbCleanerConstants.java index 8cad98c10c5..53fc44ede3a 100644 --- a/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/DbCleanerConstants.java +++ b/sonar-core/src/main/java/org/sonar/plugins/dbcleaner/api/DbCleanerConstants.java @@ -23,5 +23,5 @@ package org.sonar.plugins.dbcleaner.api; * @deprecated (is used by the plugin views only. Will rely on the implementation when views analysis views moved on the server side) */ @Deprecated -public interface DbCleanerConstants extends org.sonar.core.computation.dbcleaner.DbCleanerConstants { +public interface DbCleanerConstants extends org.sonar.server.computation.dbcleaner.DbCleanerConstants { } diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DataCleanerProperties.java b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DataCleanerProperties.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DataCleanerProperties.java rename to sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DataCleanerProperties.java index f4bc98dea9a..902a36350a3 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DataCleanerProperties.java +++ b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DataCleanerProperties.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.server.computation.dbcleaner; import org.sonar.api.CoreProperties; import org.sonar.api.PropertyType; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerConstants.java b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DbCleanerConstants.java similarity index 97% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerConstants.java rename to sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DbCleanerConstants.java index a577f632608..fbd853e00bf 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerConstants.java +++ b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DbCleanerConstants.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.server.computation.dbcleaner; public interface DbCleanerConstants { diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTask.java b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTask.java similarity index 97% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTask.java rename to sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTask.java index 2e0f073571e..188164e55fc 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTask.java +++ b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTask.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.server.computation.dbcleaner; import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; @@ -27,7 +27,7 @@ import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; import org.sonar.api.resources.Qualifiers; import org.sonar.api.utils.TimeUtils; -import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; +import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.core.purge.IdUuidPair; import org.sonar.core.purge.PurgeConfiguration; import org.sonar.core.purge.PurgeDao; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java similarity index 95% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java rename to sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java index 8a7156fd308..f3a8c77da99 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java +++ b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java @@ -19,6 +19,6 @@ */ @ParametersAreNonnullByDefault -package org.sonar.core.computation.dbcleaner; +package org.sonar.server.computation.dbcleaner; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleaner.java b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/DefaultPeriodCleaner.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleaner.java rename to sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/DefaultPeriodCleaner.java index e87214d4e0e..0fcf5236ebf 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleaner.java +++ b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/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.server.computation.dbcleaner.period; import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilter.java b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilter.java similarity index 96% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilter.java rename to sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilter.java index 25dcb409ea1..83c8a9edf4b 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilter.java +++ b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilter.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.server.computation.dbcleaner.period; import com.google.common.collect.Lists; import org.slf4j.LoggerFactory; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filter.java b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filter.java similarity index 95% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filter.java rename to sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filter.java index ef4a3753242..c4bf00a1bd6 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filter.java +++ b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filter.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.server.computation.dbcleaner.period; import org.sonar.core.purge.PurgeableSnapshotDto; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filters.java b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filters.java similarity index 95% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filters.java rename to sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filters.java index 8e59596212c..929316c0a2b 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filters.java +++ b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filters.java @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.server.computation.dbcleaner.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 org.sonar.server.computation.dbcleaner.DbCleanerConstants; import java.util.Calendar; import java.util.Date; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Interval.java b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Interval.java similarity index 97% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Interval.java rename to sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Interval.java index 5676a858495..a4ef804274b 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Interval.java +++ b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Interval.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.server.computation.dbcleaner.period; import com.google.common.collect.Lists; import org.apache.commons.lang.time.DateUtils; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilter.java b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/KeepOneFilter.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilter.java rename to sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/KeepOneFilter.java index 419add8383f..32bda2cca08 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilter.java +++ b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/KeepOneFilter.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.server.computation.dbcleaner.period; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; 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/server/computation/dbcleaner/period/package-info.java similarity index 94% rename from sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/package-info.java rename to sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/package-info.java index 283ef7fa912..1f547e88740 100644 --- a/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/package-info.java +++ b/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/package-info.java @@ -19,6 +19,6 @@ */ @ParametersAreNonnullByDefault -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.server.computation.dbcleaner.period; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DataCleanerPropertiesTest.java b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DataCleanerPropertiesTest.java similarity index 95% rename from sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DataCleanerPropertiesTest.java rename to sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DataCleanerPropertiesTest.java index da34eb61566..645256d1e6f 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DataCleanerPropertiesTest.java +++ b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DataCleanerPropertiesTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.server.computation.dbcleaner; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerTestUtils.java b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DbCleanerTestUtils.java similarity index 97% rename from sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerTestUtils.java rename to sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DbCleanerTestUtils.java index 392e58c0f0b..6a62915ebd8 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerTestUtils.java +++ b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DbCleanerTestUtils.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.server.computation.dbcleaner; import org.sonar.api.utils.DateUtils; import org.sonar.core.purge.PurgeableSnapshotDto; diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTaskTest.java b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTaskTest.java similarity index 97% rename from sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTaskTest.java rename to sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTaskTest.java index c03d4ada988..1ca4ffef571 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTaskTest.java +++ b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTaskTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner; +package org.sonar.server.computation.dbcleaner; import ch.qos.logback.classic.Logger; import org.junit.Before; @@ -29,7 +29,7 @@ import org.sonar.api.config.PropertyDefinitions; import org.sonar.api.config.Settings; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; -import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; +import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.core.purge.IdUuidPair; import org.sonar.core.purge.PurgeConfiguration; import org.sonar.core.purge.PurgeDao; diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleanerTest.java b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/DefaultPeriodCleanerTest.java similarity index 98% rename from sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleanerTest.java rename to sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/DefaultPeriodCleanerTest.java index 759dac500af..e5de5015e00 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleanerTest.java +++ b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/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.server.computation.dbcleaner.period; import org.apache.commons.lang.ObjectUtils; import org.hamcrest.BaseMatcher; diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilterTest.java b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilterTest.java similarity index 93% rename from sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilterTest.java rename to sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilterTest.java index 2a84512355e..6882a3868db 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilterTest.java +++ b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilterTest.java @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.server.computation.dbcleaner.period; import org.junit.Test; import org.sonar.api.utils.DateUtils; -import org.sonar.core.computation.dbcleaner.DbCleanerTestUtils; +import org.sonar.server.computation.dbcleaner.DbCleanerTestUtils; import org.sonar.core.purge.PurgeableSnapshotDto; import java.util.Arrays; diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/IntervalTest.java b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/IntervalTest.java similarity index 78% rename from sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/IntervalTest.java rename to sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/IntervalTest.java index a9c5aecc698..94a3edd2c10 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/IntervalTest.java +++ b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/IntervalTest.java @@ -18,11 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.server.computation.dbcleaner.period; import org.junit.Test; import org.sonar.api.utils.DateUtils; import org.sonar.core.purge.PurgeableSnapshotDto; +import org.sonar.server.computation.dbcleaner.DbCleanerTestUtils; import java.util.Arrays; import java.util.Calendar; @@ -31,8 +32,6 @@ import java.util.List; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.sonar.core.computation.dbcleaner.DbCleanerTestUtils.createSnapshotWithDate; -import static org.sonar.core.computation.dbcleaner.DbCleanerTestUtils.createSnapshotWithDateTime; public class IntervalTest { static int calendarField(Interval interval, int field) { @@ -49,15 +48,15 @@ public class IntervalTest { @Test public void shouldGroupByIntervals() { List snapshots = Arrays.asList( - createSnapshotWithDate(1L, "2011-04-03"), + DbCleanerTestUtils.createSnapshotWithDate(1L, "2011-04-03"), - createSnapshotWithDate(2L, "2011-05-01"), - createSnapshotWithDate(3L, "2011-05-19"), + DbCleanerTestUtils.createSnapshotWithDate(2L, "2011-05-01"), + DbCleanerTestUtils.createSnapshotWithDate(3L, "2011-05-19"), - createSnapshotWithDate(4L, "2011-06-02"), - createSnapshotWithDate(5L, "2011-06-20"), + DbCleanerTestUtils.createSnapshotWithDate(4L, "2011-06-02"), + DbCleanerTestUtils.createSnapshotWithDate(5L, "2011-06-20"), - createSnapshotWithDate(6L, "2012-06-29") // out of scope + DbCleanerTestUtils.createSnapshotWithDate(6L, "2012-06-29") // out of scope ); List intervals = Interval.group(snapshots, DateUtils.parseDate("2010-01-01"), DateUtils.parseDate("2011-12-31"), Calendar.MONTH); @@ -76,8 +75,8 @@ public class IntervalTest { @Test public void shouldNotJoinMonthsOfDifferentYears() { List snapshots = Arrays.asList( - createSnapshotWithDate(1L, "2010-04-03"), - createSnapshotWithDate(2L, "2011-04-13") + DbCleanerTestUtils.createSnapshotWithDate(1L, "2010-04-03"), + DbCleanerTestUtils.createSnapshotWithDate(2L, "2011-04-13") ); List intervals = Interval.group(snapshots, DateUtils.parseDate("2010-01-01"), DateUtils.parseDate("2011-12-31"), Calendar.MONTH); @@ -95,9 +94,9 @@ public class IntervalTest { @Test public void shouldIgnoreTimeWhenGroupingByIntervals() { List snapshots = Arrays.asList( - createSnapshotWithDateTime(1L, "2011-05-25T16:16:48+0100"), - createSnapshotWithDateTime(2L, "2012-01-26T16:16:48+0100"), - createSnapshotWithDateTime(3L, "2012-01-27T16:16:48+0100") + DbCleanerTestUtils.createSnapshotWithDateTime(1L, "2011-05-25T16:16:48+0100"), + DbCleanerTestUtils.createSnapshotWithDateTime(2L, "2012-01-26T16:16:48+0100"), + DbCleanerTestUtils.createSnapshotWithDateTime(3L, "2012-01-27T16:16:48+0100") ); List intervals = Interval.group(snapshots, DateUtils.parseDate("2011-05-25"), DateUtils.parseDate("2012-01-26"), Calendar.MONTH); diff --git a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilterTest.java b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/KeepOneFilterTest.java similarity index 66% rename from sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilterTest.java rename to sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/KeepOneFilterTest.java index 8e855f987df..58ffe5a230b 100644 --- a/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilterTest.java +++ b/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/KeepOneFilterTest.java @@ -18,13 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.computation.dbcleaner.period; +package org.sonar.server.computation.dbcleaner.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.server.computation.dbcleaner.DbCleanerTestUtils; import javax.annotation.Nullable; @@ -34,7 +35,6 @@ import java.util.List; import static com.google.common.collect.Lists.newArrayList; import static org.fest.assertions.Assertions.assertThat; -import static org.sonar.core.computation.dbcleaner.DbCleanerTestUtils.createSnapshotWithDate; public class KeepOneFilterTest { @@ -52,12 +52,12 @@ public class KeepOneFilterTest { Filter filter = new KeepOneFilter(DateUtils.parseDate("2011-03-25"), DateUtils.parseDate("2011-08-25"), Calendar.MONTH, "month"); List toDelete = filter.filter(Arrays.asList( - createSnapshotWithDate(1L, "2010-01-01"), // out of scope -> keep - createSnapshotWithDate(2L, "2011-05-01"), // may -> keep - createSnapshotWithDate(3L, "2011-05-02"), // may -> to be deleted - createSnapshotWithDate(4L, "2011-05-19"), // may -> to be deleted - createSnapshotWithDate(5L, "2011-06-01"), // june -> keep - createSnapshotWithDate(6L, "2012-01-01") // out of scope -> keep + DbCleanerTestUtils.createSnapshotWithDate(1L, "2010-01-01"), // out of scope -> keep + DbCleanerTestUtils.createSnapshotWithDate(2L, "2011-05-01"), // may -> keep + DbCleanerTestUtils.createSnapshotWithDate(3L, "2011-05-02"), // may -> to be deleted + DbCleanerTestUtils.createSnapshotWithDate(4L, "2011-05-19"), // may -> to be deleted + DbCleanerTestUtils.createSnapshotWithDate(5L, "2011-06-01"), // june -> keep + DbCleanerTestUtils.createSnapshotWithDate(6L, "2012-01-01") // out of scope -> keep )); assertThat(toDelete).hasSize(2); @@ -72,10 +72,10 @@ public class KeepOneFilterTest { Filter filter = new KeepOneFilter(DateUtils.parseDate("2011-03-25"), DateUtils.parseDate("2011-08-25"), Calendar.MONTH, "month"); List toDelete = filter.filter(Arrays.asList( - createSnapshotWithDate(1L, "2011-05-01"), // to be deleted - createSnapshotWithDate(2L, "2011-05-02").setLast(true), - createSnapshotWithDate(3L, "2011-05-19").setHasEvents(true).setLast(false), - createSnapshotWithDate(4L, "2011-05-23") // to be deleted + DbCleanerTestUtils.createSnapshotWithDate(1L, "2011-05-01"), // to be deleted + DbCleanerTestUtils.createSnapshotWithDate(2L, "2011-05-02").setLast(true), + DbCleanerTestUtils.createSnapshotWithDate(3L, "2011-05-19").setHasEvents(true).setLast(false), + DbCleanerTestUtils.createSnapshotWithDate(4L, "2011-05-23") // to be deleted )); assertThat(toDelete).hasSize(2); @@ -87,9 +87,9 @@ public class KeepOneFilterTest { @Test public void test_isDeletable() { - assertThat(KeepOneFilter.isDeletable(createSnapshotWithDate(1L, "2011-05-01"))).isTrue(); - assertThat(KeepOneFilter.isDeletable(createSnapshotWithDate(1L, "2011-05-01").setLast(true))).isFalse(); - assertThat(KeepOneFilter.isDeletable(createSnapshotWithDate(1L, "2011-05-01").setHasEvents(true))).isFalse(); + assertThat(KeepOneFilter.isDeletable(DbCleanerTestUtils.createSnapshotWithDate(1L, "2011-05-01"))).isTrue(); + assertThat(KeepOneFilter.isDeletable(DbCleanerTestUtils.createSnapshotWithDate(1L, "2011-05-01").setLast(true))).isFalse(); + assertThat(KeepOneFilter.isDeletable(DbCleanerTestUtils.createSnapshotWithDate(1L, "2011-05-01").setHasEvents(true))).isFalse(); } } -- 2.39.5