Merge pull request #858 from guwirth/remove-other-sqale

remove sonar.cxx.other.sqales support
SonarOpenCommunity · May 5, 2016 · 7a169ea · 7a169ea
2 parents e277fbb + 148d810
commit 7a169ea
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 199 deletions.
diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java
@@ -254,15 +254,6 @@ private static List<PropertyDefinition> codeAnalysisProperties() {
       .multiValues(true)
       .subCategory(subcateg)
       .index(12)
-      .build(),
-      PropertyDefinition.builder(CxxExternalRuleRepository.SQALES_KEY)
-      .name("External SQALE characteristics")
-      .description("SQALE characteristics for 'external' code analysers. Use one value per rule set."
-        + " See <a href='https://github.com/SonarOpenCommunity/sonar-cxx/wiki/Extending-the-code-analysis'>this page</a> for details.")
-      .type(PropertyType.TEXT)
-      .multiValues(true)
-      .subCategory(subcateg)
-      .index(13)
       .build()
     );
   }

diff --git a/...x-plugin/src/main/java/org/sonar/plugins/cxx/externalrules/CxxExternalRuleRepository.java b/...x-plugin/src/main/java/org/sonar/plugins/cxx/externalrules/CxxExternalRuleRepository.java
@@ -27,8 +27,6 @@
 import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
 import org.sonar.plugins.cxx.CxxLanguage;
 import org.sonar.plugins.cxx.utils.CxxUtils;
-import org.sonar.squidbridge.rules.SqaleXmlLoader;
-import org.sonar.plugins.cxx.utils.CxxSqaleXmlLoader;
 
 /**
  * Loads the external rules configuration file.
@@ -37,7 +35,6 @@ public class CxxExternalRuleRepository implements RulesDefinition {
 
   public static final String KEY = "other";
   public static final String RULES_KEY = "sonar.cxx.other.rules";
-  public static final String SQALES_KEY = "sonar.cxx.other.sqales";
   public final Settings settings;
   private final RulesDefinitionXmlLoader xmlRuleLoader;
   private static final String NAME = "Other";

diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/utils/CxxSqaleXmlLoader.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/utils/CxxSqaleXmlLoader.java
diff --git a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/CxxPluginTest.java b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/CxxPluginTest.java
@@ -28,6 +28,6 @@ public class CxxPluginTest {
   @Test
   public void testGetExtensions() throws Exception {
     CxxPlugin plugin = new CxxPlugin();
-    assertEquals(69, plugin.getExtensions().size());
+    assertEquals(68, plugin.getExtensions().size());
   }
 }