SONAR-1814 remove the API to find a plugin from an extension :

 * do register coverage extensions in picocontainer only when the plugin is selected (see parameter sonar.core.codeCoveragePlugin)
 * do not display plugin names when detecting a duplication of metrics
 * remove unused methods from the deprecated component RulesManager

3 files changed, 9 insertions, 256 deletions

diff --git a/sonar-deprecated/src/main/java/org/sonar/api/rules/DefaultRulesManager.java b/sonar-deprecated/src/main/java/org/sonar/api/rules/DefaultRulesManager.java
index 26b917b9329..37345cead6a 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/rules/DefaultRulesManager.java
+++ b/sonar-deprecated/src/main/java/org/sonar/api/rules/DefaultRulesManager.java
@@ -19,143 +19,31 @@
  */
 package org.sonar.api.rules;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.sonar.api.Plugin;
-import org.sonar.api.Plugins;
+import com.google.common.collect.Maps;
 import org.sonar.jpa.dao.RulesDao;
-import org.sonar.api.resources.Language;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * A class to manage and access rules defined in Sonar.
  *
- *  @deprecated UGLY CLASS - WILL BE COMPLETELY REFACTORED IN SONAR 2.3 
+ * @deprecated UGLY CLASS 
  */
 @Deprecated
 public class DefaultRulesManager extends RulesManager {
 
-  private final Set<Language> languages;
-  private final RulesRepository<?>[] repositories;
-  private final Map<Language, List<RulesRepository<?>>> rulesByLanguage;
-  private final Map<Language, List<Plugin>> pluginsByLanguage;
-  private final Map<String, Map<String, Rule>> rulesByPluginAndKey = new HashMap<String, Map<String, Rule>>();
+  private final Map<String, Map<String, Rule>> rulesByPluginAndKey = Maps.newHashMap();
   private final RulesDao rulesDao;
-  private final Plugins plugins;
 
-  /**
-   * Creates a RuleManager
-   * @param plugins the plugins dictionnary
-   * @param repositories the repositories of rules
-   * @param dao the dao object
-   */
-  public DefaultRulesManager(Plugins plugins, RulesRepository[] repositories, RulesDao dao) {
-    this.plugins = plugins;
+  public DefaultRulesManager(RulesDao dao) {
     this.rulesDao = dao;
-
-    languages = new HashSet<Language>();
-    rulesByLanguage = new HashMap<Language, List<RulesRepository<?>>>();
-    pluginsByLanguage = new HashMap<Language, List<Plugin>>();
-    this.repositories = repositories;
-
-    for (RulesRepository<?> repository : repositories) {
-      languages.add(repository.getLanguage());
-
-      List<RulesRepository<?>> list = rulesByLanguage.get(repository.getLanguage());
-      if (list == null) {
-        list = new ArrayList<RulesRepository<?>>();
-        rulesByLanguage.put(repository.getLanguage(), list);
-      }
-      list.add(repository);
-
-      List<Plugin> languagePlugins = pluginsByLanguage.get(repository.getLanguage());
-      if (languagePlugins == null) {
-        languagePlugins = new ArrayList<Plugin>();
-        pluginsByLanguage.put(repository.getLanguage(), languagePlugins);
-      }
-      languagePlugins.add(plugins.getPluginByExtension(repository));
-    }
-  }
-
-  /**
-   * Constructor for tests only
-   *
-   * @param dao the dao
-   */
-  protected DefaultRulesManager(RulesDao dao, Plugins plugins) {
-    this.rulesDao = dao;
-    this.plugins = plugins;
-    languages = new HashSet<Language>();
-    rulesByLanguage = new HashMap<Language, List<RulesRepository<?>>>();
-    pluginsByLanguage = new HashMap<Language, List<Plugin>>();
-    repositories = null;
-
-  }
-
-  /**
-   * Returns the list of languages for which there is a rule repository
-   *
-   * @return a Set of languages
-   */
-  public Set<Language> getLanguages() {
-    return languages;
-  }
-
-  /**
-   * Gets the list of Rules Repositories available for a language
-   *
-   * @param language the language
-   * @return the list of rules repositories
-   */
-  public List<RulesRepository<?>> getRulesRepositories(Language language) {
-    List<RulesRepository<?>> rulesRepositories = rulesByLanguage.get(language);
-    if (CollectionUtils.isNotEmpty(rulesRepositories)) {
-      return rulesRepositories;
-    }
-    return Collections.emptyList();
-  }
-
-  /**
-   * Gets the complete list of Rules Repositories in the Sonar instance
-   *
-   * @return the list of rules repositories
-   */
-  public List<RulesRepository<?>> getRulesRepositories() {
-    return Arrays.asList(repositories);
-  }
-
-  /**
-   * Gets the list of rules plugins for a given language
-   * @param language  the language
-   * @return the list of plugins
-   */
-  public List<Plugin> getPlugins(Language language) {
-    List<Plugin> result = pluginsByLanguage.get(language);
-    if (!CollectionUtils.isEmpty(result)) {
-      return result;
-    }
-    return Collections.emptyList();
-  }
-
-
-  /**
-   * Get the list of rules plugin that implement a mechanism of import for a given language
-   *
-   * @param language the language
-   * @return the list of plugins
-   */
-  public List<Plugin> getImportablePlugins(Language language) {
-    List<Plugin> targets = new ArrayList<Plugin>();
-    for (RulesRepository<?> repository : getRulesRepositories(language)) {
-      if (repository instanceof ConfigurationImportable) {
-        targets.add(plugins.getPluginByExtension(repository));
-      }
-    }
-    return targets;
   }
 
   /**
    * Gets a list of rules indexed by their key for a given plugin
+   *
    * @param pluginKey the plugin key
    * @return a Map with the rule key and the rule
    */
@@ -175,21 +63,10 @@ public class DefaultRulesManager extends RulesManager {
   }
 
   /**
-   * Gets a collection of rules belonging to a plugin
-   *
-   * @param pluginKey the plugin key
-   * @return the collection of rules
-   */
-  public Collection<Rule> getPluginRules(String pluginKey) {
-    Map<String, Rule> rulesByKey = getPluginRulesIndexedByKey(pluginKey);
-    return rulesByKey.values();
-  }
-
-  /**
    * Gets a rule belonging to a defined plugin based on its key
    *
    * @param pluginKey the plugin key
-   * @param ruleKey the rule key
+   * @param ruleKey   the rule key
    * @return the rule
    */
   public Rule getPluginRule(String pluginKey, String ruleKey) {
diff --git a/sonar-deprecated/src/main/java/org/sonar/api/rules/RulesManager.java b/sonar-deprecated/src/main/java/org/sonar/api/rules/RulesManager.java
index 374f2241cf3..2cf6a872307 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/rules/RulesManager.java
+++ b/sonar-deprecated/src/main/java/org/sonar/api/rules/RulesManager.java
@@ -34,58 +34,6 @@ import java.util.Set;
 public abstract class RulesManager {
 
   /**
-   * Returns the list of languages for which there is a rule repository
-   *
-   * @return a Set of languages
-   */
-  public abstract Set<Language> getLanguages();
-
-  /**
-   * Gets the list of Rules Repositories available for a language
-   *
-   * @param language the language
-   * @return the list of rules repositories
-   */
-  public abstract List<RulesRepository<?>> getRulesRepositories(Language language);
-
-  /**
-   * Gets the complete list of Rules Repositories in the Sonar instance
-   *
-   * @return the list of rules repositories
-   */
-  public abstract List<RulesRepository<?>> getRulesRepositories();
-
-  /**
-   * Gets the list of rules plugins for a given language
-   * @param language  the language
-   * @return the list of plugins
-   */
-  public abstract List<Plugin> getPlugins(Language language);
-
-  /**
-   * Get the list of rules plugin that implement a mechanism of import for a given language
-   *
-   * @param language the language
-   * @return the list of plugins
-   */
-  public abstract List<Plugin> getImportablePlugins(Language language);
-
-  /**
-   * Gets a list of rules indexed by their key for a given plugin
-   * @param pluginKey the plugin key
-   * @return a Map with the rule key and the rule
-   */
-  public abstract Map<String, Rule> getPluginRulesIndexedByKey(String pluginKey);
-
-  /**
-   * Gets a collection of rules belonging to a plugin
-   *
-   * @param pluginKey the plugin key
-   * @return the collection of rules
-   */
-  public abstract Collection<Rule> getPluginRules(String pluginKey);
-
-  /**
    * Gets a rule belonging to a defined plugin based on its key
    *
    * @param pluginKey the plugin key
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/rules/DefaultRulesManagerTest.java b/sonar-deprecated/src/test/java/org/sonar/api/rules/DefaultRulesManagerTest.java
deleted file mode 100644
index 7aec32d575e..00000000000
--- a/sonar-deprecated/src/test/java/org/sonar/api/rules/DefaultRulesManagerTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*

- * Sonar, open source software quality management tool.

- * Copyright (C) 2009 SonarSource SA

- * mailto:contact AT sonarsource DOT com

- *

- * Sonar is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 3 of the License, or (at your option) any later version.

- *

- * Sonar is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with Sonar; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02

- */

-package org.sonar.api.rules;

-

-import org.junit.Test;

-import org.sonar.api.Plugin;

-import org.sonar.api.Plugins;

-import org.sonar.jpa.dao.RulesDao;

-import org.sonar.api.resources.Language;

-import org.sonar.jpa.dao.DaoFacade;

-

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

-

-import static org.hamcrest.CoreMatchers.is;

-import static org.hamcrest.MatcherAssert.assertThat;

-import static org.mockito.Mockito.mock;

-import static org.mockito.Mockito.when;

-

-public class DefaultRulesManagerTest {

-

-  @Test

-  public void shouldReturnsZeroImportablePluginsWhenLanguageHasNoRulesPlugin() {

-    DefaultRulesManager rulesManager = createRulesManagerForAlanguageWithNoPlugins();

-

-    Language language = mock(Language.class);

-    List<Plugin> result = rulesManager.getImportablePlugins(language);

-    assertThat(result.size(), is(0));

-  }

-

-  @Test

-  public void shouldReturnZeroPluginWhenLanguageHasNoRulesPlugin() {

-    DefaultRulesManager rulesManager = createRulesManagerForAlanguageWithNoPlugins();

-    Language language = mock(Language.class);

-    List<Plugin> result = rulesManager.getPlugins(language);

-    assertThat(result.size(), is(0));

-  }

-

-  @Test

-  public void shouldReturnZeroRulesRepositoryWhenLanguageHasNoRulesRepository() {

-    DefaultRulesManager rulesManager = createRulesManagerForAlanguageWithNoPlugins();

-    Language language = mock(Language.class);

-    List<RulesRepository<?>> result = rulesManager.getRulesRepositories(language);

-    assertThat(result.size(), is(0));

-  }

-

-  private DefaultRulesManager createRulesManagerForAlanguageWithNoPlugins() {

-    DaoFacade dao = mock(DaoFacade.class);

-    RulesDao rulesDao = mock(RulesDao.class);

-    when(rulesDao.getCategories()).thenReturn(Collections.<RulesCategory>emptyList());

-    DefaultRulesManager rulesManager = new DefaultRulesManager(rulesDao, new Plugins(null));

-    return rulesManager;

-  }

-}