Fix loading of metric formulas when defined in plugins

3 files changed, 36 insertions, 2 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java
index 806323bbdfb..dddea1ccc0b 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java
@@ -24,6 +24,7 @@ import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.ClassUtils;
 import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.PicoContainer;
 import org.sonar.api.BatchExtension;
 import org.sonar.api.batch.maven.DependsUponMavenPlugin;
 import org.sonar.api.batch.maven.MavenPluginHandler;
@@ -86,7 +87,16 @@ public class BatchExtensionDictionnary {
   }
 
   private List<BatchExtension> getExtensions() {
-    return picoContainer.getComponents(BatchExtension.class);
+    List<BatchExtension> extensions = Lists.newArrayList();
+    completeBatchExtensions(picoContainer, extensions);
+    return extensions;
+  }
+
+  private void completeBatchExtensions(PicoContainer picoContainer, List<BatchExtension> extensions) {
+    if (picoContainer!=null) {
+      extensions.addAll(picoContainer.getComponents(BatchExtension.class));
+      completeBatchExtensions(picoContainer.getParent(), extensions);
+    }
   }
 
   private <T> List<T> getFilteredExtensions(Class<T> type, Project project) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java
index 6a29a569a51..f0217638aed 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java
@@ -21,12 +21,14 @@ package org.sonar.api.measures;
 
 import org.sonar.api.BatchExtension;
 import org.sonar.api.ServerExtension;
+import org.sonar.api.batch.InstantiationStrategy;
 
 import java.util.List;
 
 /**
  * @since 1.10
  */
+@InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 public interface Metrics extends BatchExtension, ServerExtension {
   List<Metric> getMetrics();
 }
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/BatchExtensionDictionnaryTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/BatchExtensionDictionnaryTest.java
index 210da5a4c59..37e6e644c49 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/BatchExtensionDictionnaryTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/BatchExtensionDictionnaryTest.java
@@ -21,8 +21,13 @@ package org.sonar.api.batch;
 
 import com.google.common.collect.Lists;
 import org.junit.Test;
+import org.picocontainer.Characteristics;
+import org.picocontainer.DefaultPicoContainer;
+import org.picocontainer.PicoContainer;
 import org.picocontainer.containers.TransientPicoContainer;
 import org.sonar.api.BatchExtension;
+import org.sonar.api.measures.CoreMetrics;
+import org.sonar.api.measures.Metric;
 import org.sonar.api.resources.Project;
 
 import java.util.ArrayList;
@@ -33,6 +38,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.internal.matchers.IsCollectionContaining.hasItem;
+import static org.junit.internal.matchers.IsCollectionContaining.hasItems;
 import static org.mockito.Mockito.mock;
 
 public class BatchExtensionDictionnaryTest {
@@ -47,7 +53,7 @@ public class BatchExtensionDictionnaryTest {
   }
 
   @Test
-  public void getFilteredExtensions() {
+  public void testGetFilteredExtensions() {
     Sensor sensor1 = new FakeSensor(), sensor2 = new FakeSensor();
     Decorator decorator = mock(Decorator.class);
 
@@ -60,6 +66,22 @@ public class BatchExtensionDictionnaryTest {
   }
 
   @Test
+  public void shouldSearchInParentContainers() {
+    TransientPicoContainer grandParent = new TransientPicoContainer();
+    grandParent.as(Characteristics.CACHE).addComponent("ncloc", CoreMetrics.NCLOC);
+
+    DefaultPicoContainer parent = (DefaultPicoContainer)grandParent.makeChildContainer();
+    parent.as(Characteristics.CACHE).addComponent("coverage", CoreMetrics.COVERAGE);
+
+    DefaultPicoContainer child = (DefaultPicoContainer)parent.makeChildContainer();
+    child.as(Characteristics.CACHE).addComponent("complexity", CoreMetrics.COMPLEXITY);
+
+    BatchExtensionDictionnary dictionnary = new BatchExtensionDictionnary(child);
+    assertThat(dictionnary.select(Metric.class).size(), is(3));
+    assertThat(dictionnary.select(Metric.class), hasItems(CoreMetrics.NCLOC, CoreMetrics.COVERAGE, CoreMetrics.COMPLEXITY));
+  }
+
+  @Test
   public void sortExtensionsByDependency() {
     BatchExtension a = new MethodDependentOf(null);
     BatchExtension b = new MethodDependentOf(a);