diff options
3 files changed, 11 insertions, 13 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java index 7122f7a706f..d6f12b0af4c 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ExclusionFilters.java @@ -36,6 +36,9 @@ public class ExclusionFilters implements FileSystemFilter, ResourceFilter, Batch public ExclusionFilters(FileExclusions exclusions) { this.exclusionSettings = exclusions; + } + + public void start() { log("Included sources: ", sourceInclusions()); log("Excluded sources: ", sourceExclusions()); log("Included tests: ", testInclusions()); diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java b/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java index b0325204fc0..715afe2166e 100644 --- a/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java +++ b/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java @@ -233,14 +233,6 @@ public class DefaultPluginMetadata implements PluginMetadata, Comparable<PluginM return this; } - public boolean hasKey() { - return StringUtils.isNotBlank(key); - } - - public boolean hasMainClass() { - return StringUtils.isNotBlank(mainClass); - } - public DefaultPluginMetadata setUseChildFirstClassLoader(boolean use) { this.useChildFirstClassLoader = use; return this; @@ -277,10 +269,6 @@ public class DefaultPluginMetadata implements PluginMetadata, Comparable<PluginM return this; } - public boolean isOldManifest() { - return !hasKey() && hasMainClass(); - } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java index 13c1ec5234d..ac27319ce45 100644 --- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java +++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewMeasureFilters.java @@ -105,7 +105,12 @@ public final class RegisterNewMeasureFilters { if (filter.getPageSize() > 0) { fields.add("pageSize=" + filter.getPageSize()); } + appendCriteria(filter, fields); + appendColumns(filter, fields); + return Joiner.on("|").join(fields); + } + private static void appendCriteria(Filter filter, List<String> fields) { int metricCriterionId = 1; for (Criterion criterion : filter.getCriteria()) { if ("qualifier".equals(criterion.getFamily())) { @@ -132,6 +137,9 @@ public final class RegisterNewMeasureFilters { metricCriterionId += 1; } } + } + + private static void appendColumns(Filter filter, List<String> fields) { List<String> columnFields = Lists.newArrayList(); for (FilterColumn column : filter.getColumns()) { String columnKey = column.getFamily(); @@ -143,6 +151,5 @@ public final class RegisterNewMeasureFilters { if (!columnFields.isEmpty()) { fields.add("cols=" + Joiner.on(",").join(columnFields)); } - return Joiner.on("|").join(fields); } } |