From f2dd46cf5745f7c14f2bce20f5131e4e242f8c7c Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Thu, 17 Apr 2014 23:33:27 +0200 Subject: [PATCH] SONAR-4969 Do not mix batch and server classpaths --- .../org/sonar/plugins/core/CorePlugin.java | 142 ++++++++---------- .../sensors/CoverageMeasurementFilter.java | 30 +--- .../core/technicaldebt/package-info.java | 23 --- .../plugins/core/ExclusionPropertiesTest.java | 36 ----- .../CoverageMeasurementFilterTest.java | 7 +- plugins/sonar-maven-batch-plugin/pom.xml | 76 ---------- .../sonar/plugins/maven/MavenBatchPlugin.java | 32 ---- pom.xml | 1 - sonar-application/assembly.xml | 8 + sonar-application/pom.xml | 17 +-- sonar-batch-maven-compat/pom.xml | 22 +-- sonar-batch/pom.xml | 13 +- .../batch/bootstrap/BatchComponents.java | 47 ++++++ .../batch/bootstrap/ExtensionInstaller.java | 7 + .../sonar/batch/bootstrap/TaskContainer.java | 3 +- .../batch/components/PastSnapshotFinder.java | 61 -------- .../org/sonar/batch/debt}/DebtDecorator.java | 32 ++-- .../sonar/batch/debt}/NewDebtDecorator.java | 2 +- .../pattern/AbstractPatternInitializer.java | 6 +- .../IssueExclusionPatternInitializer.java | 25 ++- .../IssueInclusionPatternInitializer.java | 4 +- .../maven/DefaultMavenPluginExecutor.java | 3 +- .../maven/MavenProjectBootstrapper.java | 2 +- .../batch}/maven/MavenProjectBuilder.java | 2 +- .../batch}/maven/MavenProjectConverter.java | 3 +- .../org/sonar/batch}/maven/package-info.java | 2 +- .../sonar/batch/scan/ModuleScanContainer.java | 3 +- .../batch/scan/ProjectScanContainer.java | 3 +- .../sonar/batch/debt}/DebtDecoratorTest.java | 22 +-- .../batch/debt}/NewDebtDecoratorTest.java | 3 +- .../IssueExclusionsConfigurationTest.java | 33 ---- .../IssueExclusionPatternInitializerTest.java | 58 +++---- .../IssueInclusionPatternInitializerTest.java | 17 +-- .../maven/DefaultMavenPluginExecutorTest.java | 2 +- .../maven/MavenProjectBootstrapperTest.java | 2 +- .../maven/MavenProjectConverterTest.java | 34 ++--- .../maven/SonarMavenProjectBuilderTest.java | 2 +- .../module/pom.xml | 0 .../module/pom_having_different_name.xml | 0 .../pom.xml | 0 .../path1/pom.xml | 0 .../path2/pom.xml | 0 .../moduleNameDifferentThanArtifactId/pom.xml | 0 .../module1/pom.xml | 0 .../module2/pom.xml | 0 .../moduleNameShouldEqualArtifactId/pom.xml | 0 .../projectWithLinks/pom.xml | 0 .../projectWithLinksAndProperties/pom.xml | 0 .../singleProjectWithoutModules/pom.xml | 0 .../sourceEncoding/pom.xml | 0 .../core/config/CorePropertyDefinitions.java | 117 +++++++++++++++ .../core/config}/ExclusionProperties.java | 21 ++- .../core/config/IssueExclusionProperties.java | 29 ++-- .../sonar/core/config/SecurityProperties.java | 80 ++++++++++ .../config/CorePropertyDefinitionsTest.java | 15 +- sonar-server/pom.xml | 29 +--- .../platform/DefaultServerFileSystem.java | 4 - .../server/platform/ServerComponents.java | 6 +- .../server/plugins/BatchResourcesServlet.java | 83 ---------- .../org/sonar/server/plugins/BatchWs.java | 122 +++++++++++++++ .../startup/GenerateBootstrapIndex.java | 112 -------------- .../java/org/sonar/server/ui/JRubyFacade.java | 22 ++- .../controllers/batch_bootstrap_controller.rb | 5 - .../src/main/webapp/WEB-INF/config/routes.rb | 5 + sonar-server/src/main/webapp/WEB-INF/web.xml | 8 - .../plugins/BatchResourcesServletTest.java | 62 -------- .../org/sonar/server/plugins/BatchWsTest.java | 108 +++++++++++++ .../startup/GenerateBootstrapIndexTest.java | 69 --------- 68 files changed, 770 insertions(+), 912 deletions(-) delete mode 100644 plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt/package-info.java delete mode 100644 plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/ExclusionPropertiesTest.java delete mode 100644 plugins/sonar-maven-batch-plugin/pom.xml delete mode 100644 plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenBatchPlugin.java create mode 100644 sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt => sonar-batch/src/main/java/org/sonar/batch/debt}/DebtDecorator.java (92%) rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt => sonar-batch/src/main/java/org/sonar/batch/debt}/NewDebtDecorator.java (98%) rename {plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins => sonar-batch/src/main/java/org/sonar/batch}/maven/DefaultMavenPluginExecutor.java (99%) rename {plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins => sonar-batch/src/main/java/org/sonar/batch}/maven/MavenProjectBootstrapper.java (98%) rename {plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins => sonar-batch/src/main/java/org/sonar/batch}/maven/MavenProjectBuilder.java (98%) rename {plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins => sonar-batch/src/main/java/org/sonar/batch}/maven/MavenProjectConverter.java (99%) rename {plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins => sonar-batch/src/main/java/org/sonar/batch}/maven/package-info.java (97%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt => sonar-batch/src/test/java/org/sonar/batch/debt}/DebtDecoratorTest.java (96%) rename {plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt => sonar-batch/src/test/java/org/sonar/batch/debt}/NewDebtDecoratorTest.java (99%) delete mode 100644 sonar-batch/src/test/java/org/sonar/batch/issue/ignore/IssueExclusionsConfigurationTest.java rename {plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins => sonar-batch/src/test/java/org/sonar/batch}/maven/DefaultMavenPluginExecutorTest.java (98%) rename {plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins => sonar-batch/src/test/java/org/sonar/batch}/maven/MavenProjectBootstrapperTest.java (98%) rename {plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins => sonar-batch/src/test/java/org/sonar/batch}/maven/MavenProjectConverterTest.java (80%) rename {plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins => sonar-batch/src/test/java/org/sonar/batch}/maven/SonarMavenProjectBuilderTest.java (99%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom_having_different_name.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/pom.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path1/pom.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path2/pom.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/pom.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module1/pom.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module2/pom.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/pom.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/projectWithLinks/pom.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/projectWithLinksAndProperties/pom.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/singleProjectWithoutModules/pom.xml (100%) rename {plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins => sonar-batch/src/test/resources/org/sonar/batch}/maven/MavenProjectConverterTest/sourceEncoding/pom.xml (100%) create mode 100644 sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java rename {plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core => sonar-core/src/main/java/org/sonar/core/config}/ExclusionProperties.java (88%) rename sonar-batch/src/main/java/org/sonar/batch/issue/ignore/IssueExclusionsConfiguration.java => sonar-core/src/main/java/org/sonar/core/config/IssueExclusionProperties.java (93%) create mode 100644 sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java rename plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/MavenBatchPluginTest.java => sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java (77%) delete mode 100644 sonar-server/src/main/java/org/sonar/server/plugins/BatchResourcesServlet.java create mode 100644 sonar-server/src/main/java/org/sonar/server/plugins/BatchWs.java delete mode 100644 sonar-server/src/main/java/org/sonar/server/startup/GenerateBootstrapIndex.java delete mode 100644 sonar-server/src/test/java/org/sonar/server/plugins/BatchResourcesServletTest.java create mode 100644 sonar-server/src/test/java/org/sonar/server/plugins/BatchWsTest.java delete mode 100644 sonar-server/src/test/java/org/sonar/server/startup/GenerateBootstrapIndexTest.java 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 a87d01690a6..b8770197f47 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 @@ -20,36 +20,84 @@ package org.sonar.plugins.core; import com.google.common.collect.ImmutableList; -import org.sonar.api.*; +import org.sonar.api.CoreProperties; +import org.sonar.api.Properties; +import org.sonar.api.Property; +import org.sonar.api.PropertyType; +import org.sonar.api.SonarPlugin; import org.sonar.api.checks.NoSonarFilter; -import org.sonar.api.config.PropertyDefinition; -import org.sonar.api.resources.Qualifiers; -import org.sonar.batch.components.PastSnapshotFinder; -import org.sonar.batch.debt.IssueChangelogDebtCalculator; -import org.sonar.batch.issue.ignore.IssueExclusionsConfiguration; import org.sonar.core.timemachine.Periods; import org.sonar.plugins.core.batch.IndexProjectPostJob; import org.sonar.plugins.core.charts.DistributionAreaChart; import org.sonar.plugins.core.charts.DistributionBarChart; import org.sonar.plugins.core.charts.XradarChart; import org.sonar.plugins.core.colorizers.JavaColorizerFormat; -import org.sonar.plugins.core.dashboards.*; -import org.sonar.plugins.core.issue.*; -import org.sonar.plugins.core.issue.notification.*; +import org.sonar.plugins.core.dashboards.GlobalDefaultDashboard; +import org.sonar.plugins.core.dashboards.ProjectDefaultDashboard; +import org.sonar.plugins.core.dashboards.ProjectHotspotDashboard; +import org.sonar.plugins.core.dashboards.ProjectIssuesDashboard; +import org.sonar.plugins.core.dashboards.ProjectTimeMachineDashboard; +import org.sonar.plugins.core.issue.CountFalsePositivesDecorator; +import org.sonar.plugins.core.issue.CountUnresolvedIssuesDecorator; +import org.sonar.plugins.core.issue.InitialOpenIssuesSensor; +import org.sonar.plugins.core.issue.InitialOpenIssuesStack; +import org.sonar.plugins.core.issue.IssueHandlers; +import org.sonar.plugins.core.issue.IssueTracking; +import org.sonar.plugins.core.issue.IssueTrackingDecorator; +import org.sonar.plugins.core.issue.IssuesDensityDecorator; +import org.sonar.plugins.core.issue.WeightedIssuesDecorator; +import org.sonar.plugins.core.issue.notification.ChangesOnMyIssueNotificationDispatcher; +import org.sonar.plugins.core.issue.notification.IssueChangesEmailTemplate; +import org.sonar.plugins.core.issue.notification.NewFalsePositiveNotificationDispatcher; +import org.sonar.plugins.core.issue.notification.NewIssuesEmailTemplate; +import org.sonar.plugins.core.issue.notification.NewIssuesNotificationDispatcher; +import org.sonar.plugins.core.issue.notification.SendIssueNotificationsPostJob; import org.sonar.plugins.core.measurefilters.MyFavouritesFilter; import org.sonar.plugins.core.measurefilters.ProjectFilter; import org.sonar.plugins.core.notifications.alerts.NewAlerts; import org.sonar.plugins.core.security.ApplyProjectRolesDecorator; -import org.sonar.plugins.core.sensors.*; -import org.sonar.plugins.core.technicaldebt.DebtDecorator; -import org.sonar.plugins.core.technicaldebt.NewDebtDecorator; -import org.sonar.plugins.core.timemachine.*; +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.CoverageMeasurementFilter; +import org.sonar.plugins.core.sensors.DirectoriesDecorator; +import org.sonar.plugins.core.sensors.FileHashSensor; +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.ProfileEventsSensor; +import org.sonar.plugins.core.sensors.ProjectLinksSensor; +import org.sonar.plugins.core.sensors.UnitTestDecorator; +import org.sonar.plugins.core.sensors.VersionEventsSensor; +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.TendencyDecorator; +import org.sonar.plugins.core.timemachine.TimeMachineConfigurationPersister; +import org.sonar.plugins.core.timemachine.VariationDecorator; import org.sonar.plugins.core.web.TestsViewer; import org.sonar.plugins.core.widgets.*; -import org.sonar.plugins.core.widgets.issues.*; -import org.sonar.plugins.core.widgets.measures.*; +import org.sonar.plugins.core.widgets.issues.ActionPlansWidget; +import org.sonar.plugins.core.widgets.issues.FalsePositiveIssuesWidget; +import org.sonar.plugins.core.widgets.issues.IssueFilterWidget; +import org.sonar.plugins.core.widgets.issues.IssuesWidget; +import org.sonar.plugins.core.widgets.issues.MyUnresolvedIssuesWidget; +import org.sonar.plugins.core.widgets.issues.UnresolvedIssuesPerAssigneeWidget; +import org.sonar.plugins.core.widgets.issues.UnresolvedIssuesStatusesWidget; +import org.sonar.plugins.core.widgets.measures.MeasureFilterAsBubbleChartWidget; +import org.sonar.plugins.core.widgets.measures.MeasureFilterAsCloudWidget; +import org.sonar.plugins.core.widgets.measures.MeasureFilterAsHistogramWidget; +import org.sonar.plugins.core.widgets.measures.MeasureFilterAsPieChartWidget; +import org.sonar.plugins.core.widgets.measures.MeasureFilterListWidget; +import org.sonar.plugins.core.widgets.measures.MeasureFilterTreemapWidget; -import java.util.Arrays; import java.util.List; @Properties({ @@ -292,11 +340,6 @@ public final class CorePlugin extends SonarPlugin { NewFalsePositiveNotificationDispatcher.class, NewFalsePositiveNotificationDispatcher.newMetadata(), - // technical debt - DebtDecorator.class, - NewDebtDecorator.class, - IssueChangelogDebtCalculator.class, - // batch ProfileEventsSensor.class, ProjectLinksSensor.class, @@ -334,64 +377,7 @@ public final class CorePlugin extends SonarPlugin { NewAlerts.class, NewAlerts.newMetadata()); - extensions.addAll(ExclusionProperties.definitions()); - extensions.addAll(IssueExclusionsConfiguration.getPropertyDefinitions()); - extensions.addAll(CoverageMeasurementFilter.getPropertyDefinitions()); - extensions.addAll(PastSnapshotFinder.getPropertyDefinitions()); - extensions.addAll(DebtDecorator.definitions()); - extensions.addAll(propertyDefinitions()); - return extensions.build(); } - static List propertyDefinitions() { - return Arrays.asList( - PropertyDefinition.builder(CoreProperties.CORE_VIOLATION_LOCALE_PROPERTY) - .defaultValue("en") - .name("Locale used for issue messages") - .description("Deprecated property. Keep default value for backward compatibility.") - .hidden() - .build(), - PropertyDefinition.builder(CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY) - .defaultValue("" + CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_DEAULT_VALUE) - .name("Allow users to sign up online") - .description("Users can sign up online.") - .type(PropertyType.BOOLEAN) - .category(CoreProperties.CATEGORY_SECURITY) - .build(), - - PropertyDefinition.builder(CoreProperties.CORE_DEFAULT_GROUP) - .defaultValue(CoreProperties.CORE_DEFAULT_GROUP_DEFAULT_VALUE) - .name("Default user group") - .description("Any new users will automatically join this group.") - .category(CoreProperties.CATEGORY_SECURITY) - .build(), - - PropertyDefinition.builder(CoreProperties.CORE_IMPORT_SOURCES_PROPERTY) - .defaultValue("" + CoreProperties.CORE_IMPORT_SOURCES_DEFAULT_VALUE) - .name("Import sources") - .description("Set to false if sources should not be imported and therefore not available in the Web UI (e.g. for security reasons).") - .type(PropertyType.BOOLEAN) - .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE) - .category(CoreProperties.CATEGORY_SECURITY) - .build(), - - PropertyDefinition.builder(CoreProperties.CORE_FORCE_AUTHENTICATION_PROPERTY) - .defaultValue("" + CoreProperties.CORE_FORCE_AUTHENTICATION_DEFAULT_VALUE) - .name("Force user authentication") - .description("Forcing user authentication stops un-logged users to access SonarQube.") - .type(PropertyType.BOOLEAN) - .category(CoreProperties.CATEGORY_SECURITY) - .build(), - - PropertyDefinition.builder(CoreProperties.CORE_PREVENT_AUTOMATIC_PROJECT_CREATION) - .defaultValue(Boolean.toString(false)) - .name("Prevent automatic project creation") - .description("Set to true to prevent automatic project creation at first analysis and force project provisioning.") - .type(PropertyType.BOOLEAN) - .category(CoreProperties.CATEGORY_SECURITY) - .build() - ); - } - } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CoverageMeasurementFilter.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CoverageMeasurementFilter.java index e2bcea80dce..eeda60396a9 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CoverageMeasurementFilter.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CoverageMeasurementFilter.java @@ -23,34 +23,26 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableSet; -import org.sonar.api.CoreProperties; -import org.sonar.api.PropertyType; -import org.sonar.api.config.PropertyDefinition; import org.sonar.api.config.Settings; import org.sonar.api.measures.Measure; import org.sonar.api.measures.Metric; -import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Resource; import org.sonar.api.utils.WildcardPattern; import org.sonar.core.measure.MeasurementFilter; import java.util.Collection; import java.util.Iterator; -import java.util.List; public class CoverageMeasurementFilter implements MeasurementFilter { - public static final String PROPERTY_COVERAGE_EXCLUSIONS = "sonar.coverage.exclusions"; - public static final String PROPERTY_COVERAGE_INCLUSIONS = "sonar.coverage.inclusions"; - private final Settings settings; private final ImmutableSet coverageMetrics; private Collection resourcePatterns; public CoverageMeasurementFilter(Settings settings, - CoverageDecorator coverageDecorator, - LineCoverageDecorator lineCoverageDecorator, - BranchCoverageDecorator branchCoverageDecorator) { + CoverageDecorator coverageDecorator, + LineCoverageDecorator lineCoverageDecorator, + BranchCoverageDecorator branchCoverageDecorator) { this.settings = settings; this.coverageMetrics = ImmutableSet.builder() .addAll(coverageDecorator.generatedMetrics()) @@ -88,22 +80,10 @@ public class CoverageMeasurementFilter implements MeasurementFilter { @VisibleForTesting final void initPatterns() { - Builder builder = ImmutableList.builder(); - for (String pattern : settings.getStringArray(PROPERTY_COVERAGE_EXCLUSIONS)) { + Builder builder = ImmutableList.builder(); + for (String pattern : settings.getStringArray("sonar.coverage.exclusions")) { builder.add(WildcardPattern.create(pattern)); } resourcePatterns = builder.build(); } - - public static List getPropertyDefinitions() { - return ImmutableList.of( - PropertyDefinition.builder(PROPERTY_COVERAGE_EXCLUSIONS) - .category(CoreProperties.CATEGORY_EXCLUSIONS) - .subCategory(CoreProperties.SUBCATEGORY_COVERAGE_EXCLUSIONS) - .type(PropertyType.STRING) - .multiValues(true) - .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE) - .build() - ); - } } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt/package-info.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt/package-info.java deleted file mode 100644 index defa4e01d36..00000000000 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonar.plugins.core.technicaldebt; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/ExclusionPropertiesTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/ExclusionPropertiesTest.java deleted file mode 100644 index 42aed67cb00..00000000000 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/ExclusionPropertiesTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.plugins.core; - -import org.junit.Test; -import org.sonar.api.CoreProperties; -import org.sonar.api.config.PropertyDefinition; - -import static org.fest.assertions.Assertions.assertThat; - -public class ExclusionPropertiesTest { - @Test - public void definitions() throws Exception { - assertThat(ExclusionProperties.definitions().size()).isGreaterThan(0); - for (PropertyDefinition definition : ExclusionProperties.definitions()) { - assertThat(definition.category()).isEqualTo(CoreProperties.CATEGORY_EXCLUSIONS); - } - } -} diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CoverageMeasurementFilterTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CoverageMeasurementFilterTest.java index 8254fb28094..072dea5844e 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CoverageMeasurementFilterTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CoverageMeasurementFilterTest.java @@ -27,6 +27,7 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Measure; import org.sonar.api.resources.File; import org.sonar.api.resources.Resource; +import org.sonar.core.config.ExclusionProperties; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -40,7 +41,7 @@ public class CoverageMeasurementFilterTest { @Before public void createFilter() { - settings = new Settings(new PropertyDefinitions(CoverageMeasurementFilter.getPropertyDefinitions())); + settings = new Settings(new PropertyDefinitions(ExclusionProperties.all())); filter = new CoverageMeasurementFilter(settings, new CoverageDecorator(), new LineCoverageDecorator(), new BranchCoverageDecorator()); } @@ -57,7 +58,7 @@ public class CoverageMeasurementFilterTest { Measure coverageMeasure = mock(Measure.class); when(coverageMeasure.getMetric()).thenReturn(CoreMetrics.LINES_TO_COVER); - settings.setProperty(CoverageMeasurementFilter.PROPERTY_COVERAGE_EXCLUSIONS, "src/org/polop/*"); + settings.setProperty("sonar.coverage.exclusions", "src/org/polop/*"); filter.initPatterns(); assertThat(filter.accept(resource, coverageMeasure)).isFalse(); } @@ -68,7 +69,7 @@ public class CoverageMeasurementFilterTest { Measure coverageMeasure = mock(Measure.class); when(coverageMeasure.getMetric()).thenReturn(CoreMetrics.COVERAGE); - settings.setProperty(CoverageMeasurementFilter.PROPERTY_COVERAGE_EXCLUSIONS, "src/org/other/*"); + settings.setProperty("sonar.coverage.exclusions", "src/org/other/*"); filter.initPatterns(); assertThat(filter.accept(resource, coverageMeasure)).isTrue(); } diff --git a/plugins/sonar-maven-batch-plugin/pom.xml b/plugins/sonar-maven-batch-plugin/pom.xml deleted file mode 100644 index 20af0ad3112..00000000000 --- a/plugins/sonar-maven-batch-plugin/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - - org.codehaus.sonar - sonar - 4.3-SNAPSHOT - ../.. - - - org.codehaus.sonar.plugins - sonar-maven-batch-plugin - sonar-plugin - SonarQube :: Maven Batch Plugin - - - 3.0 - - - - - com.google.code.findbugs - jsr305 - provided - - - org.codehaus.sonar - sonar-batch - ${project.version} - provided - - - org.codehaus.sonar - sonar-plugin-api - provided - - - org.apache.maven - maven-plugin-api - ${maven.version} - provided - - - org.apache.maven - maven-core - ${maven.version} - provided - - - - - org.codehaus.sonar - sonar-testing-harness - test - - - org.mockito - mockito-all - test - - - - - - - - org.codehaus.sonar - sonar-packaging-maven-plugin - - Maven Batch Plugin - org.sonar.plugins.maven.MavenBatchPlugin - - - - - diff --git a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenBatchPlugin.java b/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenBatchPlugin.java deleted file mode 100644 index 64375e5f696..00000000000 --- a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenBatchPlugin.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.plugins.maven; - -import com.google.common.collect.ImmutableList; -import org.sonar.api.SonarPlugin; - -import java.util.List; - -public final class MavenBatchPlugin extends SonarPlugin { - - public List getExtensions() { - return ImmutableList.of(MavenProjectBootstrapper.class, DefaultMavenPluginExecutor.class, MavenProjectConverter.class, MavenProjectBuilder.class); - } -} diff --git a/pom.xml b/pom.xml index 62b3fcaea10..2d8029ed392 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,6 @@ plugins/sonar-cpd-plugin plugins/sonar-design-plugin plugins/sonar-email-notifications-plugin - plugins/sonar-maven-batch-plugin plugins/sonar-xoo-plugin diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml index d99cf5fedb4..6bdb789c059 100644 --- a/sonar-application/assembly.xml +++ b/sonar-application/assembly.xml @@ -18,8 +18,16 @@ net.sourceforge.jtds:jtds org.codehaus.sonar.plugins:* org.codehaus.sonar-plugins.*:* + org.codehaus.sonar:sonar-batch-maven-compat + + lib/batch + false + + org.codehaus.sonar:sonar-batch-maven-compat + + lib/core-plugins diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index c59caf02c7b..beb6302868a 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -57,6 +57,12 @@ ch.qos.logback logback-core + + ${pom.groupId} + sonar-batch-maven-compat + ${pom.version} + runtime + org.apache.tomcat.embed tomcat-embed-core @@ -163,13 +169,6 @@ sonar-plugin runtime - - org.codehaus.sonar.plugins - sonar-maven-batch-plugin - ${project.version} - sonar-plugin - runtime - org.sonatype.jsw-binaries jsw-binaries @@ -258,8 +257,8 @@ - 55000000 - 75000000 + 80000000 + 88000000 ${project.build.directory}/sonarqube-${project.version}.zip diff --git a/sonar-batch-maven-compat/pom.xml b/sonar-batch-maven-compat/pom.xml index 3990762b480..087be6a8d57 100644 --- a/sonar-batch-maven-compat/pom.xml +++ b/sonar-batch-maven-compat/pom.xml @@ -13,11 +13,15 @@ Compatibility layer, which provides MavenProject for non-Maven environments. + + ${pom.groupId} + sonar-batch + ${pom.version} + org.apache.maven maven-project 2.0.7 - compile org.codehaus.plexus @@ -43,20 +47,4 @@ - - - - release - - - - maven-deploy-plugin - - true - - - - - - diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml index 4d473f38149..caeffd62bcd 100644 --- a/sonar-batch/pom.xml +++ b/sonar-batch/pom.xml @@ -7,7 +7,6 @@ 4.3-SNAPSHOT - org.codehaus.sonar sonar-batch SonarQube :: Batch @@ -40,6 +39,16 @@ org.codehaus.sonar sonar-plugin-api + + + jfree + jcommon + + + jfree + jfreechat + + org.codehaus.sonar @@ -52,11 +61,13 @@ org.apache.maven maven-plugin-api + 3.0 provided org.apache.maven maven-core + 3.0 provided 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 new file mode 100644 index 00000000000..02c98554fa6 --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java @@ -0,0 +1,47 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.bootstrap; + +import com.google.common.collect.Lists; +import org.sonar.batch.debt.DebtDecorator; +import org.sonar.batch.debt.IssueChangelogDebtCalculator; +import org.sonar.batch.debt.NewDebtDecorator; +import org.sonar.batch.maven.DefaultMavenPluginExecutor; +import org.sonar.batch.maven.MavenProjectBootstrapper; +import org.sonar.batch.maven.MavenProjectBuilder; +import org.sonar.batch.maven.MavenProjectConverter; +import org.sonar.core.config.CorePropertyDefinitions; + +import java.util.Collection; +import java.util.List; + +public class BatchComponents { + public static Collection all() { + List components = Lists.newArrayList( + // Maven + MavenProjectBootstrapper.class, DefaultMavenPluginExecutor.class, MavenProjectConverter.class, MavenProjectBuilder.class, + + // Debt + IssueChangelogDebtCalculator.class, DebtDecorator.class, NewDebtDecorator.class + ); + components.addAll(CorePropertyDefinitions.all()); + return components; + } +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java index 039cc1c210c..bb2b2e431f2 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java @@ -44,6 +44,13 @@ public class ExtensionInstaller { public ExtensionInstaller install(ComponentContainer container, ExtensionMatcher matcher) { boolean preview = analysisMode.isPreview(); + + // core components + for (Object o : BatchComponents.all()) { + doInstall(container, matcher, null, preview, o); + } + + // plugin extensions for (Map.Entry entry : pluginRepository.getPluginsByMetadata().entrySet()) { PluginMetadata metadata = entry.getKey(); Plugin plugin = entry.getValue(); diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java index c5992b6475a..d823a0650cf 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java @@ -24,6 +24,7 @@ import org.sonar.api.config.Settings; import org.sonar.api.platform.ComponentContainer; import org.sonar.api.resources.ResourceTypes; import org.sonar.api.task.Task; +import org.sonar.api.task.TaskComponent; import org.sonar.api.task.TaskDefinition; import org.sonar.api.task.TaskExtension; import org.sonar.api.utils.SonarException; @@ -55,7 +56,7 @@ public class TaskContainer extends ComponentContainer { private void installTaskExtensions() { getComponentByType(ExtensionInstaller.class).install(this, new ExtensionMatcher() { public boolean accept(Object extension) { - return ExtensionUtils.isType(extension, TaskExtension.class); + return ExtensionUtils.isType(extension, TaskComponent.class); } }); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/components/PastSnapshotFinder.java b/sonar-batch/src/main/java/org/sonar/batch/components/PastSnapshotFinder.java index 88de3031103..541a63a6bd7 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/components/PastSnapshotFinder.java +++ b/sonar-batch/src/main/java/org/sonar/batch/components/PastSnapshotFinder.java @@ -20,24 +20,19 @@ package org.sonar.batch.components; import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; import org.apache.commons.configuration.Configuration; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.BatchExtension; import org.sonar.api.CoreProperties; -import org.sonar.api.config.PropertyDefinition; import org.sonar.api.config.Settings; import org.sonar.api.database.model.Snapshot; -import org.sonar.api.resources.Qualifiers; import javax.annotation.Nullable; - import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; public class PastSnapshotFinder implements BatchExtension { @@ -196,60 +191,4 @@ public class PastSnapshotFinder implements BatchExtension { } } - public static List getPropertyDefinitions() { - return ImmutableList.of( - PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 1) - .name("Period 1") - .description("Period used to compare measures and track new violations. Values are :
  • Number of days before " + - "analysis, for example 5.
  • A custom date. Format is yyyy-MM-dd, for example 2010-12-25
  • 'previous_analysis' to " + - "compare to previous analysis
  • 'previous_version' to compare to the previous version in the project history
" + - "

When specifying a number of days or a date, the snapshot selected for comparison is " + - " the first one available inside the corresponding time range.

" + - "

Changing this property only takes effect after subsequent project inspections.

") - .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_1) - .category(CoreProperties.CATEGORY_GENERAL) - .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) - .build(), - - PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 2) - .name("Period 2") - .description("See the property 'Period 1'") - .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_2) - .category(CoreProperties.CATEGORY_GENERAL) - .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) - .build(), - - PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 3) - .name("Period 3") - .description("See the property 'Period 1'") - .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_3) - .category(CoreProperties.CATEGORY_GENERAL) - .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) - .build(), - - PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 4) - .name("Period 4") - .description("Period used to compare measures and track new violations. This property is specific to the project. Values are : " + - "

  • Number of days before analysis, for example 5.
  • A custom date. Format is yyyy-MM-dd, " + - "for example 2010-12-25
  • 'previous_analysis' to compare to previous analysis
    • " + - "
  • 'previous_version' to compare to the previous version in the project history
  • A version, for example 1.2
" + - "

When specifying a number of days or a date, the snapshot selected for comparison is the first one available inside the corresponding time range.

" + - "

Changing this property only takes effect after subsequent project inspections.

") - .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_4) - .onlyOnQualifiers(Qualifiers.PROJECT) - .category(CoreProperties.CATEGORY_GENERAL) - .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) - .build(), - - PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 5) - .name("Period 5") - .description("See the property 'Period 4'") - .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_5) - .onlyOnQualifiers(Qualifiers.PROJECT) - .category(CoreProperties.CATEGORY_GENERAL) - .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) - .build() - ); - } - } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt/DebtDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/debt/DebtDecorator.java similarity index 92% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt/DebtDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/debt/DebtDecorator.java index 2caf164d9c2..71e9cc36a1c 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt/DebtDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/debt/DebtDecorator.java @@ -18,21 +18,26 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.technicaldebt; +package org.sonar.batch.debt; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableList; -import org.sonar.api.CoreProperties; -import org.sonar.api.PropertyType; -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.rule.Rule; import org.sonar.api.batch.rule.Rules; import org.sonar.api.component.ResourcePerspectives; -import org.sonar.api.config.PropertyDefinition; 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.MeasuresFilters; +import org.sonar.api.measures.Metric; +import org.sonar.api.measures.PersistenceMode; +import org.sonar.api.measures.RuleMeasure; import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.resources.ResourceUtils; @@ -43,7 +48,6 @@ import org.sonar.api.technicaldebt.batch.TechnicalDebtModel; import javax.annotation.CheckForNull; import javax.annotation.Nullable; - import java.util.Arrays; import java.util.List; import java.util.Map; @@ -185,18 +189,6 @@ public final class DebtDecorator implements Decorator { return context.getMeasure(CoreMetrics.TECHNICAL_DEBT) == null; } - public static List definitions() { - return ImmutableList.of( - PropertyDefinition.builder(CoreProperties.HOURS_IN_DAY) - .name("Number of working hours in a day") - .type(PropertyType.INTEGER) - .defaultValue("8") - .category(CoreProperties.CATEGORY_TECHNICAL_DEBT) - .deprecatedKey("sqale.hoursInDay") - .build() - ); - } - private static class SumMap { private Map sumByKeys; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt/NewDebtDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/debt/NewDebtDecorator.java similarity index 98% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt/NewDebtDecorator.java rename to sonar-batch/src/main/java/org/sonar/batch/debt/NewDebtDecorator.java index f5f7062a584..fe738d63de8 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/technicaldebt/NewDebtDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/debt/NewDebtDecorator.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.technicaldebt; +package org.sonar.batch.debt; import com.google.common.collect.ImmutableList; import org.sonar.api.batch.*; diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java b/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java index 03d218b3a3b..e29fc5aaa30 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/AbstractPatternInitializer.java @@ -19,8 +19,6 @@ */ package org.sonar.batch.issue.ignore.pattern; -import org.sonar.batch.issue.ignore.IssueExclusionsConfiguration; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import org.apache.commons.lang.StringUtils; @@ -67,8 +65,8 @@ public abstract class AbstractPatternInitializer implements BatchExtension { String patternConf = StringUtils.defaultIfBlank(settings.getString(getMulticriteriaConfigurationKey()), ""); for (String id : StringUtils.split(patternConf, ',')) { String propPrefix = getMulticriteriaConfigurationKey() + "." + id + "."; - String resourceKeyPattern = settings.getString(propPrefix + IssueExclusionsConfiguration.RESOURCE_KEY); - String ruleKeyPattern = settings.getString(propPrefix + IssueExclusionsConfiguration.RULE_KEY); + String resourceKeyPattern = settings.getString(propPrefix + "resourceKey"); + String ruleKeyPattern = settings.getString(propPrefix + "ruleKey"); String lineRange = "*"; String[] fields = new String[] { resourceKeyPattern, ruleKeyPattern, lineRange }; PatternDecoder.checkRegularLineConstraints(StringUtils.join(fields, ","), fields); diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializer.java b/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializer.java index 79b176b4721..75882be5422 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializer.java @@ -20,12 +20,11 @@ package org.sonar.batch.issue.ignore.pattern; -import org.sonar.batch.issue.ignore.IssueExclusionsConfiguration; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import org.apache.commons.lang.StringUtils; import org.sonar.api.config.Settings; +import org.sonar.core.config.IssueExclusionProperties; import java.util.List; @@ -45,7 +44,7 @@ public class IssueExclusionPatternInitializer extends AbstractPatternInitializer @Override protected String getMulticriteriaConfigurationKey() { - return IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY; + return "sonar.issue.ignore" + ".multicriteria"; } public PatternMatcher getPatternMatcher() { @@ -54,7 +53,7 @@ public class IssueExclusionPatternInitializer extends AbstractPatternInitializer @Override public void initializePatternsForPath(String relativePath, String componentKey) { - for (IssuePattern pattern: getMulticriteriaPatterns()) { + for (IssuePattern pattern : getMulticriteriaPatterns()) { if (pattern.matchResource(relativePath)) { getPatternMatcher().addPatternForComponent(componentKey, pattern); } @@ -70,12 +69,12 @@ public class IssueExclusionPatternInitializer extends AbstractPatternInitializer protected final void loadFileContentPatterns() { // Patterns Block blockPatterns = Lists.newArrayList(); - String patternConf = StringUtils.defaultIfBlank(getSettings().getString(IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY), ""); + String patternConf = StringUtils.defaultIfBlank(getSettings().getString(IssueExclusionProperties.PATTERNS_BLOCK_KEY), ""); for (String id : StringUtils.split(patternConf, ',')) { - String propPrefix = IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY + "." + id + "."; - String beginBlockRegexp = getSettings().getString(propPrefix + IssueExclusionsConfiguration.BEGIN_BLOCK_REGEXP); - String endBlockRegexp = getSettings().getString(propPrefix + IssueExclusionsConfiguration.END_BLOCK_REGEXP); - String[] fields = new String[] { beginBlockRegexp, endBlockRegexp }; + String propPrefix = IssueExclusionProperties.PATTERNS_BLOCK_KEY + "." + id + "."; + String beginBlockRegexp = getSettings().getString(propPrefix + IssueExclusionProperties.BEGIN_BLOCK_REGEXP); + String endBlockRegexp = getSettings().getString(propPrefix + IssueExclusionProperties.END_BLOCK_REGEXP); + String[] fields = new String[]{beginBlockRegexp, endBlockRegexp}; PatternDecoder.checkDoubleRegexpLineConstraints(StringUtils.join(fields, ","), fields); IssuePattern pattern = new IssuePattern().setBeginBlockRegexp(nullToEmpty(beginBlockRegexp)).setEndBlockRegexp(nullToEmpty(endBlockRegexp)); blockPatterns.add(pattern); @@ -83,10 +82,10 @@ public class IssueExclusionPatternInitializer extends AbstractPatternInitializer // Patterns All File allFilePatterns = Lists.newArrayList(); - patternConf = StringUtils.defaultIfBlank(getSettings().getString(IssueExclusionsConfiguration.PATTERNS_ALLFILE_KEY), ""); + patternConf = StringUtils.defaultIfBlank(getSettings().getString(IssueExclusionProperties.PATTERNS_ALLFILE_KEY), ""); for (String id : StringUtils.split(patternConf, ',')) { - String propPrefix = IssueExclusionsConfiguration.PATTERNS_ALLFILE_KEY + "." + id + "."; - String allFileRegexp = getSettings().getString(propPrefix + IssueExclusionsConfiguration.FILE_REGEXP); + String propPrefix = IssueExclusionProperties.PATTERNS_ALLFILE_KEY + "." + id + "."; + String allFileRegexp = getSettings().getString(propPrefix + IssueExclusionProperties.FILE_REGEXP); PatternDecoder.checkWholeFileRegexp(allFileRegexp); IssuePattern pattern = new IssuePattern().setAllFileRegexp(nullToEmpty(allFileRegexp)); allFilePatterns.add(pattern); @@ -102,6 +101,6 @@ public class IssueExclusionPatternInitializer extends AbstractPatternInitializer } public boolean hasFileContentPattern() { - return ! (blockPatterns.isEmpty() && allFilePatterns.isEmpty()); + return !(blockPatterns.isEmpty() && allFilePatterns.isEmpty()); } } diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializer.java b/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializer.java index 5ce390af0be..bf87ad85313 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializer.java @@ -20,8 +20,6 @@ package org.sonar.batch.issue.ignore.pattern; -import org.sonar.batch.issue.ignore.IssueExclusionsConfiguration; - import com.google.common.collect.Maps; import org.sonar.api.config.Settings; @@ -38,7 +36,7 @@ public class IssueInclusionPatternInitializer extends AbstractPatternInitializer @Override protected String getMulticriteriaConfigurationKey() { - return IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_INCLUSION_KEY; + return "sonar.issue.enforce" + ".multicriteria"; } @Override diff --git a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/DefaultMavenPluginExecutor.java b/sonar-batch/src/main/java/org/sonar/batch/maven/DefaultMavenPluginExecutor.java similarity index 99% rename from plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/DefaultMavenPluginExecutor.java rename to sonar-batch/src/main/java/org/sonar/batch/maven/DefaultMavenPluginExecutor.java index fc5eef968b4..fb0a1a56a20 100644 --- a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/DefaultMavenPluginExecutor.java +++ b/sonar-batch/src/main/java/org/sonar/batch/maven/DefaultMavenPluginExecutor.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.maven; +package org.sonar.batch.maven; import org.apache.maven.execution.MavenSession; import org.apache.maven.execution.ReactorManager; @@ -33,7 +33,6 @@ import org.sonar.batch.scan.filesystem.DefaultModuleFileSystem; import org.sonar.batch.scan.maven.MavenPluginExecutor; import javax.annotation.Nullable; - import java.lang.reflect.Method; import java.util.Arrays; diff --git a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectBootstrapper.java b/sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectBootstrapper.java similarity index 98% rename from plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectBootstrapper.java rename to sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectBootstrapper.java index 1bb3ea37d21..3cd1f9d5c7f 100644 --- a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectBootstrapper.java +++ b/sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectBootstrapper.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.maven; +package org.sonar.batch.maven; import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; diff --git a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectBuilder.java b/sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectBuilder.java similarity index 98% rename from plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectBuilder.java rename to sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectBuilder.java index 3d9ebb12c2f..7cbf3efc5f2 100644 --- a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectBuilder.java +++ b/sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectBuilder.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.maven; +package org.sonar.batch.maven; import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; diff --git a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectConverter.java b/sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectConverter.java similarity index 99% rename from plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectConverter.java rename to sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectConverter.java index 3162b095361..2ef3fe6fa54 100644 --- a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectConverter.java +++ b/sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectConverter.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.maven; +package org.sonar.batch.maven; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -40,7 +40,6 @@ import org.sonar.batch.scan.filesystem.DefaultModuleFileSystem; import org.sonar.java.api.JavaUtils; import javax.annotation.Nullable; - import java.io.File; import java.io.IOException; import java.util.Arrays; diff --git a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/package-info.java b/sonar-batch/src/main/java/org/sonar/batch/maven/package-info.java similarity index 97% rename from plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/package-info.java rename to sonar-batch/src/main/java/org/sonar/batch/maven/package-info.java index 4e7cfd86137..b595cf0548f 100644 --- a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/package-info.java +++ b/sonar-batch/src/main/java/org/sonar/batch/maven/package-info.java @@ -22,7 +22,7 @@ * This package is a part of bootstrap process, so we should take care about backward compatibility. */ @ParametersAreNonnullByDefault -package org.sonar.plugins.maven; +package org.sonar.batch.maven; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java index 835aa9be91f..5180a498752 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java @@ -19,6 +19,7 @@ */ package org.sonar.batch.scan; +import org.sonar.api.BatchComponent; import org.sonar.batch.qualitygate.GenerateQualityGateEvents; import org.slf4j.Logger; @@ -158,7 +159,7 @@ public class ModuleScanContainer extends ComponentContainer { ExtensionInstaller installer = getComponentByType(ExtensionInstaller.class); installer.install(this, new ExtensionMatcher() { public boolean accept(Object extension) { - if (ExtensionUtils.isType(extension, BatchExtension.class) && ExtensionUtils.isInstantiationStrategy(extension, InstantiationStrategy.PER_PROJECT)) { + if (ExtensionUtils.isType(extension, BatchComponent.class) && ExtensionUtils.isInstantiationStrategy(extension, InstantiationStrategy.PER_PROJECT)) { // Special use-case: the extension point ProjectBuilder is used in a Maven environment to define some // new sub-projects without pom. // Example : C# plugin adds sub-projects at runtime, even if they are not defined in root pom. diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java index dee73ecd6c7..e4eacf6aa8d 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java @@ -20,6 +20,7 @@ package org.sonar.batch.scan; import com.google.common.annotations.VisibleForTesting; +import org.sonar.api.BatchComponent; import org.sonar.api.BatchExtension; import org.sonar.api.CoreProperties; import org.sonar.api.batch.InstantiationStrategy; @@ -201,7 +202,7 @@ public class ProjectScanContainer extends ComponentContainer { static class BatchExtensionFilter implements ExtensionMatcher { public boolean accept(Object extension) { - return ExtensionUtils.isType(extension, BatchExtension.class) + return ExtensionUtils.isType(extension, BatchComponent.class) && ExtensionUtils.isInstantiationStrategy(extension, InstantiationStrategy.PER_BATCH); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt/DebtDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/debt/DebtDecoratorTest.java similarity index 96% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt/DebtDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/debt/DebtDecoratorTest.java index 2aac5804446..fc82ece746c 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt/DebtDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/debt/DebtDecoratorTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.technicaldebt; +package org.sonar.batch.debt; import com.google.common.collect.Lists; import org.apache.commons.lang.ObjectUtils; @@ -38,7 +38,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.File; import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; @@ -55,7 +59,12 @@ import java.util.Collections; import static com.google.common.collect.Lists.newArrayList; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Matchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.argThat; +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.when; @RunWith(MockitoJUnitRunner.class) public class DebtDecoratorTest { @@ -275,15 +284,10 @@ public class DebtDecoratorTest { DecoratorContext context = mock(DecoratorContext.class); when(context.getResource()).thenReturn(new File("foo")); - decorator.saveCharacteristicMeasure(context, (Characteristic) null, 0.0, true); + decorator.saveCharacteristicMeasure(context, null, 0.0, true); verify(context, never()).saveMeasure(new Measure(CoreMetrics.TECHNICAL_DEBT)); } - @Test - public void check_definitions() { - assertThat(DebtDecorator.definitions()).hasSize(1); - } - private DefaultIssue createIssue(String ruleKey, String repositoryKey) { return new DefaultIssue().setRuleKey(RuleKey.of(repositoryKey, ruleKey)); } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt/NewDebtDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/debt/NewDebtDecoratorTest.java similarity index 99% rename from plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt/NewDebtDecoratorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/debt/NewDebtDecoratorTest.java index a9391f96da2..a80a19feac1 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/technicaldebt/NewDebtDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/debt/NewDebtDecoratorTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.plugins.core.technicaldebt; +package org.sonar.batch.debt; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.time.DateUtils; @@ -45,6 +45,7 @@ import org.sonar.api.utils.Duration; import org.sonar.batch.components.Period; import org.sonar.batch.components.TimeMachineConfiguration; import org.sonar.batch.debt.IssueChangelogDebtCalculator; +import org.sonar.batch.debt.NewDebtDecorator; import java.util.Date; diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/IssueExclusionsConfigurationTest.java b/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/IssueExclusionsConfigurationTest.java deleted file mode 100644 index 79849ba1358..00000000000 --- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/IssueExclusionsConfigurationTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package org.sonar.batch.issue.ignore; - -import org.sonar.batch.issue.ignore.IssueExclusionsConfiguration; - -import org.junit.Test; -import static org.fest.assertions.Assertions.assertThat; - -public class IssueExclusionsConfigurationTest { - @Test - public void justForCoverage() { - assertThat(IssueExclusionsConfiguration.getPropertyDefinitions()).hasSize(4); - } -} diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java b/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java index f478c284184..a0707867019 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java @@ -20,14 +20,14 @@ package org.sonar.batch.issue.ignore.pattern; -import org.sonar.batch.issue.ignore.IssueExclusionsConfiguration; -import org.sonar.batch.issue.ignore.pattern.IssueExclusionPatternInitializer; import org.junit.Before; import org.junit.Test; import org.sonar.api.config.PropertyDefinitions; import org.sonar.api.config.Settings; import org.sonar.api.utils.SonarException; +import org.sonar.core.config.IssueExclusionProperties; + import static org.fest.assertions.Assertions.assertThat; public class IssueExclusionPatternInitializerTest { @@ -38,7 +38,7 @@ public class IssueExclusionPatternInitializerTest { @Before public void init() { - settings = new Settings(new PropertyDefinitions(IssueExclusionsConfiguration.getPropertyDefinitions())); + settings = new Settings(new PropertyDefinitions(IssueExclusionProperties.all())); patternsInitializer = new IssueExclusionPatternInitializer(settings); } @@ -51,11 +51,11 @@ public class IssueExclusionPatternInitializerTest { @Test public void shouldHavePatternsBasedOnMulticriteriaPattern() { - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY, "1,2"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY + ".1." + IssueExclusionsConfiguration.RESOURCE_KEY, "org/foo/Bar.java"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY + ".1." + IssueExclusionsConfiguration.RULE_KEY, "*"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY + ".2." + IssueExclusionsConfiguration.RESOURCE_KEY, "org/foo/Hello.java"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY + ".2." + IssueExclusionsConfiguration.RULE_KEY, "checkstyle:MagicNumber"); + settings.setProperty("sonar.issue.ignore" + ".multicriteria", "1,2"); + settings.setProperty("sonar.issue.ignore" + ".multicriteria" + ".1." + "resourceKey", "org/foo/Bar.java"); + settings.setProperty("sonar.issue.ignore" + ".multicriteria" + ".1." + "ruleKey", "*"); + settings.setProperty("sonar.issue.ignore" + ".multicriteria" + ".2." + "resourceKey", "org/foo/Hello.java"); + settings.setProperty("sonar.issue.ignore" + ".multicriteria" + ".2." + "ruleKey", "checkstyle:MagicNumber"); patternsInitializer.initPatterns(); assertThat(patternsInitializer.hasConfiguredPatterns()).isTrue(); @@ -77,29 +77,29 @@ public class IssueExclusionPatternInitializerTest { @Test(expected = SonarException.class) public void shouldLogInvalidResourceKey() { - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY, "1"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY + ".1." + IssueExclusionsConfiguration.RESOURCE_KEY, ""); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY + ".1." + IssueExclusionsConfiguration.RULE_KEY, "*"); + settings.setProperty("sonar.issue.ignore" + ".multicriteria", "1"); + settings.setProperty("sonar.issue.ignore" + ".multicriteria" + ".1." + "resourceKey", ""); + settings.setProperty("sonar.issue.ignore" + ".multicriteria" + ".1." + "ruleKey", "*"); patternsInitializer.initPatterns(); } @Test(expected = SonarException.class) public void shouldLogInvalidRuleKey() { - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY, "1"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY + ".1." + IssueExclusionsConfiguration.RESOURCE_KEY, "*"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_EXCLUSION_KEY + ".1." + IssueExclusionsConfiguration.RULE_KEY, ""); + settings.setProperty("sonar.issue.ignore" + ".multicriteria", "1"); + settings.setProperty("sonar.issue.ignore" + ".multicriteria" + ".1." + "resourceKey", "*"); + settings.setProperty("sonar.issue.ignore" + ".multicriteria" + ".1." + "ruleKey", ""); patternsInitializer.initPatterns(); } @Test public void shouldReturnBlockPattern() { - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY, "1,2,3"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY + ".1." + IssueExclusionsConfiguration.BEGIN_BLOCK_REGEXP, "// SONAR-OFF"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY + ".1." + IssueExclusionsConfiguration.END_BLOCK_REGEXP, "// SONAR-ON"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY + ".2." + IssueExclusionsConfiguration.BEGIN_BLOCK_REGEXP, "// FOO-OFF"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY + ".2." + IssueExclusionsConfiguration.END_BLOCK_REGEXP, "// FOO-ON"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY + ".3." + IssueExclusionsConfiguration.BEGIN_BLOCK_REGEXP, "// IGNORE-TO-EOF"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY + ".3." + IssueExclusionsConfiguration.END_BLOCK_REGEXP, ""); + settings.setProperty(IssueExclusionProperties.PATTERNS_BLOCK_KEY, "1,2,3"); + settings.setProperty(IssueExclusionProperties.PATTERNS_BLOCK_KEY + ".1." + IssueExclusionProperties.BEGIN_BLOCK_REGEXP, "// SONAR-OFF"); + settings.setProperty(IssueExclusionProperties.PATTERNS_BLOCK_KEY + ".1." + IssueExclusionProperties.END_BLOCK_REGEXP, "// SONAR-ON"); + settings.setProperty(IssueExclusionProperties.PATTERNS_BLOCK_KEY + ".2." + IssueExclusionProperties.BEGIN_BLOCK_REGEXP, "// FOO-OFF"); + settings.setProperty(IssueExclusionProperties.PATTERNS_BLOCK_KEY + ".2." + IssueExclusionProperties.END_BLOCK_REGEXP, "// FOO-ON"); + settings.setProperty(IssueExclusionProperties.PATTERNS_BLOCK_KEY + ".3." + IssueExclusionProperties.BEGIN_BLOCK_REGEXP, "// IGNORE-TO-EOF"); + settings.setProperty(IssueExclusionProperties.PATTERNS_BLOCK_KEY + ".3." + IssueExclusionProperties.END_BLOCK_REGEXP, ""); patternsInitializer.loadFileContentPatterns(); assertThat(patternsInitializer.hasConfiguredPatterns()).isTrue(); @@ -112,17 +112,17 @@ public class IssueExclusionPatternInitializerTest { @Test(expected = SonarException.class) public void shouldLogInvalidStartBlockPattern() { - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY, "1"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY + ".1." + IssueExclusionsConfiguration.BEGIN_BLOCK_REGEXP, ""); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_BLOCK_KEY + ".1." + IssueExclusionsConfiguration.END_BLOCK_REGEXP, "// SONAR-ON"); + settings.setProperty(IssueExclusionProperties.PATTERNS_BLOCK_KEY, "1"); + settings.setProperty(IssueExclusionProperties.PATTERNS_BLOCK_KEY + ".1." + IssueExclusionProperties.BEGIN_BLOCK_REGEXP, ""); + settings.setProperty(IssueExclusionProperties.PATTERNS_BLOCK_KEY + ".1." + IssueExclusionProperties.END_BLOCK_REGEXP, "// SONAR-ON"); patternsInitializer.loadFileContentPatterns(); } @Test public void shouldReturnAllFilePattern() { - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_ALLFILE_KEY, "1,2"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_ALLFILE_KEY + ".1." + IssueExclusionsConfiguration.FILE_REGEXP, "@SONAR-IGNORE-ALL"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_ALLFILE_KEY + ".2." + IssueExclusionsConfiguration.FILE_REGEXP, "//FOO-IGNORE-ALL"); + settings.setProperty(IssueExclusionProperties.PATTERNS_ALLFILE_KEY, "1,2"); + settings.setProperty(IssueExclusionProperties.PATTERNS_ALLFILE_KEY + ".1." + IssueExclusionProperties.FILE_REGEXP, "@SONAR-IGNORE-ALL"); + settings.setProperty(IssueExclusionProperties.PATTERNS_ALLFILE_KEY + ".2." + IssueExclusionProperties.FILE_REGEXP, "//FOO-IGNORE-ALL"); patternsInitializer.loadFileContentPatterns(); assertThat(patternsInitializer.hasConfiguredPatterns()).isTrue(); @@ -135,8 +135,8 @@ public class IssueExclusionPatternInitializerTest { @Test(expected = SonarException.class) public void shouldLogInvalidAllFilePattern() { - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_ALLFILE_KEY, "1"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_ALLFILE_KEY + ".1." + IssueExclusionsConfiguration.FILE_REGEXP, ""); + settings.setProperty(IssueExclusionProperties.PATTERNS_ALLFILE_KEY, "1"); + settings.setProperty(IssueExclusionProperties.PATTERNS_ALLFILE_KEY + ".1." + IssueExclusionProperties.FILE_REGEXP, ""); patternsInitializer.loadFileContentPatterns(); } } diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java b/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java index ed93e89c8e7..eae28d70c05 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/issue/ignore/pattern/IssueInclusionPatternInitializerTest.java @@ -20,13 +20,12 @@ package org.sonar.batch.issue.ignore.pattern; -import org.sonar.batch.issue.ignore.IssueExclusionsConfiguration; -import org.sonar.batch.issue.ignore.pattern.IssueInclusionPatternInitializer; - import org.junit.Before; import org.junit.Test; import org.sonar.api.config.PropertyDefinitions; import org.sonar.api.config.Settings; +import org.sonar.core.config.IssueExclusionProperties; + import static org.fest.assertions.Assertions.assertThat; public class IssueInclusionPatternInitializerTest { @@ -37,7 +36,7 @@ public class IssueInclusionPatternInitializerTest { @Before public void init() { - settings = new Settings(new PropertyDefinitions(IssueExclusionsConfiguration.getPropertyDefinitions())); + settings = new Settings(new PropertyDefinitions(IssueExclusionProperties.all())); patternsInitializer = new IssueInclusionPatternInitializer(settings); } @@ -49,11 +48,11 @@ public class IssueInclusionPatternInitializerTest { @Test public void shouldHavePatternsBasedOnMulticriteriaPattern() { - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_INCLUSION_KEY, "1,2"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_INCLUSION_KEY + ".1." + IssueExclusionsConfiguration.RESOURCE_KEY, "org/foo/Bar.java"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_INCLUSION_KEY + ".1." + IssueExclusionsConfiguration.RULE_KEY, "*"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_INCLUSION_KEY + ".2." + IssueExclusionsConfiguration.RESOURCE_KEY, "org/foo/Hello.java"); - settings.setProperty(IssueExclusionsConfiguration.PATTERNS_MULTICRITERIA_INCLUSION_KEY + ".2." + IssueExclusionsConfiguration.RULE_KEY, "checkstyle:MagicNumber"); + settings.setProperty("sonar.issue.enforce" + ".multicriteria", "1,2"); + settings.setProperty("sonar.issue.enforce" + ".multicriteria" + ".1." + "resourceKey", "org/foo/Bar.java"); + settings.setProperty("sonar.issue.enforce" + ".multicriteria" + ".1." + "ruleKey", "*"); + settings.setProperty("sonar.issue.enforce" + ".multicriteria" + ".2." + "resourceKey", "org/foo/Hello.java"); + settings.setProperty("sonar.issue.enforce" + ".multicriteria" + ".2." + "ruleKey", "checkstyle:MagicNumber"); patternsInitializer.initPatterns(); assertThat(patternsInitializer.hasConfiguredPatterns()).isTrue(); diff --git a/plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/DefaultMavenPluginExecutorTest.java b/sonar-batch/src/test/java/org/sonar/batch/maven/DefaultMavenPluginExecutorTest.java similarity index 98% rename from plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/DefaultMavenPluginExecutorTest.java rename to sonar-batch/src/test/java/org/sonar/batch/maven/DefaultMavenPluginExecutorTest.java index fcaa0bf34b5..75897a2abb3 100644 --- a/plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/DefaultMavenPluginExecutorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/maven/DefaultMavenPluginExecutorTest.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.maven; +package org.sonar.batch.maven; import org.apache.maven.project.MavenProject; import org.junit.Test; diff --git a/plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/MavenProjectBootstrapperTest.java b/sonar-batch/src/test/java/org/sonar/batch/maven/MavenProjectBootstrapperTest.java similarity index 98% rename from plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/MavenProjectBootstrapperTest.java rename to sonar-batch/src/test/java/org/sonar/batch/maven/MavenProjectBootstrapperTest.java index 9c7cb4ecde8..f4f7ea66051 100644 --- a/plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/MavenProjectBootstrapperTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/maven/MavenProjectBootstrapperTest.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.maven; +package org.sonar.batch.maven; import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; diff --git a/plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/MavenProjectConverterTest.java b/sonar-batch/src/test/java/org/sonar/batch/maven/MavenProjectConverterTest.java similarity index 80% rename from plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/MavenProjectConverterTest.java rename to sonar-batch/src/test/java/org/sonar/batch/maven/MavenProjectConverterTest.java index 6cc799f029c..be1fd2cfe3e 100644 --- a/plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/MavenProjectConverterTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/maven/MavenProjectConverterTest.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.maven; +package org.sonar.batch.maven; import org.apache.commons.io.FileUtils; import org.apache.maven.model.Model; @@ -119,10 +119,10 @@ public class MavenProjectConverterTest { @Test public void moduleNameShouldEqualArtifactId() throws Exception { - File rootDir = TestUtils.getResource("/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/"); - MavenProject parent = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/pom.xml", true); - MavenProject module1 = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module1/pom.xml", false); - MavenProject module2 = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module2/pom.xml", false); + File rootDir = TestUtils.getResource("/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/"); + MavenProject parent = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/pom.xml", true); + MavenProject module1 = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module1/pom.xml", false); + MavenProject module2 = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module2/pom.xml", false); ProjectDefinition rootDef = converter.configure(Arrays.asList(parent, module1, module2), parent); @@ -140,10 +140,10 @@ public class MavenProjectConverterTest { @Test public void moduleNameDifferentThanArtifactId() throws Exception { - File rootDir = TestUtils.getResource("/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/"); - MavenProject parent = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/pom.xml", true); - MavenProject module1 = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path1/pom.xml", false); - MavenProject module2 = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path2/pom.xml", false); + File rootDir = TestUtils.getResource("/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/"); + MavenProject parent = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/pom.xml", true); + MavenProject module1 = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path1/pom.xml", false); + MavenProject module2 = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path2/pom.xml", false); ProjectDefinition rootDef = converter.configure(Arrays.asList(parent, module1, module2), parent); @@ -161,9 +161,9 @@ public class MavenProjectConverterTest { @Test public void should_find_module_with_maven_project_file_naming_different_from_pom_xml() throws Exception { - File rootDir = TestUtils.getResource("/org/sonar/plugins/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/"); - MavenProject parent = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/pom.xml", true); - MavenProject module = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom_having_different_name.xml", false); + File rootDir = TestUtils.getResource("/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/"); + MavenProject parent = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/pom.xml", true); + MavenProject module = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom_having_different_name.xml", false); ProjectDefinition rootDef = converter.configure(Arrays.asList(parent, module), parent); @@ -181,8 +181,8 @@ public class MavenProjectConverterTest { @Test public void testSingleProjectWithoutModules() throws Exception { - File rootDir = TestUtils.getResource("/org/sonar/plugins/maven/MavenProjectConverterTest/singleProjectWithoutModules/"); - MavenProject pom = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/singleProjectWithoutModules/pom.xml", true); + File rootDir = TestUtils.getResource("/org/sonar/batch/maven/MavenProjectConverterTest/singleProjectWithoutModules/"); + MavenProject pom = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/singleProjectWithoutModules/pom.xml", true); ProjectDefinition rootDef = converter.configure(Arrays.asList(pom), pom); @@ -194,7 +194,7 @@ public class MavenProjectConverterTest { @Test public void shouldConvertLinksToProperties() throws Exception { - MavenProject pom = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/projectWithLinks/pom.xml", true); + MavenProject pom = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinks/pom.xml", true); ProjectDefinition rootDef = converter.configure(Arrays.asList(pom), pom); @@ -208,7 +208,7 @@ public class MavenProjectConverterTest { @Test public void shouldNotConvertLinksToPropertiesIfPropertyAlreadyDefined() throws Exception { - MavenProject pom = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/projectWithLinksAndProperties/pom.xml", true); + MavenProject pom = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinksAndProperties/pom.xml", true); ProjectDefinition rootDef = converter.configure(Arrays.asList(pom), pom); @@ -226,7 +226,7 @@ public class MavenProjectConverterTest { @Test public void shouldLoadSourceEncoding() throws Exception { - MavenProject pom = loadPom("/org/sonar/plugins/maven/MavenProjectConverterTest/sourceEncoding/pom.xml", true); + MavenProject pom = loadPom("/org/sonar/batch/maven/MavenProjectConverterTest/sourceEncoding/pom.xml", true); ProjectDefinition rootDef = converter.configure(Arrays.asList(pom), pom); diff --git a/plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/SonarMavenProjectBuilderTest.java b/sonar-batch/src/test/java/org/sonar/batch/maven/SonarMavenProjectBuilderTest.java similarity index 99% rename from plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/SonarMavenProjectBuilderTest.java rename to sonar-batch/src/test/java/org/sonar/batch/maven/SonarMavenProjectBuilderTest.java index a39798c1c85..16cbd06bc1e 100644 --- a/plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/SonarMavenProjectBuilderTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/maven/SonarMavenProjectBuilderTest.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.maven; +package org.sonar.batch.maven; import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom_having_different_name.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom_having_different_name.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom_having_different_name.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/module/pom_having_different_name.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/mavenProjectFileNameNotEqualsToPomXml/pom.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path1/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path1/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path1/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path1/pom.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path2/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path2/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path2/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/path2/pom.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameDifferentThanArtifactId/pom.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module1/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module1/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module1/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module1/pom.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module2/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module2/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module2/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/module2/pom.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/moduleNameShouldEqualArtifactId/pom.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/projectWithLinks/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinks/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/projectWithLinks/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinks/pom.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/projectWithLinksAndProperties/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinksAndProperties/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/projectWithLinksAndProperties/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/projectWithLinksAndProperties/pom.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/singleProjectWithoutModules/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/singleProjectWithoutModules/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/singleProjectWithoutModules/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/singleProjectWithoutModules/pom.xml diff --git a/plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/sourceEncoding/pom.xml b/sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/sourceEncoding/pom.xml similarity index 100% rename from plugins/sonar-maven-batch-plugin/src/test/resources/org/sonar/plugins/maven/MavenProjectConverterTest/sourceEncoding/pom.xml rename to sonar-batch/src/test/resources/org/sonar/batch/maven/MavenProjectConverterTest/sourceEncoding/pom.xml diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java new file mode 100644 index 00000000000..82bb38e79b6 --- /dev/null +++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java @@ -0,0 +1,117 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.core.config; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import org.sonar.api.CoreProperties; +import org.sonar.api.PropertyType; +import org.sonar.api.config.PropertyDefinition; +import org.sonar.api.resources.Qualifiers; + +import java.util.List; + +public class CorePropertyDefinitions { + + private CorePropertyDefinitions() { + // only static stuff + } + + public static List all() { + List defs = Lists.newArrayList(); + defs.addAll(IssueExclusionProperties.all()); + defs.addAll(ExclusionProperties.all()); + defs.addAll(SecurityProperties.all()); + + defs.addAll(ImmutableList.of( + + // DEBT + PropertyDefinition.builder(CoreProperties.HOURS_IN_DAY) + .name("Number of working hours in a day") + .type(PropertyType.INTEGER) + .defaultValue("8") + .category(CoreProperties.CATEGORY_TECHNICAL_DEBT) + .deprecatedKey("sqale.hoursInDay") + .build(), + + // BATCH + + PropertyDefinition.builder(CoreProperties.CORE_VIOLATION_LOCALE_PROPERTY) + .defaultValue("en") + .name("Locale used for issue messages") + .description("Deprecated property. Keep default value for backward compatibility.") + .hidden() + .build(), + + PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 1) + .name("Period 1") + .description("Period used to compare measures and track new violations. Values are :

  • Number of days before " + + "analysis, for example 5.
  • A custom date. Format is yyyy-MM-dd, for example 2010-12-25
  • 'previous_analysis' to " + + "compare to previous analysis
  • 'previous_version' to compare to the previous version in the project history
" + + "

When specifying a number of days or a date, the snapshot selected for comparison is " + + " the first one available inside the corresponding time range.

" + + "

Changing this property only takes effect after subsequent project inspections.

") + .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_1) + .category(CoreProperties.CATEGORY_GENERAL) + .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) + .build(), + + PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 2) + .name("Period 2") + .description("See the property 'Period 1'") + .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_2) + .category(CoreProperties.CATEGORY_GENERAL) + .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) + .build(), + + PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 3) + .name("Period 3") + .description("See the property 'Period 1'") + .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_3) + .category(CoreProperties.CATEGORY_GENERAL) + .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) + .build(), + + PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 4) + .name("Period 4") + .description("Period used to compare measures and track new violations. This property is specific to the project. Values are : " + + "

  • Number of days before analysis, for example 5.
  • A custom date. Format is yyyy-MM-dd, " + + "for example 2010-12-25
  • 'previous_analysis' to compare to previous analysis
    • " + + "
  • 'previous_version' to compare to the previous version in the project history
  • A version, for example 1.2
" + + "

When specifying a number of days or a date, the snapshot selected for comparison is the first one available inside the corresponding time range.

" + + "

Changing this property only takes effect after subsequent project inspections.

") + .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_4) + .onlyOnQualifiers(Qualifiers.PROJECT) + .category(CoreProperties.CATEGORY_GENERAL) + .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) + .build(), + + PropertyDefinition.builder(CoreProperties.TIMEMACHINE_PERIOD_PREFIX + 5) + .name("Period 5") + .description("See the property 'Period 4'") + .defaultValue(CoreProperties.TIMEMACHINE_DEFAULT_PERIOD_5) + .onlyOnQualifiers(Qualifiers.PROJECT) + .category(CoreProperties.CATEGORY_GENERAL) + .subCategory(CoreProperties.SUBCATEGORY_DIFFERENTIAL_VIEWS) + .build() + )); + return defs; + } +} diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/ExclusionProperties.java b/sonar-core/src/main/java/org/sonar/core/config/ExclusionProperties.java similarity index 88% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/ExclusionProperties.java rename to sonar-core/src/main/java/org/sonar/core/config/ExclusionProperties.java index b169a572965..47756b864d6 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/ExclusionProperties.java +++ b/sonar-core/src/main/java/org/sonar/core/config/ExclusionProperties.java @@ -17,23 +17,35 @@ * 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; +package org.sonar.core.config; import com.google.common.collect.ImmutableList; import org.sonar.api.CoreProperties; +import org.sonar.api.PropertyType; import org.sonar.api.config.PropertyDefinition; import org.sonar.api.resources.Qualifiers; import java.util.List; -class ExclusionProperties { +public class ExclusionProperties { private ExclusionProperties() { // only static stuff } - static List definitions() { + public static List all() { return ImmutableList.of( + + // COVERAGE + PropertyDefinition.builder("sonar.coverage.exclusions") + .category(CoreProperties.CATEGORY_EXCLUSIONS) + .subCategory(CoreProperties.SUBCATEGORY_COVERAGE_EXCLUSIONS) + .type(PropertyType.STRING) + .multiValues(true) + .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE) + .build(), + + // FILES PropertyDefinition.builder(CoreProperties.PROJECT_INCLUSIONS_PROPERTY) .name("Source File Inclusions") .multiValues(true) @@ -97,6 +109,7 @@ class ExclusionProperties { .subCategory(CoreProperties.SUBCATEGORY_FILES_EXCLUSIONS) .onlyOnQualifiers(Qualifiers.PROJECT) .index(1) - .build()); + .build() + ); } } diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/IssueExclusionsConfiguration.java b/sonar-core/src/main/java/org/sonar/core/config/IssueExclusionProperties.java similarity index 93% rename from sonar-batch/src/main/java/org/sonar/batch/issue/ignore/IssueExclusionsConfiguration.java rename to sonar-core/src/main/java/org/sonar/core/config/IssueExclusionProperties.java index 18c2f9fa8b4..b98f1cab9be 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/issue/ignore/IssueExclusionsConfiguration.java +++ b/sonar-core/src/main/java/org/sonar/core/config/IssueExclusionProperties.java @@ -17,8 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -package org.sonar.batch.issue.ignore; +package org.sonar.core.config; import com.google.common.collect.ImmutableList; import org.sonar.api.CoreProperties; @@ -29,7 +28,7 @@ import org.sonar.api.resources.Qualifiers; import java.util.List; -public final class IssueExclusionsConfiguration { +public final class IssueExclusionProperties { public static final String SUB_CATEGORY_IGNORE_ISSUES = "issues"; @@ -56,14 +55,13 @@ public final class IssueExclusionsConfiguration { public static final String PATTERNS_ALLFILE_KEY = EXCLUSION_KEY_PREFIX + ALLFILE_SUFFIX; public static final String FILE_REGEXP = "fileRegexp"; - static final int LARGE_SIZE = 40; - static final int SMALL_SIZE = 10; + public static final int LARGE_SIZE = 40; - private IssueExclusionsConfiguration() { - // static configuration declaration only + private IssueExclusionProperties() { + // only static } - public static List getPropertyDefinitions() { + public static List all() { return ImmutableList.of( PropertyDefinition.builder(PATTERNS_MULTICRITERIA_EXCLUSION_KEY) .category(CoreProperties.CATEGORY_EXCLUSIONS) @@ -84,7 +82,8 @@ public final class IssueExclusionsConfiguration { .description("Pattern to match files which should be ignored.") .type(PropertyType.STRING) .indicativeSize(LARGE_SIZE) - .build()) + .build() + ) .build(), PropertyDefinition.builder(PATTERNS_BLOCK_KEY) .category(CoreProperties.CATEGORY_EXCLUSIONS) @@ -105,7 +104,8 @@ public final class IssueExclusionsConfiguration { .description("If specified, this regular expression is used to determine the end of code blocks to ignore. If not, then block ends at the end of file.") .type(PropertyType.STRING) .indicativeSize(LARGE_SIZE) - .build()) + .build() + ) .build(), PropertyDefinition.builder(PATTERNS_ALLFILE_KEY) .category(CoreProperties.CATEGORY_EXCLUSIONS) @@ -120,7 +120,8 @@ public final class IssueExclusionsConfiguration { .description("If this regular expression is found in a file, then the whole file is ignored.") .type(PropertyType.STRING) .indicativeSize(LARGE_SIZE) - .build()) + .build() + ) .build(), PropertyDefinition.builder(PATTERNS_MULTICRITERIA_INCLUSION_KEY) .category(CoreProperties.CATEGORY_EXCLUSIONS) @@ -141,7 +142,9 @@ public final class IssueExclusionsConfiguration { .description("Pattern used to match files to which the rules should be restricted.") .type(PropertyType.STRING) .indicativeSize(LARGE_SIZE) - .build()) - .build()); + .build() + ) + .build() + ); } } diff --git a/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java new file mode 100644 index 00000000000..39157443966 --- /dev/null +++ b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java @@ -0,0 +1,80 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.core.config; + +import com.google.common.collect.ImmutableList; +import org.sonar.api.CoreProperties; +import org.sonar.api.PropertyType; +import org.sonar.api.config.PropertyDefinition; +import org.sonar.api.resources.Qualifiers; + +import java.util.List; + +class SecurityProperties { + + private SecurityProperties() { + // only static stuff + } + + static List all() { + return ImmutableList.of( + PropertyDefinition.builder(CoreProperties.CORE_IMPORT_SOURCES_PROPERTY) + .defaultValue("" + CoreProperties.CORE_IMPORT_SOURCES_DEFAULT_VALUE) + .name("Import sources") + .description("Set to false if sources should not be imported and therefore not available in the Web UI (e.g. for security reasons).") + .type(PropertyType.BOOLEAN) + .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE) + .category(CoreProperties.CATEGORY_SECURITY) + .build(), + + PropertyDefinition.builder(CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY) + .defaultValue("" + CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_DEAULT_VALUE) + .name("Allow users to sign up online") + .description("Users can sign up online.") + .type(PropertyType.BOOLEAN) + .category(CoreProperties.CATEGORY_SECURITY) + .build(), + + PropertyDefinition.builder(CoreProperties.CORE_DEFAULT_GROUP) + .defaultValue(CoreProperties.CORE_DEFAULT_GROUP_DEFAULT_VALUE) + .name("Default user group") + .description("Any new users will automatically join this group.") + .category(CoreProperties.CATEGORY_SECURITY) + .build(), + + PropertyDefinition.builder(CoreProperties.CORE_FORCE_AUTHENTICATION_PROPERTY) + .defaultValue("" + CoreProperties.CORE_FORCE_AUTHENTICATION_DEFAULT_VALUE) + .name("Force user authentication") + .description("Forcing user authentication stops un-logged users to access SonarQube.") + .type(PropertyType.BOOLEAN) + .category(CoreProperties.CATEGORY_SECURITY) + .build(), + + PropertyDefinition.builder(CoreProperties.CORE_PREVENT_AUTOMATIC_PROJECT_CREATION) + .defaultValue(Boolean.toString(false)) + .name("Prevent automatic project creation") + .description("Set to true to prevent automatic project creation at first analysis and force project provisioning.") + .type(PropertyType.BOOLEAN) + .category(CoreProperties.CATEGORY_SECURITY) + .build() + ); + + } +} diff --git a/plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/MavenBatchPluginTest.java b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java similarity index 77% rename from plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/MavenBatchPluginTest.java rename to sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java index 0504cb99f3f..5f3b028baa7 100644 --- a/plugins/sonar-maven-batch-plugin/src/test/java/org/sonar/plugins/maven/MavenBatchPluginTest.java +++ b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java @@ -17,18 +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.maven; +package org.sonar.core.config; import org.junit.Test; +import org.sonar.api.config.PropertyDefinition; -import static org.fest.assertions.Assertions.assertThat; +import java.util.List; -public class MavenBatchPluginTest { +import static org.fest.assertions.Assertions.assertThat; +public class CorePropertyDefinitionsTest { @Test - public void testGetExtensions() { - MavenBatchPlugin plugin = new MavenBatchPlugin(); - assertThat(plugin.getExtensions()).hasSize(4); + public void all() { + List defs = CorePropertyDefinitions.all(); + assertThat(defs.size()).isGreaterThan(10); } - } diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml index 5dd76005a69..61d381de0ae 100644 --- a/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -25,14 +25,8 @@ gson - org.codehaus.sonar - sonar-batch - ${project.version} - - - org.codehaus.sonar - sonar-batch-maven-compat - ${project.version} + com.h2database + h2 org.codehaus.sonar @@ -49,6 +43,12 @@ org.codehaus.sonar sonar-deprecated + + + org.apache.maven + maven-project + + org.codehaus.sonar @@ -503,13 +503,6 @@ sonar-plugin provided - - org.codehaus.sonar.plugins - sonar-maven-batch-plugin - ${project.version} - sonar-plugin - provided - org.codehaus.sonar-plugins.java sonar-jacoco-plugin @@ -629,12 +622,6 @@ - - - com.h2database - h2 - - diff --git a/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java b/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java index 9932eda1aad..8095d1911b6 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java @@ -182,10 +182,6 @@ public class DefaultServerFileSystem implements ServerFileSystem, Startable { return new File(getDeployDir(), "plugins/index.txt"); } - public File getBootstrapIndex() { - return new File(getDeployDir(), "bootstrap/index.txt"); - } - /** * @deprecated since 4.1 */ diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java index 73e14c71530..e7f9d4d9385 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java @@ -39,6 +39,7 @@ import org.sonar.api.utils.UriReader; import org.sonar.api.utils.internal.TempFolderCleaner; import org.sonar.core.component.SnapshotPerspectives; import org.sonar.core.component.db.ComponentDao; +import org.sonar.core.config.CorePropertyDefinitions; import org.sonar.core.config.Logback; import org.sonar.core.i18n.DefaultI18n; import org.sonar.core.i18n.GwtI18n; @@ -162,6 +163,7 @@ class ServerComponents { new TempFolderProvider(), System2.INSTANCE )); + components.addAll(CorePropertyDefinitions.all()); components.addAll(DatabaseMigrations.CLASSES); components.addAll(DaoUtils.getDaoClasses()); return components; @@ -191,7 +193,8 @@ class ServerComponents { // ws RestartHandler.class, - SystemWs.class + SystemWs.class, + BatchWs.class ); } @@ -405,7 +408,6 @@ class ServerComponents { startupContainer.addSingleton(JdbcDriverDeployer.class); startupContainer.addSingleton(RegisterDebtModel.class); startupContainer.addSingleton(GeneratePluginIndex.class); - startupContainer.addSingleton(GenerateBootstrapIndex.class); startupContainer.addSingleton(RegisterNewMeasureFilters.class); startupContainer.addSingleton(RegisterDashboards.class); startupContainer.addSingleton(RegisterPermissionTemplates.class); diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/BatchResourcesServlet.java b/sonar-server/src/main/java/org/sonar/server/plugins/BatchResourcesServlet.java deleted file mode 100644 index f8daf5ae57e..00000000000 --- a/sonar-server/src/main/java/org/sonar/server/plugins/BatchResourcesServlet.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.plugins; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -/** - * This servlet allows to load libraries from directory "WEB-INF/lib" in order to provide them for batch-bootstrapper. - * Most probably this is not a best solution. - */ -public class BatchResourcesServlet extends HttpServlet { - - private static final Logger LOG = LoggerFactory.getLogger(BatchResourcesServlet.class); - private static final long serialVersionUID = -2100128371794649028L; - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - String filename = filename(request); - if (StringUtils.isBlank(filename)) { - throw new IllegalArgumentException("Filename is missing."); - } else { - InputStream in = null; - OutputStream out = null; - try { - in = getServletContext().getResourceAsStream("/WEB-INF/lib/" + filename); - if (in == null) { - // TODO - } else { - response.setContentType("application/java-archive"); - out = response.getOutputStream(); - IOUtils.copy(in, out); - } - } catch (Exception e) { - LOG.error("Unable to load batch resource '" + filename + "'", e); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - } finally { - IOUtils.closeQuietly(in); - IOUtils.closeQuietly(out); - } - } - } - - /** - * @return part of request URL after servlet path - */ - String filename(HttpServletRequest request) { - String filename = null; - if (StringUtils.endsWithIgnoreCase(request.getRequestURI(), "jar")) { - filename = StringUtils.substringAfterLast(request.getRequestURI(), "/"); - } - return filename; - } - -} diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/BatchWs.java b/sonar-server/src/main/java/org/sonar/server/plugins/BatchWs.java new file mode 100644 index 00000000000..25c4cc91746 --- /dev/null +++ b/sonar-server/src/main/java/org/sonar/server/plugins/BatchWs.java @@ -0,0 +1,122 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.plugins; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.filefilter.FileFilterUtils; +import org.apache.commons.io.filefilter.HiddenFileFilter; +import org.apache.commons.lang.CharUtils; +import org.apache.commons.lang.StringUtils; +import org.picocontainer.Startable; +import org.sonar.api.platform.Server; +import org.sonar.api.server.ws.Request; +import org.sonar.api.server.ws.RequestHandler; +import org.sonar.api.server.ws.Response; +import org.sonar.api.server.ws.WebService; +import org.sonar.home.cache.FileHashes; + +import java.io.File; +import java.io.IOException; +import java.util.Collection; + +/** + * JAR files to be downloaded by sonar-runner. + */ +public class BatchWs implements WebService, Startable { + + private final Server server; + private String index; + private File batchDir; + + public BatchWs(Server server) { + this.server = server; + } + + @Override + public void start() { + StringBuilder sb = new StringBuilder(); + batchDir = new File(server.getRootDir(), "lib/batch"); + if (batchDir.exists()) { + Collection files = FileUtils.listFiles(batchDir, HiddenFileFilter.VISIBLE, FileFilterUtils.directoryFileFilter()); + for (File file : files) { + String filename = file.getName(); + if (StringUtils.endsWith(filename, ".jar")) { + sb.append(filename).append('|').append(new FileHashes().of(file)).append(CharUtils.LF); + } + } + } + this.index = sb.toString(); + } + + @Override + public void stop() { + // nothing to do + } + + @Override + public void define(Context context) { + NewController controller = context.createController("batch"); + controller.createAction("index") + .setInternal(true) + .setDescription("List the JAR files to be downloaded by source analyzer") + .setHandler(new RequestHandler() { + @Override + public void handle(Request request, Response response) { + index(response); + } + }); + controller.createAction("file") + .setInternal(true) + .setDescription("Download a JAR file required by source analyzer") + .setHandler(new RequestHandler() { + @Override + public void handle(Request request, Response response) { + file(request, response); + } + }).createParam("name", "Filename"); + + controller.done(); + } + + private void index(Response response) { + try { + response.stream().setMediaType("text/plain"); + IOUtils.write(index, response.stream().output()); + } catch (IOException e) { + throw new IllegalStateException("Fail to send batch index", e); + } + } + + private void file(Request request, Response response) { + String filename = request.mandatoryParam("name"); + try { + File input = new File(batchDir, filename); + if (!input.exists() || !FileUtils.directoryContains(batchDir, input)) { + throw new IllegalArgumentException("Bad filename: " + filename); + } + response.stream().setMediaType("application/java-archive"); + FileUtils.copyFile(input, response.stream().output()); + + } catch (IOException e) { + throw new IllegalStateException("Fail to send batch file " + filename, e); + } + } +} diff --git a/sonar-server/src/main/java/org/sonar/server/startup/GenerateBootstrapIndex.java b/sonar-server/src/main/java/org/sonar/server/startup/GenerateBootstrapIndex.java deleted file mode 100644 index 4b71498785a..00000000000 --- a/sonar-server/src/main/java/org/sonar/server/startup/GenerateBootstrapIndex.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.startup; - -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Lists; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.io.filefilter.FileFilterUtils; -import org.apache.commons.io.filefilter.HiddenFileFilter; -import org.apache.commons.lang.CharUtils; -import org.apache.commons.lang.StringUtils; -import org.sonar.api.platform.Server; -import org.sonar.home.cache.FileHashes; -import org.sonar.server.platform.DefaultServerFileSystem; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Collection; -import java.util.List; - -/** - * @since 3.5 - */ -public final class GenerateBootstrapIndex { - - // JARs starting with one of these prefixes are excluded from batch - private static final String[] IGNORE = {"jtds", "mysql", "postgresql", "jruby", "jfreechart", "eastwood", - "elasticsearch", "lucene"}; - - private static final String LIB_DIR = "/web/WEB-INF/lib"; - - private final Server server; - private final DefaultServerFileSystem fileSystem; - - public GenerateBootstrapIndex(DefaultServerFileSystem fileSystem, Server server) { - this.server = server; - this.fileSystem = fileSystem; - } - - public void start() throws IOException { - writeIndex(fileSystem.getBootstrapIndex()); - } - - void writeIndex(File indexFile) throws IOException { - FileUtils.forceMkdir(indexFile.getParentFile()); - FileWriter writer = new FileWriter(indexFile, false); - try { - File libDir = new File(server.getRootDir(), LIB_DIR); - // TODO hack for Medium tests - if (libDir.exists()) { - for (String path : getLibs(libDir)) { - writer.append(path); - File is = new File(libDir, path); - writer.append("|").append(new FileHashes().of(is)); - writer.append(CharUtils.LF); - } - writer.flush(); - } - - } finally { - IOUtils.closeQuietly(writer); - } - } - - @VisibleForTesting - static List getLibs(File libDir) { - List libs = Lists.newArrayList(); - - Collection files = FileUtils.listFiles(libDir, HiddenFileFilter.VISIBLE, FileFilterUtils.directoryFileFilter()); - for (File file : files) { - String path = file.getPath(); - if (StringUtils.endsWith(path, ".jar")) { - String filename = StringUtils.removeStart(path, libDir.getAbsolutePath() + "/"); - if (!isIgnored(filename)) { - libs.add(filename); - } - } - } - return libs; - } - - /** - * Dirty hack to disable downloading for certain files. - */ - static boolean isIgnored(String filename) { - for (String prefix : IGNORE) { - if (StringUtils.startsWith(filename, prefix)) { - return true; - } - } - return false; - } -} diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java index f480f7447ca..222fbe111db 100644 --- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java +++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java @@ -35,7 +35,11 @@ import org.sonar.api.test.MutableTestPlan; import org.sonar.api.test.MutableTestable; import org.sonar.api.test.TestPlan; import org.sonar.api.test.Testable; -import org.sonar.api.web.*; +import org.sonar.api.web.Footer; +import org.sonar.api.web.NavigationSection; +import org.sonar.api.web.Page; +import org.sonar.api.web.RubyRailsWebservice; +import org.sonar.api.web.Widget; import org.sonar.core.component.SnapshotPerspectives; import org.sonar.core.measure.MeasureFilterEngine; import org.sonar.core.measure.MeasureFilterResult; @@ -46,8 +50,15 @@ import org.sonar.core.resource.ResourceIndexerDao; import org.sonar.core.resource.ResourceKeyUpdaterDao; import org.sonar.core.timemachine.Periods; import org.sonar.server.db.migrations.DatabaseMigrator; -import org.sonar.server.platform.*; -import org.sonar.server.plugins.*; +import org.sonar.server.platform.Platform; +import org.sonar.server.platform.ServerIdGenerator; +import org.sonar.server.platform.ServerSettings; +import org.sonar.server.platform.SettingsChangeNotifier; +import org.sonar.server.plugins.InstalledPluginReferentialFactory; +import org.sonar.server.plugins.PluginDownloader; +import org.sonar.server.plugins.ServerPluginJarsInstaller; +import org.sonar.server.plugins.ServerPluginRepository; +import org.sonar.server.plugins.UpdateCenterMatrixFactory; import org.sonar.server.rule.RuleRepositories; import org.sonar.server.source.CodeColorizers; import org.sonar.server.user.NewUserNotifier; @@ -57,7 +68,6 @@ import org.sonar.updatecenter.common.Version; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import java.io.IOException; import java.net.InetAddress; import java.sql.Connection; import java.util.Collection; @@ -369,10 +379,6 @@ public final class JRubyFacade { return Platform.getInstance().getContainer(); } - public String boostrapIndexPath() throws IOException { - return getContainer().getComponentByType(DefaultServerFileSystem.class).getBootstrapIndex().getCanonicalPath(); - } - // UPDATE PROJECT KEY ------------------------------------------------------------------ public void updateResourceKey(long projectId, String newKey) { get(ResourceKeyUpdaterDao.class).updateKey(projectId, newKey); diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb index e8e7f802538..a12fb2fbc52 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/batch_bootstrap_controller.rb @@ -90,11 +90,6 @@ class BatchBootstrapController < Api::ApiController render :json => JSON(json_properties) end - # GET /batch_bootstrap/index - def index - render :file => java_facade.boostrapIndexPath(), :layout => false - end - private def render_unauthorized(message, status=403) diff --git a/sonar-server/src/main/webapp/WEB-INF/config/routes.rb b/sonar-server/src/main/webapp/WEB-INF/config/routes.rb index 2a04f24fd55..72dbd1eb08b 100644 --- a/sonar-server/src/main/webapp/WEB-INF/config/routes.rb +++ b/sonar-server/src/main/webapp/WEB-INF/config/routes.rb @@ -14,6 +14,11 @@ ActionController::Routing::Routes.draw do |map| end map.connect 'api', :controller => 'api/java_ws', :action => 'redirect_to_ws_listing' + + # deprecated, sonar-runner should use batch/index and batch/file?name=xxx + map.connect 'batch_bootstrap/index', :controller => 'api/java_ws', :action => 'index', :wspath => 'batch', :wsaction => 'index' + map.connect 'batch/:name', :controller => 'api/java_ws', :action => 'index', :wspath => 'batch', :wsaction => 'file', :requirements => { :name => /.*/ } + map.connect 'api/metrics', :controller => 'api/metrics', :action => 'index', :conditions => { :method => :get } map.connect 'api/metrics/:id', :controller => 'api/metrics', :action => 'show', :conditions => { :method => :get } map.connect 'api/metrics/:id', :controller => 'api/metrics', :action => 'create', :conditions => { :method => :post } diff --git a/sonar-server/src/main/webapp/WEB-INF/web.xml b/sonar-server/src/main/webapp/WEB-INF/web.xml index 1dff5cbff4c..b4896f15c56 100644 --- a/sonar-server/src/main/webapp/WEB-INF/web.xml +++ b/sonar-server/src/main/webapp/WEB-INF/web.xml @@ -90,10 +90,6 @@ static org.sonar.server.plugins.StaticResourcesServlet - - batch - org.sonar.server.plugins.BatchResourcesServlet - chart @@ -107,10 +103,6 @@ static /static/* - - batch - /batch/* - diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/BatchResourcesServletTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/BatchResourcesServletTest.java deleted file mode 100644 index 0ad48616e6b..00000000000 --- a/sonar-server/src/test/java/org/sonar/server/plugins/BatchResourcesServletTest.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.plugins; - -import org.junit.Before; -import org.junit.Test; - -import javax.servlet.http.HttpServletRequest; - -import static org.fest.assertions.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -public class BatchResourcesServletTest { - private BatchResourcesServlet servlet; - private HttpServletRequest request; - - @Before - public void setUp() throws Exception { - servlet = new BatchResourcesServlet(); - request = mock(HttpServletRequest.class); - } - - @Test - public void test_filename() { - when(request.getContextPath()).thenReturn("sonar"); - when(request.getServletPath()).thenReturn("/batch"); - - when(request.getRequestURI()).thenReturn("/sonar/batch/sonar-core-2.6.jar"); - assertThat(servlet.filename(request)).isEqualTo("sonar-core-2.6.jar"); - - when(request.getRequestURI()).thenReturn("/sonar/batch/"); - assertThat(servlet.filename(request)).isNull(); - - when(request.getRequestURI()).thenReturn("/sonar/batch"); - assertThat(servlet.filename(request)).isNull(); - - when(request.getRequestURI()).thenReturn("/sonar/batch.html"); - assertThat(servlet.filename(request)).isNull(); - - when(request.getRequestURI()).thenReturn("/sonar/batch/index.html"); - assertThat(servlet.filename(request)).isNull(); - } - -} diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/BatchWsTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/BatchWsTest.java new file mode 100644 index 00000000000..d20d346180d --- /dev/null +++ b/sonar-server/src/test/java/org/sonar/server/plugins/BatchWsTest.java @@ -0,0 +1,108 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.plugins; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.CharUtils; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.rules.TemporaryFolder; +import org.sonar.api.platform.Server; +import org.sonar.api.server.ws.WsTester; + +import java.io.File; +import java.io.IOException; + +import static org.fest.assertions.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class BatchWsTest { + + @Rule + public TemporaryFolder temp = new TemporaryFolder(); + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + Server server = mock(Server.class); + + @Before + public void prepare_fs() throws IOException { + File rootDir = temp.newFolder(); + when(server.getRootDir()).thenReturn(rootDir); + + File batchDir = new File(rootDir, "lib/batch"); + FileUtils.forceMkdir(batchDir); + FileUtils.writeStringToFile(new File(batchDir, "sonar-batch.jar"), "foo"); + } + + @Test + public void download_index() throws Exception { + BatchWs ws = new BatchWs(server); + ws.start(); + WsTester tester = new WsTester(ws); + + String index = tester.newRequest("index").execute().outputAsString(); + assertThat(index).isEqualTo("sonar-batch.jar|acbd18db4cc2f85cedef654fccc4a4d8" + CharUtils.LF); + + ws.stop(); + } + + @Test + public void download_file() throws Exception { + BatchWs ws = new BatchWs(server); + ws.start(); + WsTester tester = new WsTester(ws); + + String jar = tester.newRequest("file").setParam("name", "sonar-batch.jar").execute().outputAsString(); + assertThat(jar).isEqualTo("foo"); + } + + /** + * Do not allow to download files located outside the directory lib/batch, for example + * /etc/passwd + */ + @Test + public void check_location_of_file() throws Exception { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("Bad filename: ../sonar-batch.jar"); + + BatchWs ws = new BatchWs(server); + ws.start(); + WsTester tester = new WsTester(ws); + + tester.newRequest("file").setParam("name", "../sonar-batch.jar").execute(); + } + + @Test + public void file_does_not_exist() throws Exception { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("Bad filename: other.jar"); + + BatchWs ws = new BatchWs(server); + ws.start(); + WsTester tester = new WsTester(ws); + + tester.newRequest("file").setParam("name", "other.jar").execute(); + } +} diff --git a/sonar-server/src/test/java/org/sonar/server/startup/GenerateBootstrapIndexTest.java b/sonar-server/src/test/java/org/sonar/server/startup/GenerateBootstrapIndexTest.java deleted file mode 100644 index ca6f7c74e0e..00000000000 --- a/sonar-server/src/test/java/org/sonar/server/startup/GenerateBootstrapIndexTest.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.startup; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; - -import java.io.File; -import java.io.IOException; - -import static org.fest.assertions.Assertions.assertThat; - -public class GenerateBootstrapIndexTest { - - @Rule - public TemporaryFolder rootDir = new TemporaryFolder(); - - @Before - public void setUp() throws Exception { - } - - @Test - public void determine_list_of_resources() throws IOException { - new File(rootDir.getRoot(), "/web/WEB-INF/lib").mkdirs(); - File webInf = new File(rootDir.getRoot(), "/web/WEB-INF"); - File lib = new File(rootDir.getRoot(), "/web/WEB-INF/lib"); - new File(webInf, "directory").mkdir(); - new File(lib, "sonar-core-2.6.jar").createNewFile(); - new File(lib, "treemap.rbr").createNewFile(); - new File(lib, "sonar-core-2.6.jar").createNewFile(); - - assertThat(GenerateBootstrapIndex.getLibs(lib)).hasSize(1); - assertThat(GenerateBootstrapIndex.getLibs(lib).get(0)).isEqualTo("sonar-core-2.6.jar"); - } - - @Test - public void ignore_some_jars() { - assertThat(GenerateBootstrapIndex.isIgnored("sonar-batch-2.6-SNAPSHOT.jar")).isFalse(); - assertThat(GenerateBootstrapIndex.isIgnored("mysql-connector-java-5.1.13.jar")).isTrue(); - assertThat(GenerateBootstrapIndex.isIgnored("postgresql-9.0-801.jdbc3.jar")).isTrue(); - assertThat(GenerateBootstrapIndex.isIgnored("jtds-1.2.4.jar")).isTrue(); - assertThat(GenerateBootstrapIndex.isIgnored("jfreechart-1.0.9.jar")).isTrue(); - assertThat(GenerateBootstrapIndex.isIgnored("eastwood-1.1.0.jar")).isTrue(); - assertThat(GenerateBootstrapIndex.isIgnored("jruby-complete-1.5.6.jar")).isTrue(); - assertThat(GenerateBootstrapIndex.isIgnored("jruby-rack-1.0.5.jar")).isTrue(); - assertThat(GenerateBootstrapIndex.isIgnored("elasticsearch-0.90.6.jar")).isTrue(); - assertThat(GenerateBootstrapIndex.isIgnored("lucene-core-4.5.1.jar")).isTrue(); - } - -} -- 2.39.5