From 15c39e0e9051a647b0998064e0f62060fd272920 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Mon, 15 Dec 2014 12:26:16 +0100 Subject: [PATCH] SONAR-5910 create digest report step & delete unused experimental mode --- .../dbcleaner/IndexPurgeListener.java | 2 +- .../computation/dbcleaner/ProjectCleaner.java | 4 +- .../computation/dbcleaner/package-info.java | 2 +- .../computation/AnalysisReportService.java | 39 ++++++++++++++ .../computation/ComputationService.java | 2 + .../computation/DigestAnalysisReportStep.java | 52 ------------------- .../computation/db/AnalysisReportDao.java | 13 +++-- .../ComponentIndexationInDatabaseStep.java | 4 +- .../{ => step}/ComputationStep.java | 4 +- .../{ => step}/ComputationStepRegistry.java | 4 +- .../{ => step}/DataCleanerStep.java | 4 +- .../DigestReportStep.java} | 31 +++++------ .../{ => step}/IndexProjectIssuesStep.java | 2 +- .../InvalidatePreviewCacheStep.java | 4 +- .../{ => step}/SwitchSnapshotStep.java | 2 +- .../SynchronizeProjectPermissionsStep.java | 2 +- .../{dbcleaner => step}/package-info.java | 2 +- .../ExperimentalAnalysisReportWebService.java | 52 ------------------- .../server/platform/ServerComponents.java | 22 ++++---- .../server/source/IndexSourceLinesStep.java | 4 +- .../dbcleaner/IndexPurgeListenerTest.java | 2 +- .../dbcleaner/ProjectCleanerTest.java | 4 +- .../AnalysisReportServiceTest.java | 46 ++++++++++++++++ .../computation/ComputationServiceTest.java | 2 + .../computation/db/AnalysisReportDaoTest.java | 10 ++-- ...ComponentIndexationInDatabaseStepTest.java | 6 +-- .../ComputationStepRegistryMediumTest.java | 4 +- .../{ => step}/DataCleanerStepMediumTest.java | 6 +-- .../{ => step}/DataCleanerStepTest.java | 4 +- .../step/DigestReportStepTest.java | 48 +++++++++++++++++ .../InvalidatePreviewCacheStepTest.java | 3 +- .../{ => step}/SwitchSnapshotStepTest.java | 3 +- ...SynchronizeProjectPermissionsStepTest.java | 3 +- .../SwitchSnapshotStepTest/empty.xml | 0 .../snapshots-result.xml | 0 .../SwitchSnapshotStepTest/snapshots.xml | 0 .../batch/bootstrap/BatchComponents.java | 4 +- .../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 | 24 +++++++++ .../sonar/core/computation/package-info.java | 24 +++++++++ .../core/config/CorePropertyDefinitions.java | 2 +- .../sonar/core/purge/PurgeConfiguration.java | 2 +- .../dbcleaner/api/DbCleanerConstants.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 | 4 +- .../dbcleaner/period/KeepOneFilterTest.java | 4 +- 59 files changed, 292 insertions(+), 204 deletions(-) rename server/sonar-server/src/main/java/org/sonar/{server => core}/computation/dbcleaner/IndexPurgeListener.java (96%) rename server/sonar-server/src/main/java/org/sonar/{server => core}/computation/dbcleaner/ProjectCleaner.java (97%) rename {sonar-core/src/main/java/org/sonar/server => server/sonar-server/src/main/java/org/sonar/core}/computation/dbcleaner/package-info.java (95%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportService.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/DigestAnalysisReportStep.java rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => step}/ComponentIndexationInDatabaseStep.java (91%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => step}/ComputationStep.java (89%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => step}/ComputationStepRegistry.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => step}/DataCleanerStep.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ws/ExperimentalAnalysisReportAction.java => step/DigestReportStep.java} (55%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => step}/IndexProjectIssuesStep.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => step}/InvalidatePreviewCacheStep.java (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => step}/SwitchSnapshotStep.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{ => step}/SynchronizeProjectPermissionsStep.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/computation/{dbcleaner => step}/package-info.java (95%) delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/ws/ExperimentalAnalysisReportWebService.java rename server/sonar-server/src/test/java/org/sonar/{server => core}/computation/dbcleaner/IndexPurgeListenerTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/{server => core}/computation/dbcleaner/ProjectCleanerTest.java (97%) create mode 100644 server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportServiceTest.java rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => step}/ComponentIndexationInDatabaseStepTest.java (91%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => step}/ComputationStepRegistryMediumTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => step}/DataCleanerStepMediumTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => step}/DataCleanerStepTest.java (94%) create mode 100644 server/sonar-server/src/test/java/org/sonar/server/computation/step/DigestReportStepTest.java rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => step}/InvalidatePreviewCacheStepTest.java (94%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => step}/SwitchSnapshotStepTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/{ => step}/SynchronizeProjectPermissionsStepTest.java (91%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => step}/SwitchSnapshotStepTest/empty.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => step}/SwitchSnapshotStepTest/snapshots-result.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/{ => step}/SwitchSnapshotStepTest/snapshots.xml (100%) rename sonar-core/src/main/java/org/sonar/{server => core}/computation/dbcleaner/DataCleanerProperties.java (98%) rename sonar-core/src/main/java/org/sonar/{server => core}/computation/dbcleaner/DbCleanerConstants.java (97%) rename sonar-core/src/main/java/org/sonar/{server => core}/computation/dbcleaner/DefaultPurgeTask.java (97%) rename sonar-core/src/main/java/org/sonar/{server/computation/dbcleaner/period => core/computation/dbcleaner}/package-info.java (94%) rename sonar-core/src/main/java/org/sonar/{server => core}/computation/dbcleaner/period/DefaultPeriodCleaner.java (98%) rename sonar-core/src/main/java/org/sonar/{server => core}/computation/dbcleaner/period/DeleteAllFilter.java (96%) rename sonar-core/src/main/java/org/sonar/{server => core}/computation/dbcleaner/period/Filter.java (95%) rename sonar-core/src/main/java/org/sonar/{server => core}/computation/dbcleaner/period/Filters.java (95%) rename sonar-core/src/main/java/org/sonar/{server => core}/computation/dbcleaner/period/Interval.java (97%) rename sonar-core/src/main/java/org/sonar/{server => core}/computation/dbcleaner/period/KeepOneFilter.java (98%) create mode 100644 sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/package-info.java create mode 100644 sonar-core/src/main/java/org/sonar/core/computation/package-info.java rename sonar-core/src/test/java/org/sonar/{server => core}/computation/dbcleaner/DataCleanerPropertiesTest.java (95%) rename sonar-core/src/test/java/org/sonar/{server => core}/computation/dbcleaner/DbCleanerTestUtils.java (97%) rename sonar-core/src/test/java/org/sonar/{server => core}/computation/dbcleaner/DefaultPurgeTaskTest.java (97%) rename sonar-core/src/test/java/org/sonar/{server => core}/computation/dbcleaner/period/DefaultPeriodCleanerTest.java (98%) rename sonar-core/src/test/java/org/sonar/{server => core}/computation/dbcleaner/period/DeleteAllFilterTest.java (93%) rename sonar-core/src/test/java/org/sonar/{server => core}/computation/dbcleaner/period/IntervalTest.java (97%) rename sonar-core/src/test/java/org/sonar/{server => core}/computation/dbcleaner/period/KeepOneFilterTest.java (97%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/IndexPurgeListener.java b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/IndexPurgeListener.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/IndexPurgeListener.java rename to server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/IndexPurgeListener.java index fb48b5cff61..08db1573952 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/IndexPurgeListener.java +++ b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/IndexPurgeListener.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner; +package org.sonar.core.computation.dbcleaner; import org.sonar.api.ServerComponent; import org.sonar.core.purge.PurgeListener; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectCleaner.java b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectCleaner.java rename to server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java index 60e7119144b..cfe0c2646bb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/ProjectCleaner.java +++ b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/ProjectCleaner.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner; +package org.sonar.core.computation.dbcleaner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +28,7 @@ import org.sonar.api.config.Settings; import org.sonar.api.utils.TimeUtils; import org.sonar.core.persistence.DbSession; import org.sonar.core.purge.*; -import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; +import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.server.issue.index.IssueIndex; import org.sonar.server.properties.ProjectSettingsFactory; import org.sonar.server.search.IndexClient; diff --git a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java similarity index 95% rename from sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java rename to server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java index f3a8c77da99..8a7156fd308 100644 --- a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java @@ -19,6 +19,6 @@ */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.dbcleaner; +package org.sonar.core.computation.dbcleaner; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportService.java b/server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportService.java new file mode 100644 index 00000000000..57b34283011 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportService.java @@ -0,0 +1,39 @@ +/* + * 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.server.computation; + +import org.sonar.core.persistence.DbSession; +import org.sonar.server.db.DbClient; + +import java.io.File; + +public class AnalysisReportService { + + private final DbClient dbClient; + + public AnalysisReportService(DbClient dbClient) { + this.dbClient = dbClient; + } + + public File decompress(DbSession session, long id) { + return dbClient.analysisReportDao().getDecompressedReport(session, id); + } +} 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 afb6b8542b6..e6f585f7515 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 @@ -32,6 +32,8 @@ import org.sonar.core.computation.db.AnalysisReportDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; import org.sonar.server.activity.ActivityService; +import org.sonar.server.computation.step.ComputationStep; +import org.sonar.server.computation.step.ComputationStepRegistry; import org.sonar.server.db.DbClient; import java.util.Date; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/DigestAnalysisReportStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/DigestAnalysisReportStep.java deleted file mode 100644 index 25712006a17..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/DigestAnalysisReportStep.java +++ /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. - */ - -package org.sonar.server.computation; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.sonar.api.config.Settings; -import org.sonar.api.utils.TimeProfiler; -import org.sonar.server.db.DbClient; - -public class DigestAnalysisReportStep { - private static final String EXPERIMENTAL_MODE_PROPERTY = "sonar.computation.experimental"; - private static final Logger LOG = LoggerFactory.getLogger(DigestAnalysisReportStep.class); - - private final DbClient dbClient; - private final Settings settings; - - public DigestAnalysisReportStep(DbClient dbClient, Settings settings) { - this.dbClient = dbClient; - this.settings = settings; - } - - public void execute(String path) { - dbClient.openSession(false); - boolean isExperimentalModeOn = settings.getBoolean(EXPERIMENTAL_MODE_PROPERTY); - - LOG.info("Digest analysis report"); - if (isExperimentalModeOn) { - TimeProfiler stepProfiler = new TimeProfiler(LOG).start(String.format("Digest analysis report at '%s'", path)); - LOG.info("experimental mode digestion"); - stepProfiler.stop(); - } - } -} 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 6e94edab474..75c5e909b26 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 @@ -34,6 +34,7 @@ import org.sonar.server.db.BaseDao; import javax.annotation.CheckForNull; import javax.annotation.Nullable; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -52,9 +53,8 @@ public class AnalysisReportDao extends BaseDao steps() { List steps = Lists.newArrayList(); + // project & views + steps.add(pico.getComponentByType(DigestReportStep.class)); // project only steps.add(pico.getComponentByType(SynchronizeProjectPermissionsStep.class)); // project & views 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/step/DataCleanerStep.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/DataCleanerStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/step/DataCleanerStep.java index 9327464fd15..3badf649735 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/step/DataCleanerStep.java @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.step; import org.sonar.core.component.ComponentDto; import org.sonar.core.computation.db.AnalysisReportDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.purge.IdUuidPair; -import org.sonar.server.computation.dbcleaner.ProjectCleaner; +import org.sonar.core.computation.dbcleaner.ProjectCleaner; public class DataCleanerStep implements ComputationStep { private final ProjectCleaner projectCleaner; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ExperimentalAnalysisReportAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DigestReportStep.java similarity index 55% rename from server/sonar-server/src/main/java/org/sonar/server/computation/ws/ExperimentalAnalysisReportAction.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/step/DigestReportStep.java index 1b94feb5bbc..bf7b548f03c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ExperimentalAnalysisReportAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DigestReportStep.java @@ -18,26 +18,27 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.ws; +package org.sonar.server.computation.step; -import org.sonar.api.server.ws.Request; -import org.sonar.api.server.ws.RequestHandler; -import org.sonar.api.server.ws.Response; -import org.sonar.server.computation.DigestAnalysisReportStep; +import org.sonar.core.component.ComponentDto; +import org.sonar.core.computation.db.AnalysisReportDto; +import org.sonar.core.persistence.DbSession; +import org.sonar.server.computation.AnalysisReportService; -/** - * @since 5.0 - */ -public class ExperimentalAnalysisReportAction implements RequestHandler { - private final DigestAnalysisReportStep digestAnalysisReportStep; +public class DigestReportStep implements ComputationStep { + private final AnalysisReportService reportService; + + public DigestReportStep(AnalysisReportService reportService) { + this.reportService = reportService; + } - public ExperimentalAnalysisReportAction(DigestAnalysisReportStep digestAnalysisReportStep) { - this.digestAnalysisReportStep = digestAnalysisReportStep; + @Override + public void execute(DbSession session, AnalysisReportDto report, ComponentDto project) { + reportService.decompress(session, report.getId()); } @Override - public void handle(Request request, Response response) throws Exception { - String path = request.mandatoryParam("path"); - digestAnalysisReportStep.execute(path); + public String getDescription() { + return "Uncompress analysis report"; } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/IndexProjectIssuesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexProjectIssuesStep.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/IndexProjectIssuesStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexProjectIssuesStep.java index f7391b99638..f35471ccc1b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/IndexProjectIssuesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexProjectIssuesStep.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.step; import org.sonar.core.component.ComponentDto; import org.sonar.core.computation.db.AnalysisReportDto; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/InvalidatePreviewCacheStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/InvalidatePreviewCacheStep.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/InvalidatePreviewCacheStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/step/InvalidatePreviewCacheStep.java index fba5af6eb4e..fce06a49868 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/InvalidatePreviewCacheStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/InvalidatePreviewCacheStep.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.step; import org.sonar.core.component.ComponentDto; import org.sonar.core.computation.db.AnalysisReportDto; @@ -35,7 +35,7 @@ public class InvalidatePreviewCacheStep implements ComputationStep { } @Override - public void execute(DbSession session, AnalysisReportDto analysisReportDto, ComponentDto project) { + public void execute(DbSession session, AnalysisReportDto report, ComponentDto project) { propertiesDao.setProperty(newProjectPreviewCacheProperty(project), session); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/SwitchSnapshotStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/computation/SwitchSnapshotStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java index 23481749826..10530494ee3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/SwitchSnapshotStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.step; import org.sonar.core.component.ComponentDto; import org.sonar.core.component.SnapshotDto; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/SynchronizeProjectPermissionsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStep.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/computation/SynchronizeProjectPermissionsStep.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStep.java index e99f7cadb73..1b5151fdd73 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/SynchronizeProjectPermissionsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStep.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.step; import org.sonar.core.component.ComponentDto; import org.sonar.core.computation.db.AnalysisReportDto; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/package-info.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/step/package-info.java index f3a8c77da99..692cb8a3dc8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/dbcleaner/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/package-info.java @@ -19,6 +19,6 @@ */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.dbcleaner; +package org.sonar.server.computation.step; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ExperimentalAnalysisReportWebService.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ExperimentalAnalysisReportWebService.java deleted file mode 100644 index 02e8da654ec..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ExperimentalAnalysisReportWebService.java +++ /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. - */ - -package org.sonar.server.computation.ws; - -import org.sonar.api.server.ws.WebService; - -public class ExperimentalAnalysisReportWebService implements WebService { - public static final String API_ENDPOINT = "api/analysis_reports_experimental"; - - private final ExperimentalAnalysisReportAction action; - - public ExperimentalAnalysisReportWebService(ExperimentalAnalysisReportAction action) { - this.action = action; - } - - @Override - public void define(Context context) { - NewController controller = context - .createController(API_ENDPOINT) - .setDescription("Analysis reports processed"); - - NewAction action = controller - .createAction("digest") - .setDescription("Digest report - experimental feature only") - .setInternal(true) - .setHandler(this.action); - - action.createParam("path") - .setRequired(true) - .setDescription("full path"); - - controller.done(); - } -} 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 6f2cbd4be10..73eecdec782 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,6 +37,10 @@ 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.IndexPurgeListener; +import org.sonar.core.computation.dbcleaner.ProjectCleaner; +import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.core.config.CorePropertyDefinitions; import org.sonar.core.config.Logback; import org.sonar.core.i18n.DefaultI18n; @@ -87,11 +91,11 @@ import org.sonar.server.component.db.SnapshotDao; import org.sonar.server.component.ws.*; import org.sonar.server.computation.*; import org.sonar.server.computation.db.AnalysisReportDao; -import org.sonar.server.computation.dbcleaner.DefaultPurgeTask; -import org.sonar.server.computation.dbcleaner.IndexPurgeListener; -import org.sonar.server.computation.dbcleaner.ProjectCleaner; -import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; -import org.sonar.server.computation.ws.*; +import org.sonar.server.computation.step.*; +import org.sonar.server.computation.ws.ActiveAnalysisReportsAction; +import org.sonar.server.computation.ws.AnalysisReportHistorySearchAction; +import org.sonar.server.computation.ws.AnalysisReportWebService; +import org.sonar.server.computation.ws.IsAnalysisReportQueueEmptyAction; import org.sonar.server.config.ws.PropertiesWs; import org.sonar.server.dashboard.db.DashboardDao; import org.sonar.server.dashboard.db.WidgetDao; @@ -558,7 +562,6 @@ class ServerComponents { pico.addSingleton(SourceLineIndexDefinition.class); pico.addSingleton(SourceLineIndex.class); pico.addSingleton(SourceLineIndexer.class); - pico.addSingleton(IndexSourceLinesStep.class); // Duplications pico.addSingleton(DuplicationsParser.class); @@ -609,16 +612,15 @@ class ServerComponents { pico.addSingleton(ComputationService.class); pico.addSingleton(ComputationStepRegistry.class); pico.addSingletons(Lists.newArrayList( + DigestReportStep.class, SynchronizeProjectPermissionsStep.class, IndexProjectIssuesStep.class, + IndexSourceLinesStep.class, SwitchSnapshotStep.class, InvalidatePreviewCacheStep.class, ComponentIndexationInDatabaseStep.class, DataCleanerStep.class)); - pico.addSingletons(Lists.newArrayList( - DigestAnalysisReportStep.class, - ExperimentalAnalysisReportAction.class, - ExperimentalAnalysisReportWebService.class)); + pico.addSingleton(AnalysisReportService.class); pico.addSingleton(AnalysisReportQueue.class); pico.addSingleton(AnalysisReportTaskLauncher.class); pico.addSingleton(AnalysisReportWebService.class); diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/IndexSourceLinesStep.java b/server/sonar-server/src/main/java/org/sonar/server/source/IndexSourceLinesStep.java index a03d1ba5b23..48007770948 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/IndexSourceLinesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/IndexSourceLinesStep.java @@ -22,7 +22,7 @@ package org.sonar.server.source; import org.sonar.core.component.ComponentDto; import org.sonar.core.computation.db.AnalysisReportDto; import org.sonar.core.persistence.DbSession; -import org.sonar.server.computation.ComputationStep; +import org.sonar.server.computation.step.ComputationStep; import org.sonar.server.source.index.SourceLineIndexer; public class IndexSourceLinesStep implements ComputationStep { @@ -34,7 +34,7 @@ public class IndexSourceLinesStep implements ComputationStep { } @Override - public void execute(DbSession session, AnalysisReportDto analysisReportDto, ComponentDto project) { + public void execute(DbSession session, AnalysisReportDto report, ComponentDto project) { indexer.index(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/IndexPurgeListenerTest.java b/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/IndexPurgeListenerTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/IndexPurgeListenerTest.java rename to server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/IndexPurgeListenerTest.java index 5f34d84010e..461e8f31312 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/IndexPurgeListenerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/IndexPurgeListenerTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner; +package org.sonar.core.computation.dbcleaner; import org.junit.Test; import org.sonar.server.source.index.SourceLineIndexer; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectCleanerTest.java b/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/ProjectCleanerTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectCleanerTest.java rename to server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/ProjectCleanerTest.java index 31f8e024add..0cb24b9a9f7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectCleanerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/ProjectCleanerTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner; +package org.sonar.core.computation.dbcleaner; import org.junit.Before; import org.junit.Test; @@ -27,7 +27,7 @@ import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; import org.sonar.core.persistence.DbSession; import org.sonar.core.purge.*; -import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; +import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.server.issue.index.IssueIndex; import org.sonar.server.properties.ProjectSettingsFactory; import org.sonar.server.search.IndexClient; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportServiceTest.java new file mode 100644 index 00000000000..e8789dfd04b --- /dev/null +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportServiceTest.java @@ -0,0 +1,46 @@ +/* + * 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.server.computation; + +import org.junit.Test; +import org.sonar.core.persistence.DbSession; +import org.sonar.server.computation.db.AnalysisReportDao; +import org.sonar.server.db.DbClient; + +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.*; + +public class AnalysisReportServiceTest { + private AnalysisReportService sut; + private AnalysisReportDao dao; + + @Test + public void call_dao_to_decompress_report() throws Exception { + DbClient dbClient = mock(DbClient.class); + AnalysisReportDao dao = mock(AnalysisReportDao.class); + when(dbClient.analysisReportDao()).thenReturn(dao); + sut = new AnalysisReportService(dbClient); + + sut.decompress(mock(DbSession.class), 123L); + + verify(dao).getDecompressedReport(any(DbSession.class), eq(123L)); + } +} 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 304b6dff320..1d835f7d1fa 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 @@ -30,6 +30,8 @@ import org.sonar.core.persistence.DbSession; import org.sonar.server.activity.ActivityService; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; +import org.sonar.server.computation.step.ComputationStep; +import org.sonar.server.computation.step.ComputationStepRegistry; import org.sonar.server.db.DbClient; import static org.mockito.Matchers.any; 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 9b34915859a..20423d1a34d 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 @@ -298,7 +298,7 @@ public class AnalysisReportDaoTest { @Test public void insert_and_then_retrieve_report_data_with_uncompressed_files_medium_test() throws Exception { - //ARRANGE + // ARRANGE db.prepareDbUnit(getClass(), "empty.xml"); AnalysisReportDto report = newDefaultAnalysisReport(); InputStream zip = getClass().getResource("/org/sonar/server/computation/db/AnalysisReportDaoTest/zip.zip").openStream(); @@ -310,10 +310,10 @@ public class AnalysisReportDaoTest { session.commit(); IOUtils.closeQuietly(zip); - //ACT - sut.getUncompressedReport(session, 1L); + // ACT + sut.getDecompressedReport(session, 1L); - //ASSERT + // ASSERT assertThat(toDir.list()).hasSize(3); } @@ -333,7 +333,7 @@ public class AnalysisReportDaoTest { } private AnalysisReportDto newDefaultAnalysisReport() { - return new AnalysisReportDto() + return AnalysisReportDto.newForTests(1L) .setProjectKey(DEFAULT_PROJECT_KEY) .setSnapshotId(DEFAULT_SNAPSHOT_ID) .setData(null) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ComponentIndexationInDatabaseStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComponentIndexationInDatabaseStepTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/ComponentIndexationInDatabaseStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/step/ComponentIndexationInDatabaseStepTest.java index f390d38df6f..c690a8db37e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ComponentIndexationInDatabaseStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComponentIndexationInDatabaseStepTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.step; import org.junit.Before; import org.junit.Test; @@ -27,9 +27,7 @@ import org.sonar.core.computation.db.AnalysisReportDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.resource.ResourceIndexerDao; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class ComponentIndexationInDatabaseStepTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationStepRegistryMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepRegistryMediumTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/ComputationStepRegistryMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepRegistryMediumTest.java index c9085d3d9d4..a63e98f51bf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationStepRegistryMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepRegistryMediumTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.step; import com.google.common.collect.Lists; import org.junit.Before; @@ -44,6 +44,7 @@ public class ComputationStepRegistryMediumTest { public void before() { ComponentContainer pico = new ComponentContainer(); + pico.addSingleton(mock(DigestReportStep.class)); pico.addSingleton(mock(SynchronizeProjectPermissionsStep.class)); pico.addSingleton(mock(IndexProjectIssuesStep.class)); pico.addSingleton(mock(SwitchSnapshotStep.class)); @@ -58,6 +59,7 @@ public class ComputationStepRegistryMediumTest { @Test public void steps_returned_in_the_right_order() throws Exception { List> wishStepsClasses = Lists.newArrayList( + DigestReportStep.class, SynchronizeProjectPermissionsStep.class, SwitchSnapshotStep.class, InvalidatePreviewCacheStep.class, 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/step/DataCleanerStepMediumTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/DataCleanerStepMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/step/DataCleanerStepMediumTest.java index 15e560d0c25..69793cb1815 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/step/DataCleanerStepMediumTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.step; import org.junit.After; import org.junit.Before; @@ -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.server.computation.dbcleaner.DbCleanerConstants; -import org.sonar.server.computation.dbcleaner.ProjectCleaner; +import org.sonar.core.computation.dbcleaner.DbCleanerConstants; +import org.sonar.core.computation.dbcleaner.ProjectCleaner; 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/step/DataCleanerStepTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/DataCleanerStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/step/DataCleanerStepTest.java index e170e6f21db..72442f3f912 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/step/DataCleanerStepTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.step; import org.junit.Before; import org.junit.Test; @@ -26,7 +26,7 @@ import org.sonar.core.component.ComponentDto; import org.sonar.core.computation.db.AnalysisReportDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.purge.IdUuidPair; -import org.sonar.server.computation.dbcleaner.ProjectCleaner; +import org.sonar.core.computation.dbcleaner.ProjectCleaner; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/DigestReportStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/DigestReportStepTest.java new file mode 100644 index 00000000000..ee7f652b1dd --- /dev/null +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/DigestReportStepTest.java @@ -0,0 +1,48 @@ +/* + * 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.server.computation.step; + +import org.junit.Test; +import org.sonar.core.component.ComponentDto; +import org.sonar.core.computation.db.AnalysisReportDto; +import org.sonar.core.persistence.DbSession; +import org.sonar.server.computation.AnalysisReportService; + +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +public class DigestReportStepTest { + + private DigestReportStep sut; + + @Test + public void call_service_method() throws Exception { + AnalysisReportService service = mock(AnalysisReportService.class); + AnalysisReportDto report = AnalysisReportDto.newForTests(123L); + sut = new DigestReportStep(service); + + sut.execute(mock(DbSession.class), report, mock(ComponentDto.class)); + + verify(service).decompress(any(DbSession.class), eq(123L)); + } +} diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/InvalidatePreviewCacheStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/InvalidatePreviewCacheStepTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/computation/InvalidatePreviewCacheStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/step/InvalidatePreviewCacheStepTest.java index c43e5de145c..8b2aca12609 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/InvalidatePreviewCacheStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/InvalidatePreviewCacheStepTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.step; import org.junit.Before; import org.junit.Test; @@ -27,6 +27,7 @@ import org.sonar.core.computation.db.AnalysisReportDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.properties.PropertiesDao; import org.sonar.core.properties.PropertyDto; +import org.sonar.server.computation.step.InvalidatePreviewCacheStep; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/SwitchSnapshotStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/SwitchSnapshotStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java index 06723021332..eb7288fcbc2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/SwitchSnapshotStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation; +package org.sonar.server.computation.step; import org.junit.After; import org.junit.Before; @@ -33,6 +33,7 @@ import org.sonar.core.persistence.MyBatis; import org.sonar.core.persistence.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.SnapshotDao; +import org.sonar.server.computation.step.SwitchSnapshotStep; import org.sonar.test.DbTests; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/SynchronizeProjectPermissionsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStepTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/computation/SynchronizeProjectPermissionsStepTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStepTest.java index ad50de9069c..dc75cf5dafa 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/SynchronizeProjectPermissionsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStepTest.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.server.computation; +package org.sonar.server.computation.step; import org.junit.Test; +import org.sonar.server.computation.step.SynchronizeProjectPermissionsStep; import org.sonar.server.issue.index.IssueAuthorizationIndexer; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/SwitchSnapshotStepTest/empty.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/empty.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/SwitchSnapshotStepTest/empty.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/empty.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/SwitchSnapshotStepTest/snapshots-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/snapshots-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/SwitchSnapshotStepTest/snapshots-result.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/snapshots-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/SwitchSnapshotStepTest/snapshots.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/snapshots.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/SwitchSnapshotStepTest/snapshots.xml rename to server/sonar-server/src/test/resources/org/sonar/server/computation/step/SwitchSnapshotStepTest/snapshots.xml 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 a3bf5ed529e..8d0f2bfb00d 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.server.computation.dbcleaner.DefaultPurgeTask; -import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; +import org.sonar.core.computation.dbcleaner.DefaultPurgeTask; +import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.core.config.CorePropertyDefinitions; import java.util.Collection; diff --git a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DataCleanerProperties.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DataCleanerProperties.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DataCleanerProperties.java rename to sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DataCleanerProperties.java index 902a36350a3..f4bc98dea9a 100644 --- a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DataCleanerProperties.java +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DataCleanerProperties.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner; +package org.sonar.core.computation.dbcleaner; import org.sonar.api.CoreProperties; import org.sonar.api.PropertyType; diff --git a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DbCleanerConstants.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerConstants.java similarity index 97% rename from sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DbCleanerConstants.java rename to sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerConstants.java index fbd853e00bf..a577f632608 100644 --- a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DbCleanerConstants.java +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DbCleanerConstants.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner; +package org.sonar.core.computation.dbcleaner; public interface DbCleanerConstants { diff --git a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTask.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTask.java similarity index 97% rename from sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTask.java rename to sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTask.java index 4324aedd7eb..db8cb2ea33e 100644 --- a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTask.java +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTask.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner; +package org.sonar.core.computation.dbcleaner; import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; @@ -31,7 +31,7 @@ import org.sonar.core.purge.*; import org.sonar.core.resource.ResourceDao; import org.sonar.core.resource.ResourceDto; import org.sonar.plugins.dbcleaner.api.PurgeTask; -import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; +import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; import static org.sonar.core.purge.PurgeConfiguration.newDefaultPurgeConfiguration; diff --git a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/package-info.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java similarity index 94% rename from sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/package-info.java rename to sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java index 1f547e88740..8a7156fd308 100644 --- a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/package-info.java +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/package-info.java @@ -19,6 +19,6 @@ */ @ParametersAreNonnullByDefault -package org.sonar.server.computation.dbcleaner.period; +package org.sonar.core.computation.dbcleaner; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/DefaultPeriodCleaner.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleaner.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/DefaultPeriodCleaner.java rename to sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleaner.java index 0fcf5236ebf..e87214d4e0e 100644 --- a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/DefaultPeriodCleaner.java +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleaner.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner.period; +package org.sonar.core.computation.dbcleaner.period; import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; diff --git a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilter.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilter.java similarity index 96% rename from sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilter.java rename to sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilter.java index 83c8a9edf4b..25dcb409ea1 100644 --- a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilter.java +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilter.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner.period; +package org.sonar.core.computation.dbcleaner.period; import com.google.common.collect.Lists; import org.slf4j.LoggerFactory; diff --git a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filter.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filter.java similarity index 95% rename from sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filter.java rename to sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filter.java index c4bf00a1bd6..ef4a3753242 100644 --- a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filter.java +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filter.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner.period; +package org.sonar.core.computation.dbcleaner.period; import org.sonar.core.purge.PurgeableSnapshotDto; diff --git a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filters.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filters.java similarity index 95% rename from sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filters.java rename to sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filters.java index 929316c0a2b..8e59596212c 100644 --- a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Filters.java +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Filters.java @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner.period; +package org.sonar.core.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.server.computation.dbcleaner.DbCleanerConstants; +import org.sonar.core.computation.dbcleaner.DbCleanerConstants; import java.util.Calendar; import java.util.Date; diff --git a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Interval.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Interval.java similarity index 97% rename from sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Interval.java rename to sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Interval.java index a4ef804274b..5676a858495 100644 --- a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/Interval.java +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/Interval.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner.period; +package org.sonar.core.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/server/computation/dbcleaner/period/KeepOneFilter.java b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilter.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/KeepOneFilter.java rename to sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilter.java index 32bda2cca08..419add8383f 100644 --- a/sonar-core/src/main/java/org/sonar/server/computation/dbcleaner/period/KeepOneFilter.java +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilter.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner.period; +package org.sonar.core.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/core/computation/dbcleaner/period/package-info.java new file mode 100644 index 00000000000..283ef7fa912 --- /dev/null +++ b/sonar-core/src/main/java/org/sonar/core/computation/dbcleaner/period/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.core.computation.dbcleaner.period; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-core/src/main/java/org/sonar/core/computation/package-info.java b/sonar-core/src/main/java/org/sonar/core/computation/package-info.java new file mode 100644 index 00000000000..218db23b3fb --- /dev/null +++ b/sonar-core/src/main/java/org/sonar/core/computation/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.core.computation; + +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 0bb4bb69e0a..d10afcf4cf9 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.server.computation.dbcleaner.DataCleanerProperties; +import org.sonar.core.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 37886b30732..d3fc9c1c4bd 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.server.computation.dbcleaner.DbCleanerConstants; +import org.sonar.core.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 53fc44ede3a..8cad98c10c5 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.server.computation.dbcleaner.DbCleanerConstants { +public interface DbCleanerConstants extends org.sonar.core.computation.dbcleaner.DbCleanerConstants { } diff --git a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DataCleanerPropertiesTest.java b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DataCleanerPropertiesTest.java similarity index 95% rename from sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DataCleanerPropertiesTest.java rename to sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DataCleanerPropertiesTest.java index 645256d1e6f..da34eb61566 100644 --- a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DataCleanerPropertiesTest.java +++ b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DataCleanerPropertiesTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner; +package org.sonar.core.computation.dbcleaner; import org.junit.Test; diff --git a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DbCleanerTestUtils.java b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerTestUtils.java similarity index 97% rename from sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DbCleanerTestUtils.java rename to sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerTestUtils.java index 6a62915ebd8..392e58c0f0b 100644 --- a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DbCleanerTestUtils.java +++ b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DbCleanerTestUtils.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner; +package org.sonar.core.computation.dbcleaner; import org.sonar.api.utils.DateUtils; import org.sonar.core.purge.PurgeableSnapshotDto; diff --git a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTaskTest.java b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTaskTest.java similarity index 97% rename from sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTaskTest.java rename to sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTaskTest.java index 11060eebf10..d1b2c782187 100644 --- a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/DefaultPurgeTaskTest.java +++ b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/DefaultPurgeTaskTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner; +package org.sonar.core.computation.dbcleaner; import ch.qos.logback.classic.Logger; import org.junit.Before; @@ -30,7 +30,7 @@ import org.sonar.api.config.Settings; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; import org.sonar.core.purge.*; -import org.sonar.server.computation.dbcleaner.period.DefaultPeriodCleaner; +import org.sonar.core.computation.dbcleaner.period.DefaultPeriodCleaner; import org.sonar.core.resource.ResourceDao; import org.sonar.core.resource.ResourceDto; diff --git a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/DefaultPeriodCleanerTest.java b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleanerTest.java similarity index 98% rename from sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/DefaultPeriodCleanerTest.java rename to sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleanerTest.java index e5de5015e00..759dac500af 100644 --- a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/DefaultPeriodCleanerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DefaultPeriodCleanerTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner.period; +package org.sonar.core.computation.dbcleaner.period; import org.apache.commons.lang.ObjectUtils; import org.hamcrest.BaseMatcher; diff --git a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilterTest.java b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilterTest.java similarity index 93% rename from sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilterTest.java rename to sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilterTest.java index 6882a3868db..2a84512355e 100644 --- a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/DeleteAllFilterTest.java +++ b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/DeleteAllFilterTest.java @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner.period; +package org.sonar.core.computation.dbcleaner.period; import org.junit.Test; import org.sonar.api.utils.DateUtils; -import org.sonar.server.computation.dbcleaner.DbCleanerTestUtils; +import org.sonar.core.computation.dbcleaner.DbCleanerTestUtils; import org.sonar.core.purge.PurgeableSnapshotDto; import java.util.Arrays; diff --git a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/IntervalTest.java b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/IntervalTest.java similarity index 97% rename from sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/IntervalTest.java rename to sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/IntervalTest.java index 94a3edd2c10..c04bc36662d 100644 --- a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/IntervalTest.java +++ b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/IntervalTest.java @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner.period; +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.server.computation.dbcleaner.DbCleanerTestUtils; +import org.sonar.core.computation.dbcleaner.DbCleanerTestUtils; import java.util.Arrays; import java.util.Calendar; diff --git a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/KeepOneFilterTest.java b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilterTest.java similarity index 97% rename from sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/KeepOneFilterTest.java rename to sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilterTest.java index 58ffe5a230b..02d655767ae 100644 --- a/sonar-core/src/test/java/org/sonar/server/computation/dbcleaner/period/KeepOneFilterTest.java +++ b/sonar-core/src/test/java/org/sonar/core/computation/dbcleaner/period/KeepOneFilterTest.java @@ -18,14 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.computation.dbcleaner.period; +package org.sonar.core.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 org.sonar.core.computation.dbcleaner.DbCleanerTestUtils; import javax.annotation.Nullable; -- 2.39.5