SONAR-5389 Sort analyzers according to metrics used/produced

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java
index b5979b998ea14d142160f1b2b2641e26d262e806..fca38c4a4ce3086ef7a569c9928d2141dfcb4be4 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java
@@ -19,18 +19,19 @@
  */
 package org.sonar.batch.bootstrap;
 
-import org.sonar.api.batch.analyzer.Analyzer;
-import org.sonar.api.batch.analyzer.AnalyzerContext;
-
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.ClassUtils;
 import org.sonar.api.batch.CheckProject;
 import org.sonar.api.batch.Sensor;
+import org.sonar.api.batch.analyzer.Analyzer;
+import org.sonar.api.batch.analyzer.AnalyzerContext;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.platform.ComponentContainer;
 import org.sonar.api.resources.Project;
 import org.sonar.batch.scan.SensorWrapper;
 
+import javax.annotation.Nullable;
+
 import java.util.Collection;
 import java.util.List;
 
@@ -48,7 +49,7 @@ public class BatchExtensionDictionnary extends org.sonar.api.batch.BatchExtensio
     this.context = context;
   }
 
-  public <T> Collection<T> select(Class<T> type, Project project, boolean sort, ExtensionMatcher matcher) {
+  public <T> Collection<T> select(Class<T> type, @Nullable Project project, boolean sort, @Nullable ExtensionMatcher matcher) {
     List<T> result = getFilteredExtensions(type, project, matcher);
     if (sort) {
       return sort(result);
@@ -56,9 +57,9 @@ public class BatchExtensionDictionnary extends org.sonar.api.batch.BatchExtensio
     return result;
   }
 
-  private <T> List<T> getFilteredExtensions(Class<T> type, Project project, ExtensionMatcher matcher) {
+  private <T> List<T> getFilteredExtensions(Class<T> type, @Nullable Project project, @Nullable ExtensionMatcher matcher) {
     List<T> result = Lists.newArrayList();
-    for (Object extension : getExtensions()) {
+    for (Object extension : getExtensions(type)) {
       if (type == Sensor.class && extension instanceof Analyzer) {
         extension = new SensorWrapper((Analyzer) extension, context, fs);
       }
@@ -69,7 +70,7 @@ public class BatchExtensionDictionnary extends org.sonar.api.batch.BatchExtensio
     return result;
   }
 
-  private boolean shouldKeep(Class type, Object extension, Project project, ExtensionMatcher matcher) {
+  private boolean shouldKeep(Class type, Object extension, @Nullable Project project, @Nullable ExtensionMatcher matcher) {
     boolean keep = (ClassUtils.isAssignable(extension.getClass(), type)
       || (type == Sensor.class && ClassUtils.isAssignable(extension.getClass(), Analyzer.class)))
       && (matcher == null || matcher.accept(extension));

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan2/AnalyzersExecutor.java b/sonar-batch/src/main/java/org/sonar/batch/scan2/AnalyzersExecutor.java
index ce2d9e3effbc14cd885715730cb34d750414db31..f90cb5ad4a4aa929871636f47fd9e3fa395d8a0a 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan2/AnalyzersExecutor.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan2/AnalyzersExecutor.java
@@ -25,7 +25,7 @@ import org.sonar.api.BatchComponent;
 import org.sonar.api.batch.analyzer.Analyzer;
 import org.sonar.api.batch.analyzer.AnalyzerContext;
 import org.sonar.api.batch.analyzer.internal.DefaultAnalyzerDescriptor;
-import org.sonar.api.platform.ComponentContainer;
+import org.sonar.batch.bootstrap.BatchExtensionDictionnary;
 
 import java.util.Collection;
 
@@ -33,14 +33,14 @@ public class AnalyzersExecutor implements BatchComponent {
 
   private static final Logger LOG = LoggerFactory.getLogger(AnalyzersExecutor.class);
 
-  private ComponentContainer container;
+  private BatchExtensionDictionnary selector;
 
-  public AnalyzersExecutor(ComponentContainer container) {
-    this.container = container;
+  public AnalyzersExecutor(BatchExtensionDictionnary selector) {
+    this.selector = selector;
   }
 
   public void execute(AnalyzerContext context) {
-    Collection<Analyzer> analyzers = container.getComponentsByType(Analyzer.class);
+    Collection<Analyzer> analyzers = selector.select(Analyzer.class, null, true, null);
 
     for (Analyzer analyzer : analyzers) {
 

diff --git a/sonar-deprecated/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java b/sonar-deprecated/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java
index 0e83d92f0be6bb30583f21826e314b6f2f4344e3..556ea373b9cccc54fc2233c9d532417112a46925 100644 (file)
--- a/sonar-deprecated/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java
+++ b/sonar-deprecated/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java
@@ -33,6 +33,8 @@ import org.sonar.api.resources.Project;
 import org.sonar.api.utils.AnnotationUtils;
 import org.sonar.api.utils.dag.DirectAcyclicGraph;
 
+import javax.annotation.Nullable;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
@@ -59,7 +61,7 @@ public class BatchExtensionDictionnary {
     return select(type, null, false);
   }
 
-  public <T> Collection<T> select(Class<T> type, Project project, boolean sort) {
+  public <T> Collection<T> select(Class<T> type, @Nullable Project project, boolean sort) {
     List<T> result = getFilteredExtensions(type, project);
     if (sort) {
       return sort(result);
@@ -69,7 +71,7 @@ public class BatchExtensionDictionnary {
 
   public Collection<MavenPluginHandler> selectMavenPluginHandlers(Project project) {
     List<DependsUponMavenPlugin> selectedExtensions = Lists.newArrayList();
-    for (Object extension : getExtensions()) {
+    for (Object extension : getExtensions(null)) {
       if (ClassUtils.isAssignable(extension.getClass(), DependsUponMavenPlugin.class)) {
         selectedExtensions.add((DependsUponMavenPlugin) extension);
       }
@@ -91,22 +93,22 @@ public class BatchExtensionDictionnary {
     return handlers;
   }
 
-  protected List<Object> getExtensions() {
+  protected List<Object> getExtensions(@Nullable Class type) {
     List<Object> extensions = Lists.newArrayList();
-    completeBatchExtensions(componentContainer, extensions);
+    completeBatchExtensions(componentContainer, extensions, type);
     return extensions;
   }
 
-  private static void completeBatchExtensions(ComponentContainer container, List<Object> extensions) {
+  private static void completeBatchExtensions(ComponentContainer container, List<Object> extensions, @Nullable Class type) {
     if (container != null) {
-      extensions.addAll(container.getComponentsByType(BatchExtension.class));
-      completeBatchExtensions(container.getParent(), extensions);
+      extensions.addAll(container.getComponentsByType(type != null ? type : BatchExtension.class));
+      completeBatchExtensions(container.getParent(), extensions, type);
     }
   }
 
-  private <T> List<T> getFilteredExtensions(Class<T> type, Project project) {
+  private <T> List<T> getFilteredExtensions(Class<T> type, @Nullable Project project) {
     List<T> result = Lists.newArrayList();
-    for (Object extension : getExtensions()) {
+    for (Object extension : getExtensions(type)) {
       if (shouldKeep(type, extension, project)) {
         result.add((T) extension);
       }
@@ -114,7 +116,7 @@ public class BatchExtensionDictionnary {
     return result;
   }
 
-  private boolean shouldKeep(Class type, Object extension, Project project) {
+  private boolean shouldKeep(Class type, Object extension, @Nullable Project project) {
     boolean keep = ClassUtils.isAssignable(extension.getClass(), type);
     if (keep && project != null && ClassUtils.isAssignable(extension.getClass(), CheckProject.class)) {
       keep = ((CheckProject) extension).shouldExecuteOnProject(project);

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/internal/DefaultAnalyzerDescriptor.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/internal/DefaultAnalyzerDescriptor.java
index 9a2841903eb82ca661a23134e6b7c3a9a7bc31c2..29fb8730fc1f623b9b177f3c608837808ac5bd84 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/internal/DefaultAnalyzerDescriptor.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/analyzer/internal/DefaultAnalyzerDescriptor.java
@@ -29,10 +29,10 @@ import java.util.Collection;
 public class DefaultAnalyzerDescriptor implements AnalyzerDescriptor {
 
   private String name;
-  private Metric<?>[] dependsOn;
-  private Metric<?>[] provides;
-  private String[] languages;
-  private InputFile.Type[] types;
+  private Metric<?>[] dependsOn = new Metric<?>[0];
+  private Metric<?>[] provides = new Metric<?>[0];
+  private String[] languages = new String[0];
+  private InputFile.Type[] types = new InputFile.Type[0];
 
   public String name() {
     return name;