SONAR-7234 Remove @SupportedEnvironment

2 files changed, 3 insertions, 28 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
index 80c73e48dae..02517f6d696 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
@@ -23,7 +23,6 @@ import java.util.List;
 import javax.annotation.Nullable;
 import org.sonar.api.ExtensionProvider;
 import org.sonar.api.SonarPlugin;
-import org.sonar.batch.bootstrapper.EnvironmentInformation;
 import org.sonar.core.platform.ComponentContainer;
 import org.sonar.core.platform.PluginInfo;
 import org.sonar.core.platform.PluginRepository;
@@ -31,11 +30,9 @@ import org.sonar.core.platform.PluginRepository;
 public class ExtensionInstaller {
 
   private final PluginRepository pluginRepository;
-  private final EnvironmentInformation env;
 
-  public ExtensionInstaller(PluginRepository pluginRepository, EnvironmentInformation env) {
+  public ExtensionInstaller(PluginRepository pluginRepository) {
     this.pluginRepository = pluginRepository;
-    this.env = env;
   }
 
   public ExtensionInstaller install(ComponentContainer container, ExtensionMatcher matcher) {
@@ -66,9 +63,8 @@ public class ExtensionInstaller {
     return this;
   }
 
-  private void doInstall(ComponentContainer container, ExtensionMatcher matcher, @Nullable PluginInfo pluginInfo, Object extension) {
-    if (ExtensionUtils.supportsEnvironment(extension, env)
-      && matcher.accept(extension)) {
+  private static void doInstall(ComponentContainer container, ExtensionMatcher matcher, @Nullable PluginInfo pluginInfo, Object extension) {
+    if (matcher.accept(extension)) {
       container.addExtension(pluginInfo, extension);
     } else {
       container.declareExtension(pluginInfo, extension);
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
index 74735c7cd34..adf16a40315 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java
@@ -19,12 +19,9 @@
  */
 package org.sonar.batch.bootstrap;
 
-import org.apache.commons.lang.StringUtils;
 import org.sonar.api.batch.BatchSide;
 import org.sonar.api.batch.InstantiationStrategy;
-import org.sonar.api.batch.SupportedEnvironment;
 import org.sonar.api.utils.AnnotationUtils;
-import org.sonar.batch.bootstrapper.EnvironmentInformation;
 
 public class ExtensionUtils {
 
@@ -44,24 +41,6 @@ public class ExtensionUtils {
     return AnnotationUtils.getAnnotation(extension, BatchSide.class) != null;
   }
 
-  public static boolean supportsEnvironment(Object extension, EnvironmentInformation environment) {
-    SupportedEnvironment env = AnnotationUtils.getAnnotation(extension, SupportedEnvironment.class);
-    if (env == null) {
-      return true;
-    }
-    for (String supported : env.value()) {
-      if (StringUtils.equalsIgnoreCase(environment.getKey(), supported)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  public static boolean isMavenExtensionOnly(Object extension) {
-    SupportedEnvironment env = AnnotationUtils.getAnnotation(extension, SupportedEnvironment.class);
-    return env != null && env.value().length == 1 && StringUtils.equalsIgnoreCase("maven", env.value()[0]);
-  }
-
   public static boolean isType(Object extension, Class<?> extensionClass) {
     Class clazz = extension instanceof Class ? (Class) extension : extension.getClass();
     return extensionClass.isAssignableFrom(clazz);