From e24cfc947d9a16bfed1c14d08761651efcddfd09 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Fri, 23 Jan 2015 12:23:51 +0100 Subject: [PATCH] SONAR-5077 Rename property to enable indexation of all files --- .../org/sonar/plugins/core/CorePlugin.java | 10 --- .../scan/filesystem/InputFileBuilder.java | 2 +- .../core/config/ExclusionProperties.java | 63 +++++++++++-------- .../java/org/sonar/api/CoreProperties.java | 2 +- 4 files changed, 40 insertions(+), 37 deletions(-) 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 2187ca1cf85..a2a86e37fd5 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 @@ -253,16 +253,6 @@ import java.util.List; project = true, global = false, category = CoreProperties.CATEGORY_SCM - ), - @Property( - key = CoreProperties.INDEX_ALL_FILES_KEY, - defaultValue = "false", - name = "Index all files", - description = "Should all files be indexed even if there is no matching language plugin installed.", - module = false, - project = true, - global = true, - category = CoreProperties.CATEGORY_GENERAL ) }) public final class CorePlugin extends SonarPlugin { diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilder.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilder.java index b3aba4f61b0..c97c47cf67d 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilder.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputFileBuilder.java @@ -102,7 +102,7 @@ class InputFileBuilder { inputFile.setEncoding(fs.encoding().name()); String lang = langDetection.language(inputFile); - if (lang == null && !settings.getBoolean(CoreProperties.INDEX_ALL_FILES_KEY)) { + if (lang == null && !settings.getBoolean(CoreProperties.IMPORT_UNKNOWN_FILES_KEY)) { return null; } inputFile.setLanguage(lang); diff --git a/sonar-core/src/main/java/org/sonar/core/config/ExclusionProperties.java b/sonar-core/src/main/java/org/sonar/core/config/ExclusionProperties.java index 8b4df1a53f4..3521520e745 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/ExclusionProperties.java +++ b/sonar-core/src/main/java/org/sonar/core/config/ExclusionProperties.java @@ -46,22 +46,16 @@ public class ExclusionProperties { .build(), // FILES - PropertyDefinition.builder(CoreProperties.PROJECT_INCLUSIONS_PROPERTY) - .name("Source File Inclusions") - .multiValues(true) + PropertyDefinition.builder(CoreProperties.IMPORT_UNKNOWN_FILES_KEY) + .name("Import unknown files") + .description("If set to true, all files are imported - with respect to inclusions and exclusions, even if there is no matching language plugin installed.") + .type(PropertyType.BOOLEAN) .category(CoreProperties.CATEGORY_EXCLUSIONS) .subCategory(CoreProperties.SUBCATEGORY_FILES_EXCLUSIONS) .onQualifiers(Qualifiers.PROJECT) - .index(3) - .build(), - PropertyDefinition.builder(CoreProperties.PROJECT_TEST_INCLUSIONS_PROPERTY) - .name("Test File Inclusions") - .multiValues(true) - .category(CoreProperties.CATEGORY_EXCLUSIONS) - .subCategory(CoreProperties.SUBCATEGORY_FILES_EXCLUSIONS) - .onQualifiers(Qualifiers.PROJECT) - .index(5) + .index(-1) .build(), + PropertyDefinition.builder(CoreProperties.GLOBAL_EXCLUSIONS_PROPERTY) .name("Global Source File Exclusions") .multiValues(true) @@ -76,6 +70,25 @@ public class ExclusionProperties { .subCategory(CoreProperties.SUBCATEGORY_FILES_EXCLUSIONS) .index(1) .build(), + + PropertyDefinition.builder(CoreProperties.CORE_SKIPPED_MODULES_PROPERTY) + .name("Exclude Modules") + .description("Maven artifact ids of modules to exclude.") + .multiValues(true) + .category(CoreProperties.CATEGORY_EXCLUSIONS) + .subCategory(CoreProperties.SUBCATEGORY_FILES_EXCLUSIONS) + .onlyOnQualifiers(Qualifiers.PROJECT) + .index(0) + .build(), + PropertyDefinition.builder(CoreProperties.CORE_INCLUDED_MODULES_PROPERTY) + .name("Include Modules") + .description("Maven artifact ids of modules to include.") + .multiValues(true) + .category(CoreProperties.CATEGORY_EXCLUSIONS) + .subCategory(CoreProperties.SUBCATEGORY_FILES_EXCLUSIONS) + .onlyOnQualifiers(Qualifiers.PROJECT) + .index(1) + .build(), PropertyDefinition.builder(CoreProperties.PROJECT_EXCLUSIONS_PROPERTY) .name("Source File Exclusions") .multiValues(true) @@ -84,32 +97,32 @@ public class ExclusionProperties { .onQualifiers(Qualifiers.PROJECT) .index(2) .build(), - PropertyDefinition.builder(CoreProperties.PROJECT_TEST_EXCLUSIONS_PROPERTY) - .name("Test File Exclusions") + + PropertyDefinition.builder(CoreProperties.PROJECT_INCLUSIONS_PROPERTY) + .name("Source File Inclusions") .multiValues(true) .category(CoreProperties.CATEGORY_EXCLUSIONS) .subCategory(CoreProperties.SUBCATEGORY_FILES_EXCLUSIONS) .onQualifiers(Qualifiers.PROJECT) - .index(4) + .index(3) .build(), - PropertyDefinition.builder(CoreProperties.CORE_SKIPPED_MODULES_PROPERTY) - .name("Exclude Modules") - .description("Maven artifact ids of modules to exclude.") + PropertyDefinition.builder(CoreProperties.PROJECT_TEST_EXCLUSIONS_PROPERTY) + .name("Test File Exclusions") .multiValues(true) .category(CoreProperties.CATEGORY_EXCLUSIONS) .subCategory(CoreProperties.SUBCATEGORY_FILES_EXCLUSIONS) - .onlyOnQualifiers(Qualifiers.PROJECT) - .index(0) + .onQualifiers(Qualifiers.PROJECT) + .index(4) .build(), - PropertyDefinition.builder(CoreProperties.CORE_INCLUDED_MODULES_PROPERTY) - .name("Include Modules") - .description("Maven artifact ids of modules to include.") + PropertyDefinition.builder(CoreProperties.PROJECT_TEST_INCLUSIONS_PROPERTY) + .name("Test File Inclusions") .multiValues(true) .category(CoreProperties.CATEGORY_EXCLUSIONS) .subCategory(CoreProperties.SUBCATEGORY_FILES_EXCLUSIONS) - .onlyOnQualifiers(Qualifiers.PROJECT) - .index(1) + .onQualifiers(Qualifiers.PROJECT) + .index(5) .build() + ); } } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java index 30e727324ad..e8eba564068 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java @@ -556,5 +556,5 @@ public interface CoreProperties { /** * @since 5.1 */ - String INDEX_ALL_FILES_KEY = "sonar.index_all_files"; + String IMPORT_UNKNOWN_FILES_KEY = "sonar.import_unknown_files"; } -- 2.39.5