SONAR-4069 Restore Metrics as a BatchExtension

to avoid compatibility issues with plugins

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
index bc8839f3b913e0a59521e9381a0b091ef14e74b3..59e626ab41767bae57953a4027e00c6f9ea95d20 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
@@ -20,15 +20,15 @@
 package org.sonar.batch.bootstrap;
 
 import com.google.common.collect.Lists;
+import org.sonar.api.BatchComponent;
 import org.sonar.api.ExtensionProvider;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.measures.Metrics;
-import org.sonar.api.task.TaskComponent;
 
 import java.util.List;
 
-public class MetricProvider extends ExtensionProvider implements TaskComponent {
+public class MetricProvider extends ExtensionProvider implements BatchComponent {
 
   private Metrics[] factories;
 

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 f898e874340f8a63a8fc4310c775a10b3507340a..89073052f40cfc6934859a010d0e09b21393622e 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java
@@ -63,7 +63,6 @@ public class TaskContainer extends ComponentContainer {
     add(
         ResourceTypes.class,
         DefaultResourcePermissions.class,
-        MetricProvider.class,
         Tasks.class);
   }
 

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 7d000a2de1e75095563089a4f80eff872ae5d549..969c726d98d6383042d71c063f69decc3b5e5a5d 100644 (file)
--- 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
@@ -19,14 +19,14 @@
  */
 package org.sonar.api.measures;
 
+import org.sonar.api.BatchExtension;
 import org.sonar.api.ServerExtension;
-import org.sonar.api.task.TaskExtension;
 
 import java.util.List;
 
 /**
  * @since 1.10
  */
-public interface Metrics extends TaskExtension, ServerExtension {
+public interface Metrics extends BatchExtension, ServerExtension {
   List<Metric> getMetrics();
 }