From 57c01be1943a882a5a2fe0cc0fecab2fe75a861a Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 27 May 2015 09:38:17 +0200 Subject: [PATCH] SONAR-6370 move batch extensions out of core plugin Decorators temporarily moved to package org.sonar.batch.compute of sonar-batch. --- plugins/sonar-core-plugin/pom.xml | 6 --- .../org/sonar/plugins/core/CorePlugin.java | 52 ------------------- .../sonar/plugins/core/CorePluginTest.java | 2 +- .../batch/bootstrap/BatchComponents.java | 48 ++++++++++++++++- .../compute}/AbstractCoverageDecorator.java | 7 ++- .../AbstractNewCoverageFileAnalyzer.java | 22 ++++---- .../compute}/ApplyProjectRolesDecorator.java | 8 ++- .../compute}/BranchCoverageDecorator.java | 5 +- .../compute}/CommentDensityDecorator.java | 7 ++- .../CountFalsePositivesDecorator.java | 8 ++- .../CountUnresolvedIssuesDecorator.java | 35 ++++++++++--- .../batch/compute}/CoverageDecorator.java | 5 +- .../batch/compute}/DirectoriesDecorator.java | 5 +- .../sonar/batch/compute}/FilesDecorator.java | 5 +- .../compute}/ItBranchCoverageDecorator.java | 5 +- .../batch/compute}/ItCoverageDecorator.java | 5 +- .../compute}/ItLineCoverageDecorator.java | 5 +- .../batch/compute}/LineCoverageDecorator.java | 5 +- .../compute}/ManualMeasureDecorator.java | 5 +- .../batch/compute}/NewCoverageAggregator.java | 7 ++- .../compute}/NewCoverageFileAnalyzer.java | 5 +- .../compute}/NewItCoverageFileAnalyzer.java | 2 +- .../NewOverallCoverageFileAnalyzer.java | 2 +- .../OverallBranchCoverageDecorator.java | 5 +- .../compute}/OverallCoverageDecorator.java | 5 +- .../OverallLineCoverageDecorator.java | 5 +- .../sonar/batch/compute}/SeverityUtils.java | 2 +- .../TimeMachineConfigurationPersister.java | 11 ++-- .../batch/compute}/UnitTestDecorator.java | 9 ++-- .../batch/compute}/VariationDecorator.java | 29 +++++++---- .../sonar/batch/compute}/package-info.java | 3 +- .../ApplyProjectRolesDecoratorTest.java | 7 ++- .../compute}/BranchCoverageDecoratorTest.java | 2 +- .../compute}/CommentDensityDecoratorTest.java | 2 +- .../CountFalsePositivesDecoratorTest.java | 5 +- .../CountUnresolvedIssuesDecoratorTest.java | 33 ++++++++---- .../batch/compute}/CoverageDecoratorTest.java | 5 +- .../compute}/DirectoriesDecoratorTest.java | 7 ++- .../batch/compute}/FilesDecoratorTest.java | 5 +- .../ItBranchCoverageDecoratorTest.java | 2 +- .../compute}/ItCoverageDecoratorTest.java | 5 +- .../compute}/ItLineCoverageDecoratorTest.java | 5 +- .../compute}/LineCoverageDecoratorTest.java | 2 +- .../compute}/ManualMeasureDecoratorTest.java | 2 +- .../compute}/NewCoverageAggregatorTest.java | 21 ++++---- .../compute}/NewCoverageFileAnalyzerTest.java | 13 +++-- .../OverallBranchCoverageDecoratorTest.java | 2 +- .../OverallCoverageDecoratorTest.java | 5 +- .../OverallLineCoverageDecoratorTest.java | 5 +- ...TimeMachineConfigurationPersisterTest.java | 10 ++-- .../batch/compute}/UnitTestDecoratorTest.java | 5 +- .../compute}/VariationDecoratorTest.java | 14 +++-- .../measures/MeasuresMediumTest.java | 4 +- .../testCopyManualMeasures.xml | 0 .../shouldDeleteMissingLinks.xml | 0 .../shouldSaveLinks.xml | 0 .../shared.xml | 0 ...veConfigurationInSnapshotsTable-result.xml | 0 .../shared.xml | 0 ...rmanentIdFromReferenceViolation-result.xml | 0 .../shouldSaveViolations-result.xml | 0 .../ViolationTrackingTest/example1-v1.txt | 0 .../ViolationTrackingTest/example1-v2.txt | 0 .../ViolationTrackingTest/example2-v1.txt | 0 .../ViolationTrackingTest/example2-v2.txt | 0 65 files changed, 243 insertions(+), 243 deletions(-) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/AbstractCoverageDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine => sonar-batch/src/main/java/org/sonar/batch/compute}/AbstractNewCoverageFileAnalyzer.java (97%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security => sonar-batch/src/main/java/org/sonar/batch/compute}/ApplyProjectRolesDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/BranchCoverageDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/CommentDensityDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue => sonar-batch/src/main/java/org/sonar/batch/compute}/CountFalsePositivesDecorator.java (91%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue => sonar-batch/src/main/java/org/sonar/batch/compute}/CountUnresolvedIssuesDecorator.java (91%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/CoverageDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/DirectoriesDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/FilesDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/ItBranchCoverageDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/ItCoverageDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/ItLineCoverageDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/LineCoverageDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/ManualMeasureDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine => sonar-batch/src/main/java/org/sonar/batch/compute}/NewCoverageAggregator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine => sonar-batch/src/main/java/org/sonar/batch/compute}/NewCoverageFileAnalyzer.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine => sonar-batch/src/main/java/org/sonar/batch/compute}/NewItCoverageFileAnalyzer.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine => sonar-batch/src/main/java/org/sonar/batch/compute}/NewOverallCoverageFileAnalyzer.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/OverallBranchCoverageDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/OverallCoverageDecorator.java (99%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/OverallLineCoverageDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue => sonar-batch/src/main/java/org/sonar/batch/compute}/SeverityUtils.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine => sonar-batch/src/main/java/org/sonar/batch/compute}/TimeMachineConfigurationPersister.java (92%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors => sonar-batch/src/main/java/org/sonar/batch/compute}/UnitTestDecorator.java (98%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine => sonar-batch/src/main/java/org/sonar/batch/compute}/VariationDecorator.java (92%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine => sonar-batch/src/main/java/org/sonar/batch/compute}/package-info.java (95%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security => sonar-batch/src/test/java/org/sonar/batch/compute}/ApplyProjectRolesDecoratorTest.java (92%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/BranchCoverageDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/CommentDensityDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue => sonar-batch/src/test/java/org/sonar/batch/compute}/CountFalsePositivesDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue => sonar-batch/src/test/java/org/sonar/batch/compute}/CountUnresolvedIssuesDecoratorTest.java (95%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/CoverageDecoratorTest.java (99%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/DirectoriesDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/FilesDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/ItBranchCoverageDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/ItCoverageDecoratorTest.java (99%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/ItLineCoverageDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/LineCoverageDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/ManualMeasureDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine => sonar-batch/src/test/java/org/sonar/batch/compute}/NewCoverageAggregatorTest.java (90%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine => sonar-batch/src/test/java/org/sonar/batch/compute}/NewCoverageFileAnalyzerTest.java (99%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/OverallBranchCoverageDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/OverallCoverageDecoratorTest.java (99%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/OverallLineCoverageDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine => sonar-batch/src/test/java/org/sonar/batch/compute}/TimeMachineConfigurationPersisterTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors => sonar-batch/src/test/java/org/sonar/batch/compute}/UnitTestDecoratorTest.java (98%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine => sonar-batch/src/test/java/org/sonar/batch/compute}/VariationDecoratorTest.java (99%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors => sonar-batch/src/test/resources/org/sonar/batch/compute}/ManualMeasureDecoratorTest/testCopyManualMeasures.xml (100%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors => sonar-batch/src/test/resources/org/sonar/batch/compute}/ProjectLinksSensorTest/shouldDeleteMissingLinks.xml (100%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors => sonar-batch/src/test/resources/org/sonar/batch/compute}/ProjectLinksSensorTest/shouldSaveLinks.xml (100%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine => sonar-batch/src/test/resources/org/sonar/batch/compute}/TimeMachineConfigurationPersisterTest/shared.xml (100%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine => sonar-batch/src/test/resources/org/sonar/batch/compute}/TimeMachineConfigurationPersisterTest/shouldSaveConfigurationInSnapshotsTable-result.xml (100%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine => sonar-batch/src/test/resources/org/sonar/batch/compute}/ViolationPersisterDecoratorTest/shared.xml (100%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine => sonar-batch/src/test/resources/org/sonar/batch/compute}/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml (100%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine => sonar-batch/src/test/resources/org/sonar/batch/compute}/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml (100%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine => sonar-batch/src/test/resources/org/sonar/batch/compute}/ViolationTrackingTest/example1-v1.txt (100%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine => sonar-batch/src/test/resources/org/sonar/batch/compute}/ViolationTrackingTest/example1-v2.txt (100%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine => sonar-batch/src/test/resources/org/sonar/batch/compute}/ViolationTrackingTest/example2-v1.txt (100%) rename {plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine => sonar-batch/src/test/resources/org/sonar/batch/compute}/ViolationTrackingTest/example2-v2.txt (100%) diff --git a/plugins/sonar-core-plugin/pom.xml b/plugins/sonar-core-plugin/pom.xml index 3df82a92539..58ead2cf637 100644 --- a/plugins/sonar-core-plugin/pom.xml +++ b/plugins/sonar-core-plugin/pom.xml @@ -33,12 +33,6 @@ jfreechart provided - - org.codehaus.sonar - sonar-batch - ${project.version} - provided - org.apache.maven maven-plugin-api diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java index 0b1883d954b..cd0b8687a3c 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java @@ -26,30 +26,7 @@ import org.sonar.api.Properties; import org.sonar.api.Property; import org.sonar.api.PropertyType; import org.sonar.api.SonarPlugin; -import org.sonar.plugins.core.issue.CountFalsePositivesDecorator; -import org.sonar.plugins.core.issue.CountUnresolvedIssuesDecorator; import org.sonar.plugins.core.notifications.alerts.NewAlerts; -import org.sonar.plugins.core.security.ApplyProjectRolesDecorator; -import org.sonar.plugins.core.sensors.BranchCoverageDecorator; -import org.sonar.plugins.core.sensors.CommentDensityDecorator; -import org.sonar.plugins.core.sensors.CoverageDecorator; -import org.sonar.plugins.core.sensors.DirectoriesDecorator; -import org.sonar.plugins.core.sensors.FilesDecorator; -import org.sonar.plugins.core.sensors.ItBranchCoverageDecorator; -import org.sonar.plugins.core.sensors.ItCoverageDecorator; -import org.sonar.plugins.core.sensors.ItLineCoverageDecorator; -import org.sonar.plugins.core.sensors.LineCoverageDecorator; -import org.sonar.plugins.core.sensors.ManualMeasureDecorator; -import org.sonar.plugins.core.sensors.OverallBranchCoverageDecorator; -import org.sonar.plugins.core.sensors.OverallCoverageDecorator; -import org.sonar.plugins.core.sensors.OverallLineCoverageDecorator; -import org.sonar.plugins.core.sensors.UnitTestDecorator; -import org.sonar.plugins.core.timemachine.NewCoverageAggregator; -import org.sonar.plugins.core.timemachine.NewCoverageFileAnalyzer; -import org.sonar.plugins.core.timemachine.NewItCoverageFileAnalyzer; -import org.sonar.plugins.core.timemachine.NewOverallCoverageFileAnalyzer; -import org.sonar.plugins.core.timemachine.TimeMachineConfigurationPersister; -import org.sonar.plugins.core.timemachine.VariationDecorator; @Properties({ @Property( @@ -219,35 +196,6 @@ public final class CorePlugin extends SonarPlugin { DefaultResourceTypes.class, UserManagedMetrics.class, - // issues - CountUnresolvedIssuesDecorator.class, - CountFalsePositivesDecorator.class, - - // batch - UnitTestDecorator.class, - LineCoverageDecorator.class, - CoverageDecorator.class, - BranchCoverageDecorator.class, - ItLineCoverageDecorator.class, - ItCoverageDecorator.class, - ItBranchCoverageDecorator.class, - OverallLineCoverageDecorator.class, - OverallCoverageDecorator.class, - OverallBranchCoverageDecorator.class, - ApplyProjectRolesDecorator.class, - CommentDensityDecorator.class, - DirectoriesDecorator.class, - FilesDecorator.class, - ManualMeasureDecorator.class, - - // time machine - VariationDecorator.class, - TimeMachineConfigurationPersister.class, - NewCoverageFileAnalyzer.class, - NewItCoverageFileAnalyzer.class, - NewOverallCoverageFileAnalyzer.class, - NewCoverageAggregator.class, - // Notify alerts on my favourite projects NewAlerts.class, NewAlerts.newMetadata()); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/CorePluginTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/CorePluginTest.java index 0e312383c2c..f21fb3bbaca 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/CorePluginTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/CorePluginTest.java @@ -26,6 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat; public class CorePluginTest { @Test public void should_define_extensions() { - assertThat(new CorePlugin().getExtensions().size()).isGreaterThan(10); + assertThat(new CorePlugin().getExtensions().size()).isGreaterThan(2); } } 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 c584274eaf5..ba42319b7bd 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 @@ -23,6 +23,29 @@ import com.google.common.collect.Lists; import java.util.Collection; import java.util.List; import org.sonar.batch.components.TimeMachineConfiguration; +import org.sonar.batch.compute.ApplyProjectRolesDecorator; +import org.sonar.batch.compute.BranchCoverageDecorator; +import org.sonar.batch.compute.CommentDensityDecorator; +import org.sonar.batch.compute.CountFalsePositivesDecorator; +import org.sonar.batch.compute.CountUnresolvedIssuesDecorator; +import org.sonar.batch.compute.CoverageDecorator; +import org.sonar.batch.compute.DirectoriesDecorator; +import org.sonar.batch.compute.FilesDecorator; +import org.sonar.batch.compute.ItBranchCoverageDecorator; +import org.sonar.batch.compute.ItCoverageDecorator; +import org.sonar.batch.compute.ItLineCoverageDecorator; +import org.sonar.batch.compute.LineCoverageDecorator; +import org.sonar.batch.compute.ManualMeasureDecorator; +import org.sonar.batch.compute.NewCoverageAggregator; +import org.sonar.batch.compute.NewCoverageFileAnalyzer; +import org.sonar.batch.compute.NewItCoverageFileAnalyzer; +import org.sonar.batch.compute.NewOverallCoverageFileAnalyzer; +import org.sonar.batch.compute.OverallBranchCoverageDecorator; +import org.sonar.batch.compute.OverallCoverageDecorator; +import org.sonar.batch.compute.OverallLineCoverageDecorator; +import org.sonar.batch.compute.TimeMachineConfigurationPersister; +import org.sonar.batch.compute.UnitTestDecorator; +import org.sonar.batch.compute.VariationDecorator; import org.sonar.batch.cpd.CpdComponents; import org.sonar.batch.debt.DebtDecorator; import org.sonar.batch.debt.IssueChangelogDebtCalculator; @@ -103,8 +126,31 @@ public class BatchComponents { IssueHandlers.class, InitialOpenIssuesSensor.class, + // to be moved to compute engine QProfileEventsDecorator.class, - + CountUnresolvedIssuesDecorator.class, + CountFalsePositivesDecorator.class, + UnitTestDecorator.class, + LineCoverageDecorator.class, + CoverageDecorator.class, + BranchCoverageDecorator.class, + ItLineCoverageDecorator.class, + ItCoverageDecorator.class, + ItBranchCoverageDecorator.class, + OverallLineCoverageDecorator.class, + OverallCoverageDecorator.class, + OverallBranchCoverageDecorator.class, + ApplyProjectRolesDecorator.class, + CommentDensityDecorator.class, + DirectoriesDecorator.class, + FilesDecorator.class, + ManualMeasureDecorator.class, + VariationDecorator.class, + TimeMachineConfigurationPersister.class, + NewCoverageFileAnalyzer.class, + NewItCoverageFileAnalyzer.class, + NewOverallCoverageFileAnalyzer.class, + NewCoverageAggregator.class, TimeMachineConfiguration.class ); components.addAll(CorePropertyDefinitions.all()); diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AbstractCoverageDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/AbstractCoverageDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AbstractCoverageDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/AbstractCoverageDecorator.java index 8b287506247..4960f991ea2 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AbstractCoverageDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/AbstractCoverageDecorator.java @@ -17,8 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Arrays; +import java.util.Collection; import org.sonar.api.batch.Decorator; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependedUpon; @@ -28,9 +30,6 @@ import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.resources.ResourceUtils; -import java.util.Arrays; -import java.util.Collection; - public abstract class AbstractCoverageDecorator implements Decorator { @Override diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java b/sonar-batch/src/main/java/org/sonar/batch/compute/AbstractNewCoverageFileAnalyzer.java similarity index 97% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/AbstractNewCoverageFileAnalyzer.java index 35d8a3506e4..446c0820244 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/AbstractNewCoverageFileAnalyzer.java @@ -17,10 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.timemachine; +package org.sonar.batch.compute; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Nullable; import org.apache.commons.lang.ObjectUtils; import org.sonar.api.batch.Decorator; import org.sonar.api.batch.DecoratorBarriers; @@ -43,13 +48,6 @@ import org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset; import org.sonar.batch.protocol.output.BatchReportReader; import org.sonar.batch.report.ReportPublisher; -import javax.annotation.Nullable; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; - /** * @since 2.7 */ @@ -62,7 +60,7 @@ public abstract class AbstractNewCoverageFileAnalyzer implements Decorator { private final BatchComponentCache resourceCache; public AbstractNewCoverageFileAnalyzer(TimeMachineConfiguration timeMachineConfiguration, ReportPublisher publishReportJob, BatchComponentCache resourceCache) { - this(Lists.newArrayList(), publishReportJob, resourceCache); + this(new ArrayList(), publishReportJob, resourceCache); for (Period period : timeMachineConfiguration.periods()) { structs.add(new PeriodStruct(period.getIndex(), period.getDate())); } @@ -181,7 +179,7 @@ public abstract class AbstractNewCoverageFileAnalyzer implements Decorator { if (measure != null && measure.hasData()) { return KeyValueFormat.parseIntInt(measure.getData()); } - return Maps.newHashMap(); + return new HashMap<>(); } public static final class PeriodStruct { diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/ApplyProjectRolesDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/ApplyProjectRolesDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/ApplyProjectRolesDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/ApplyProjectRolesDecorator.java index c93eb0e1228..8861e1312f8 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/security/ApplyProjectRolesDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/ApplyProjectRolesDecorator.java @@ -17,21 +17,19 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.security; - -import org.sonar.api.batch.RequiresDB; +package org.sonar.batch.compute; import com.google.common.collect.ImmutableSet; +import java.util.Set; import org.slf4j.LoggerFactory; import org.sonar.api.batch.Decorator; import org.sonar.api.batch.DecoratorContext; +import org.sonar.api.batch.RequiresDB; import org.sonar.api.resources.Project; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Resource; import org.sonar.api.security.ResourcePermissions; -import java.util.Set; - @RequiresDB public class ApplyProjectRolesDecorator implements Decorator { diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/BranchCoverageDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/BranchCoverageDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/BranchCoverageDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/BranchCoverageDecorator.java index c154440ea39..637ea6eea44 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/BranchCoverageDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/BranchCoverageDecorator.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Collection; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependsUpon; import org.sonar.api.measures.CoreMetrics; @@ -26,8 +27,6 @@ import org.sonar.api.measures.MeasureUtils; import org.sonar.api.measures.Metric; import org.sonar.batch.sensor.coverage.CoverageConstants; -import java.util.Collection; - public final class BranchCoverageDecorator extends AbstractCoverageDecorator { @DependsUpon diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CommentDensityDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/CommentDensityDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CommentDensityDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/CommentDensityDecorator.java index 76a54e7da55..0379552ffad 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CommentDensityDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/CommentDensityDecorator.java @@ -17,8 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Arrays; +import java.util.List; import org.sonar.api.batch.Decorator; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependedUpon; @@ -30,9 +32,6 @@ import org.sonar.api.measures.Metric; import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; -import java.util.Arrays; -import java.util.List; - public class CommentDensityDecorator implements Decorator { @DependsUpon diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/CountFalsePositivesDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/CountFalsePositivesDecorator.java similarity index 91% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/CountFalsePositivesDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/CountFalsePositivesDecorator.java index c962544de24..1eb5456457d 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/CountFalsePositivesDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/CountFalsePositivesDecorator.java @@ -17,9 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.issue; +package org.sonar.batch.compute; -import org.sonar.api.batch.*; +import org.sonar.api.batch.Decorator; +import org.sonar.api.batch.DecoratorBarriers; +import org.sonar.api.batch.DecoratorContext; +import org.sonar.api.batch.DependedUpon; +import org.sonar.api.batch.DependsUpon; import org.sonar.api.component.ResourcePerspectives; import org.sonar.api.issue.Issuable; import org.sonar.api.issue.Issue; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/CountUnresolvedIssuesDecorator.java similarity index 91% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/CountUnresolvedIssuesDecorator.java index 1606b3aeaca..cd57819911a 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/CountUnresolvedIssuesDecorator.java @@ -17,16 +17,39 @@ * 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.plugins.core.issue; +package org.sonar.batch.compute; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.*; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.HashMultiset; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Maps; +import com.google.common.collect.Multiset; +import com.google.common.collect.Sets; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.annotation.Nullable; import org.apache.commons.lang.time.DateUtils; -import org.sonar.api.batch.*; +import org.sonar.api.batch.Decorator; +import org.sonar.api.batch.DecoratorBarriers; +import org.sonar.api.batch.DecoratorContext; +import org.sonar.api.batch.DependedUpon; +import org.sonar.api.batch.DependsUpon; +import org.sonar.api.batch.RequiresDB; import org.sonar.api.component.ResourcePerspectives; import org.sonar.api.issue.Issuable; import org.sonar.api.issue.Issue; -import org.sonar.api.measures.*; +import org.sonar.api.measures.CoreMetrics; +import org.sonar.api.measures.Measure; +import org.sonar.api.measures.MeasureUtils; +import org.sonar.api.measures.MeasuresFilters; +import org.sonar.api.measures.Metric; +import org.sonar.api.measures.RuleMeasure; import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.resources.ResourceUtils; @@ -35,10 +58,6 @@ import org.sonar.api.rules.RulePriority; import org.sonar.batch.components.Period; import org.sonar.batch.components.TimeMachineConfiguration; -import javax.annotation.Nullable; - -import java.util.*; - /** * Computes metrics related to number of issues. * diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CoverageDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/CoverageDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CoverageDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/CoverageDecorator.java index 0eb539f24b0..7d8bed2ab61 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CoverageDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/CoverageDecorator.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Collection; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependsUpon; import org.sonar.api.measures.CoreMetrics; @@ -26,8 +27,6 @@ import org.sonar.api.measures.MeasureUtils; import org.sonar.api.measures.Metric; import org.sonar.batch.sensor.coverage.CoverageConstants; -import java.util.Collection; - public final class CoverageDecorator extends AbstractCoverageDecorator { @DependsUpon diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/DirectoriesDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/DirectoriesDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/DirectoriesDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/DirectoriesDecorator.java index b8dddd4eb76..e1dc25e7740 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/DirectoriesDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/DirectoriesDecorator.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Collection; import org.sonar.api.batch.Decorator; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependedUpon; @@ -30,8 +31,6 @@ import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.resources.ResourceUtils; -import java.util.Collection; - /** * @since 2.2 */ diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/FilesDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/FilesDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/FilesDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/FilesDecorator.java index 67f16205b6b..27b0cbd07f8 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/FilesDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/FilesDecorator.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Collection; import org.sonar.api.batch.Decorator; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependedUpon; @@ -29,8 +30,6 @@ import org.sonar.api.measures.Metric; import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; -import java.util.Collection; - /** * @since 2.2 */ diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ItBranchCoverageDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/ItBranchCoverageDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ItBranchCoverageDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/ItBranchCoverageDecorator.java index eb515e363a5..926a34df070 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ItBranchCoverageDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/ItBranchCoverageDecorator.java @@ -17,17 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import com.google.common.collect.ImmutableList; +import java.util.List; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependsUpon; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.MeasureUtils; import org.sonar.api.measures.Metric; -import java.util.List; - public final class ItBranchCoverageDecorator extends AbstractCoverageDecorator { @DependsUpon diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ItCoverageDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/ItCoverageDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ItCoverageDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/ItCoverageDecorator.java index 9b2d990b48c..4d99b759170 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ItCoverageDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/ItCoverageDecorator.java @@ -17,17 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import com.google.common.collect.ImmutableList; +import java.util.Collection; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependsUpon; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.MeasureUtils; import org.sonar.api.measures.Metric; -import java.util.Collection; - public final class ItCoverageDecorator extends AbstractCoverageDecorator { @DependsUpon diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ItLineCoverageDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/ItLineCoverageDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ItLineCoverageDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/ItLineCoverageDecorator.java index f829393180e..dddddd0aac4 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ItLineCoverageDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/ItLineCoverageDecorator.java @@ -17,17 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import com.google.common.collect.ImmutableList; +import java.util.List; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependsUpon; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.MeasureUtils; import org.sonar.api.measures.Metric; -import java.util.List; - public final class ItLineCoverageDecorator extends AbstractCoverageDecorator { @DependsUpon diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/LineCoverageDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/LineCoverageDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/LineCoverageDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/LineCoverageDecorator.java index ebc29af0023..71c6a034ac6 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/LineCoverageDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/LineCoverageDecorator.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Collection; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependsUpon; import org.sonar.api.measures.CoreMetrics; @@ -26,8 +27,6 @@ import org.sonar.api.measures.MeasureUtils; import org.sonar.api.measures.Metric; import org.sonar.batch.sensor.coverage.CoverageConstants; -import java.util.Collection; - public final class LineCoverageDecorator extends AbstractCoverageDecorator { @DependsUpon diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ManualMeasureDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/ManualMeasureDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ManualMeasureDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/ManualMeasureDecorator.java index a62c1af9748..94346b30b8f 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ManualMeasureDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/ManualMeasureDecorator.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.List; import org.sonar.api.batch.Decorator; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.Phase; @@ -31,8 +32,6 @@ import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.jpa.entity.ManualMeasure; -import java.util.List; - import static com.google.common.base.Preconditions.checkState; @Phase(name = Phase.Name.PRE) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageAggregator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/NewCoverageAggregator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageAggregator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/NewCoverageAggregator.java index 70735e66566..1923d5211a6 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageAggregator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/NewCoverageAggregator.java @@ -17,8 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.timemachine; +package org.sonar.batch.compute; +import java.util.Arrays; +import java.util.List; import org.apache.commons.lang.ArrayUtils; import org.sonar.api.batch.Decorator; import org.sonar.api.batch.DecoratorBarriers; @@ -32,9 +34,6 @@ import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Resource; import org.sonar.api.resources.Scopes; -import java.util.Arrays; -import java.util.List; - @DependedUpon(DecoratorBarriers.END_OF_TIME_MACHINE) public final class NewCoverageAggregator implements Decorator { diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzer.java b/sonar-batch/src/main/java/org/sonar/batch/compute/NewCoverageFileAnalyzer.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzer.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/NewCoverageFileAnalyzer.java index 79f028966cd..ba36d5b782b 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/NewCoverageFileAnalyzer.java @@ -17,16 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.timemachine; +package org.sonar.batch.compute; +import java.util.List; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; import org.sonar.batch.components.TimeMachineConfiguration; import org.sonar.batch.index.BatchComponentCache; import org.sonar.batch.report.ReportPublisher; -import java.util.List; - public class NewCoverageFileAnalyzer extends AbstractNewCoverageFileAnalyzer { public NewCoverageFileAnalyzer(TimeMachineConfiguration timeMachineConfiguration, ReportPublisher publishReportJob, BatchComponentCache resourceCache) { diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewItCoverageFileAnalyzer.java b/sonar-batch/src/main/java/org/sonar/batch/compute/NewItCoverageFileAnalyzer.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewItCoverageFileAnalyzer.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/NewItCoverageFileAnalyzer.java index 2aacf34a9bd..48d62305706 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewItCoverageFileAnalyzer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/NewItCoverageFileAnalyzer.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.timemachine; +package org.sonar.batch.compute; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewOverallCoverageFileAnalyzer.java b/sonar-batch/src/main/java/org/sonar/batch/compute/NewOverallCoverageFileAnalyzer.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewOverallCoverageFileAnalyzer.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/NewOverallCoverageFileAnalyzer.java index f80da9470bb..1c2688c6243 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewOverallCoverageFileAnalyzer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/NewOverallCoverageFileAnalyzer.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.timemachine; +package org.sonar.batch.compute; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallBranchCoverageDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/OverallBranchCoverageDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallBranchCoverageDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/OverallBranchCoverageDecorator.java index 2407269613a..271cfcd795f 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallBranchCoverageDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/OverallBranchCoverageDecorator.java @@ -17,17 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import com.google.common.collect.ImmutableList; +import java.util.List; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependsUpon; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.MeasureUtils; import org.sonar.api.measures.Metric; -import java.util.List; - public final class OverallBranchCoverageDecorator extends AbstractCoverageDecorator { @DependsUpon diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallCoverageDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/OverallCoverageDecorator.java similarity index 99% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallCoverageDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/OverallCoverageDecorator.java index 49602e6c04a..c4a4d037770 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallCoverageDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/OverallCoverageDecorator.java @@ -17,17 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import com.google.common.collect.ImmutableList; +import java.util.Collection; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependsUpon; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.MeasureUtils; import org.sonar.api.measures.Metric; -import java.util.Collection; - public final class OverallCoverageDecorator extends AbstractCoverageDecorator { @DependsUpon diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/OverallLineCoverageDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/OverallLineCoverageDecorator.java index c6f53a2aaac..a41440e6314 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/OverallLineCoverageDecorator.java @@ -17,17 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import com.google.common.collect.ImmutableList; +import java.util.List; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependsUpon; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.MeasureUtils; import org.sonar.api.measures.Metric; -import java.util.List; - public final class OverallLineCoverageDecorator extends AbstractCoverageDecorator { @DependsUpon diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/SeverityUtils.java b/sonar-batch/src/main/java/org/sonar/batch/compute/SeverityUtils.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/SeverityUtils.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/SeverityUtils.java index e1a1d5ba19c..fd92039ce98 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/SeverityUtils.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/SeverityUtils.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.issue; +package org.sonar.batch.compute; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersister.java b/sonar-batch/src/main/java/org/sonar/batch/compute/TimeMachineConfigurationPersister.java similarity index 92% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersister.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/TimeMachineConfigurationPersister.java index 7427654f1bc..1255c64a35f 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersister.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/TimeMachineConfigurationPersister.java @@ -17,9 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.timemachine; +package org.sonar.batch.compute; -import org.sonar.api.batch.*; +import java.util.List; +import org.sonar.api.batch.Decorator; +import org.sonar.api.batch.DecoratorBarriers; +import org.sonar.api.batch.DecoratorContext; +import org.sonar.api.batch.DependedUpon; +import org.sonar.api.batch.RequiresDB; import org.sonar.api.database.DatabaseSession; import org.sonar.api.database.model.Snapshot; import org.sonar.api.resources.Project; @@ -29,8 +34,6 @@ import org.sonar.batch.components.PastSnapshot; import org.sonar.batch.components.TimeMachineConfiguration; import org.sonar.batch.index.BatchComponentCache; -import java.util.List; - import static org.sonar.api.utils.DateUtils.dateToLong; @DependedUpon(DecoratorBarriers.END_OF_TIME_MACHINE) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UnitTestDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/UnitTestDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UnitTestDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/UnitTestDecorator.java index 7e4680f20f9..3f5d641af0c 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UnitTestDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/UnitTestDecorator.java @@ -17,8 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; import org.sonar.api.batch.Decorator; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.batch.DependedUpon; @@ -30,10 +33,6 @@ import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.resources.ResourceUtils; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - public class UnitTestDecorator implements Decorator { @DependedUpon diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/VariationDecorator.java similarity index 92% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/VariationDecorator.java index 36e525ecfb1..f3885ef3f8c 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/VariationDecorator.java @@ -17,12 +17,25 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.timemachine; +package org.sonar.batch.compute; -import com.google.common.collect.Maps; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; -import org.sonar.api.batch.*; -import org.sonar.api.measures.*; +import org.sonar.api.batch.Decorator; +import org.sonar.api.batch.DecoratorBarriers; +import org.sonar.api.batch.DecoratorContext; +import org.sonar.api.batch.DependedUpon; +import org.sonar.api.batch.DependsUpon; +import org.sonar.api.batch.RequiresDB; +import org.sonar.api.measures.Measure; +import org.sonar.api.measures.MeasuresFilters; +import org.sonar.api.measures.Metric; +import org.sonar.api.measures.MetricFinder; +import org.sonar.api.measures.RuleMeasure; import org.sonar.api.resources.Project; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Resource; @@ -34,12 +47,6 @@ import org.sonar.batch.components.PastMeasuresLoader; import org.sonar.batch.components.PastSnapshot; import org.sonar.batch.components.TimeMachineConfiguration; -import javax.annotation.Nullable; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - @DependedUpon(DecoratorBarriers.END_OF_TIME_MACHINE) @RequiresDB public class VariationDecorator implements Decorator { @@ -94,7 +101,7 @@ public class VariationDecorator implements Decorator { } private void compareWithPastMeasures(DecoratorContext context, int index, List pastMeasures) { - Map pastMeasuresByKey = Maps.newHashMap(); + Map pastMeasuresByKey = new HashMap<>(); for (Object[] pastMeasure : pastMeasures) { pastMeasuresByKey.put(new MeasureKey(pastMeasure), pastMeasure); } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/package-info.java b/sonar-batch/src/main/java/org/sonar/batch/compute/package-info.java similarity index 95% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/package-info.java rename to sonar-batch/src/main/java/org/sonar/batch/compute/package-info.java index 8d487ae9500..7fd21f3ba7c 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/package-info.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/package-info.java @@ -18,6 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.plugins.core.timemachine; +package org.sonar.batch.compute; import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security/ApplyProjectRolesDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/ApplyProjectRolesDecoratorTest.java similarity index 92% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security/ApplyProjectRolesDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/ApplyProjectRolesDecoratorTest.java index dd551860aa7..cd48e6a315f 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/security/ApplyProjectRolesDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/ApplyProjectRolesDecoratorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.security; +package org.sonar.batch.compute; import org.junit.Before; import org.junit.Test; @@ -25,7 +25,10 @@ import org.sonar.api.resources.Project; import org.sonar.api.security.ResourcePermissions; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class ApplyProjectRolesDecoratorTest { diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/BranchCoverageDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/BranchCoverageDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/BranchCoverageDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/BranchCoverageDecoratorTest.java index 6c88fb9aceb..a7f9e098376 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/BranchCoverageDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/BranchCoverageDecoratorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import org.junit.Before; import org.junit.Test; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CommentDensityDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/CommentDensityDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CommentDensityDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/CommentDensityDecoratorTest.java index eae51007721..dadbb945e90 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CommentDensityDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/CommentDensityDecoratorTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/CountFalsePositivesDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/CountFalsePositivesDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/CountFalsePositivesDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/CountFalsePositivesDecoratorTest.java index 28327ac5954..37eea57e8e6 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/CountFalsePositivesDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/CountFalsePositivesDecoratorTest.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.issue; +package org.sonar.batch.compute; +import java.util.Arrays; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.component.ResourcePerspectives; @@ -31,8 +32,6 @@ import org.sonar.api.resources.Project; import org.sonar.api.rule.RuleKey; import org.sonar.java.api.JavaClass; -import java.util.Arrays; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/CountUnresolvedIssuesDecoratorTest.java similarity index 95% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/CountUnresolvedIssuesDecoratorTest.java index ebd2b99b553..8473e0a3da7 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/CountUnresolvedIssuesDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/CountUnresolvedIssuesDecoratorTest.java @@ -18,12 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.issue; +package org.sonar.batch.compute; -import org.sonar.batch.components.Period; - -import org.sonar.batch.components.TimeMachineConfiguration; import com.google.common.collect.Lists; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.List; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.time.DateUtils; import org.junit.Before; @@ -34,7 +35,11 @@ import org.sonar.api.component.ResourcePerspectives; import org.sonar.api.issue.Issuable; import org.sonar.api.issue.Issue; import org.sonar.api.issue.internal.DefaultIssue; -import org.sonar.api.measures.*; +import org.sonar.api.measures.CoreMetrics; +import org.sonar.api.measures.Measure; +import org.sonar.api.measures.MeasuresFilter; +import org.sonar.api.measures.Metric; +import org.sonar.api.measures.RuleMeasure; import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.resources.Scopes; @@ -43,15 +48,21 @@ import org.sonar.api.rule.Severity; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RulePriority; import org.sonar.api.test.IsRuleMeasure; - -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.List; +import org.sonar.batch.components.Period; +import org.sonar.batch.components.TimeMachineConfiguration; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyDouble; +import static org.mockito.Mockito.argThat; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.when; public class CountUnresolvedIssuesDecoratorTest { diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CoverageDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/CoverageDecoratorTest.java similarity index 99% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CoverageDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/CoverageDecoratorTest.java index 0404cded7a1..5994f3e72e6 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CoverageDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/CoverageDecoratorTest.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Collection; import org.junit.Before; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; @@ -28,8 +29,6 @@ import org.sonar.api.measures.Metric; import org.sonar.api.resources.Project; import org.sonar.api.resources.Scopes; -import java.util.Collection; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.eq; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/DirectoriesDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/DirectoriesDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/DirectoriesDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/DirectoriesDecoratorTest.java index 01524877fb1..5e854bc9913 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/DirectoriesDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/DirectoriesDecoratorTest.java @@ -17,8 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Arrays; +import java.util.Collections; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.measures.CoreMetrics; @@ -28,9 +30,6 @@ import org.sonar.api.resources.File; import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; -import java.util.Arrays; -import java.util.Collections; - import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/FilesDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/FilesDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/FilesDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/FilesDecoratorTest.java index 76cb6ab8c82..f750aebcdde 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/FilesDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/FilesDecoratorTest.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Arrays; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -32,8 +33,6 @@ import org.sonar.api.resources.Project; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Resource; -import java.util.Arrays; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.eq; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItBranchCoverageDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/ItBranchCoverageDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItBranchCoverageDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/ItBranchCoverageDecoratorTest.java index 14ba49d0432..0e5b70a37e3 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItBranchCoverageDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/ItBranchCoverageDecoratorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import org.junit.Before; import org.junit.Test; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItCoverageDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/ItCoverageDecoratorTest.java similarity index 99% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItCoverageDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/ItCoverageDecoratorTest.java index 08a82034a43..839577fb1aa 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItCoverageDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/ItCoverageDecoratorTest.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Collection; import org.junit.Before; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; @@ -28,8 +29,6 @@ import org.sonar.api.measures.Metric; import org.sonar.api.resources.Project; import org.sonar.api.resources.Scopes; -import java.util.Collection; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.eq; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItLineCoverageDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/ItLineCoverageDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItLineCoverageDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/ItLineCoverageDecoratorTest.java index 976b0442ac6..95e7177b840 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItLineCoverageDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/ItLineCoverageDecoratorTest.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; @@ -28,8 +29,6 @@ import org.sonar.api.measures.Metric; import org.sonar.api.resources.Project; import org.sonar.api.resources.Scopes; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.eq; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/LineCoverageDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/LineCoverageDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/LineCoverageDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/LineCoverageDecoratorTest.java index 3381182889f..2a49f83aaf4 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/LineCoverageDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/LineCoverageDecoratorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import org.junit.Before; import org.junit.Test; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ManualMeasureDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/ManualMeasureDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ManualMeasureDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/ManualMeasureDecoratorTest.java index 02793e1160c..bd86438ad05 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ManualMeasureDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/ManualMeasureDecoratorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageAggregatorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/NewCoverageAggregatorTest.java similarity index 90% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageAggregatorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/NewCoverageAggregatorTest.java index c85e24dcc81..7951e3a7add 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageAggregatorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/NewCoverageAggregatorTest.java @@ -17,8 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.timemachine; +package org.sonar.batch.compute; +import java.util.Arrays; +import java.util.Collections; import org.junit.Test; import org.mockito.ArgumentMatcher; import org.mockito.Matchers; @@ -26,9 +28,6 @@ import org.sonar.api.batch.DecoratorContext; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Measure; -import java.util.Arrays; -import java.util.Collections; - import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -59,8 +58,8 @@ public class NewCoverageAggregatorTest { verify(context).saveMeasure(argThat(new ArgumentMatcher() { @Override public boolean matches(Object o) { - Measure m = (Measure)o; - return m.getVariation1()==null; + Measure m = (Measure) o; + return m.getVariation1() == null; } })); } @@ -76,16 +75,16 @@ public class NewCoverageAggregatorTest { verify(context).saveMeasure(argThat(new ArgumentMatcher() { @Override public boolean matches(Object o) { - Measure m = (Measure)o; - return m.getVariation2()==16.0 && m.getVariation3()==2.0; + Measure m = (Measure) o; + return m.getVariation2() == 16.0 && m.getVariation3() == 2.0; } })); } private Measure newMeasure(Double variation1, Double variation2, Double variation3) { return new Measure(CoreMetrics.NEW_LINES_TO_COVER) - .setVariation1(variation1) - .setVariation2(variation2) - .setVariation3(variation3); + .setVariation1(variation1) + .setVariation2(variation2) + .setVariation3(variation3); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzerTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/NewCoverageFileAnalyzerTest.java similarity index 99% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzerTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/NewCoverageFileAnalyzerTest.java index adc6f087b44..6deb673fa50 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzerTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/NewCoverageFileAnalyzerTest.java @@ -17,8 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.timemachine; +package org.sonar.batch.compute; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.List; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -37,12 +42,6 @@ import org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset; import org.sonar.batch.protocol.output.BatchReportWriter; import org.sonar.batch.report.ReportPublisher; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.mock; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallBranchCoverageDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/OverallBranchCoverageDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallBranchCoverageDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/OverallBranchCoverageDecoratorTest.java index 9f18f71df70..9c5e585c969 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallBranchCoverageDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/OverallBranchCoverageDecoratorTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; import org.junit.Before; import org.junit.Test; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallCoverageDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/OverallCoverageDecoratorTest.java similarity index 99% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallCoverageDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/OverallCoverageDecoratorTest.java index 9aa79b1bbfb..d694227c754 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallCoverageDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/OverallCoverageDecoratorTest.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Collection; import org.junit.Before; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; @@ -28,8 +29,6 @@ import org.sonar.api.measures.Metric; import org.sonar.api.resources.Project; import org.sonar.api.resources.Scopes; -import java.util.Collection; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.eq; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/OverallLineCoverageDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/OverallLineCoverageDecoratorTest.java index c19e51755dd..17d54526a35 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/OverallLineCoverageDecoratorTest.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; @@ -28,8 +29,6 @@ import org.sonar.api.measures.Metric; import org.sonar.api.resources.Project; import org.sonar.api.resources.Scopes; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.eq; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersisterTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/TimeMachineConfigurationPersisterTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersisterTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/TimeMachineConfigurationPersisterTest.java index ca8c36a51cd..2c48e9c6614 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersisterTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/TimeMachineConfigurationPersisterTest.java @@ -17,20 +17,18 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.timemachine; +package org.sonar.batch.compute; -import org.sonar.batch.components.TimeMachineConfiguration; - -import org.sonar.batch.components.PastSnapshot; +import java.util.Arrays; import org.junit.Test; import org.sonar.api.database.model.Snapshot; import org.sonar.api.resources.Project; import org.sonar.api.utils.DateUtils; +import org.sonar.batch.components.PastSnapshot; +import org.sonar.batch.components.TimeMachineConfiguration; import org.sonar.batch.index.BatchComponentCache; import org.sonar.jpa.test.AbstractDbUnitTestCase; -import java.util.Arrays; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/UnitTestDecoratorTest.java similarity index 98% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/UnitTestDecoratorTest.java index 966b6475ca9..eb9bd93a4d1 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/UnitTestDecoratorTest.java @@ -17,8 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.sensors; +package org.sonar.batch.compute; +import java.util.Arrays; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; @@ -28,8 +29,6 @@ import org.sonar.api.measures.Measure; import org.sonar.api.measures.Metric; import org.sonar.api.resources.Project; -import java.util.Arrays; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.doubleThat; import static org.mockito.Matchers.eq; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/VariationDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/VariationDecoratorTest.java similarity index 99% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/VariationDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/compute/VariationDecoratorTest.java index 223abadcbac..21f26e09090 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/VariationDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/compute/VariationDecoratorTest.java @@ -17,12 +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.plugins.core.timemachine; +package org.sonar.batch.compute; -import org.sonar.batch.components.TimeMachineConfiguration; - -import org.sonar.batch.components.PastSnapshot; -import org.sonar.batch.components.PastMeasuresLoader; +import java.util.Arrays; +import java.util.Date; import org.junit.Test; import org.mockito.Matchers; import org.sonar.api.batch.DecoratorContext; @@ -37,11 +35,11 @@ import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RuleFinder; +import org.sonar.batch.components.PastMeasuresLoader; +import org.sonar.batch.components.PastSnapshot; +import org.sonar.batch.components.TimeMachineConfiguration; import org.sonar.jpa.test.AbstractDbUnitTestCase; -import java.util.Arrays; -import java.util.Date; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java index 41bdd9c67df..8d24834d97b 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java @@ -66,7 +66,7 @@ public class MeasuresMediumTest { .newScanTask(new File(projectDir, "sonar-project.properties")) .start(); - assertThat(result.allMeasures()).hasSize(61); + assertThat(result.allMeasures()).hasSize(90); } @Test @@ -93,7 +93,7 @@ public class MeasuresMediumTest { .build()) .start(); - assertThat(result.allMeasures()).hasSize(25); + assertThat(result.allMeasures()).hasSize(33); assertThat(result.allMeasures()).contains(new DefaultMeasure() .forMetric(CoreMetrics.LINES) diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ManualMeasureDecoratorTest/testCopyManualMeasures.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ManualMeasureDecoratorTest/testCopyManualMeasures.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ManualMeasureDecoratorTest/testCopyManualMeasures.xml rename to sonar-batch/src/test/resources/org/sonar/batch/compute/ManualMeasureDecoratorTest/testCopyManualMeasures.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ProjectLinksSensorTest/shouldDeleteMissingLinks.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldDeleteMissingLinks.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ProjectLinksSensorTest/shouldDeleteMissingLinks.xml rename to sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldDeleteMissingLinks.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ProjectLinksSensorTest/shouldSaveLinks.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldSaveLinks.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/sensors/ProjectLinksSensorTest/shouldSaveLinks.xml rename to sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldSaveLinks.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersisterTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/TimeMachineConfigurationPersisterTest/shared.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersisterTest/shared.xml rename to sonar-batch/src/test/resources/org/sonar/batch/compute/TimeMachineConfigurationPersisterTest/shared.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersisterTest/shouldSaveConfigurationInSnapshotsTable-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/TimeMachineConfigurationPersisterTest/shouldSaveConfigurationInSnapshotsTable-result.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersisterTest/shouldSaveConfigurationInSnapshotsTable-result.xml rename to sonar-batch/src/test/resources/org/sonar/batch/compute/TimeMachineConfigurationPersisterTest/shouldSaveConfigurationInSnapshotsTable-result.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shared.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shared.xml rename to sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shared.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml rename to sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml rename to sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationTrackingTest/example1-v1.txt b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example1-v1.txt similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationTrackingTest/example1-v1.txt rename to sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example1-v1.txt diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationTrackingTest/example1-v2.txt b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example1-v2.txt similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationTrackingTest/example1-v2.txt rename to sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example1-v2.txt diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationTrackingTest/example2-v1.txt b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example2-v1.txt similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationTrackingTest/example2-v1.txt rename to sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example2-v1.txt diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationTrackingTest/example2-v2.txt b/sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example2-v2.txt similarity index 100% rename from plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationTrackingTest/example2-v2.txt rename to sonar-batch/src/test/resources/org/sonar/batch/compute/ViolationTrackingTest/example2-v2.txt -- 2.39.5