Do not use deprecated rule categories (column MEASURES.RULES_CATEGORY_ID, table RULES_CATEGORY_ID), but keep them in API for backward-compatibility

12 files changed, 0 insertions, 24 deletions

diff --git a/sonar-core/src/main/resources/META-INF/persistence.xml b/sonar-core/src/main/resources/META-INF/persistence.xml
index 7d2c6a63cdb..357801c27b9 100644
--- a/sonar-core/src/main/resources/META-INF/persistence.xml
+++ b/sonar-core/src/main/resources/META-INF/persistence.xml
@@ -25,7 +25,6 @@
     <class>org.sonar.api.security.GroupRole</class>
     <class>org.sonar.api.rules.Rule</class>
     <class>org.sonar.api.rules.RuleParam</class>
-    <class>org.sonar.api.rules.RulesCategory</class>
     <class>org.sonar.api.resources.ProjectLink</class>
     <class>org.sonar.api.profiles.RulesProfile</class>
     <class>org.sonar.api.rules.ActiveRule</class>
diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/CacheRuleFinderTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/rule/CacheRuleFinderTest/shared.xml
index fc4fcd733aa..4e02fa9c0b3 100644
--- a/sonar-core/src/test/resources/org/sonar/core/rule/CacheRuleFinderTest/shared.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/rule/CacheRuleFinderTest/shared.xml
@@ -1,6 +1,4 @@
 <dataset>
-  <rules_categories id="6" name="Efficiency" description="Efficiency" />
-
   <!-- CHECKSTYLE -->
 
   <rules id="1" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck"
diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/DefaultRuleFinderTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/rule/DefaultRuleFinderTest/shared.xml
index fc4fcd733aa..4e02fa9c0b3 100644
--- a/sonar-core/src/test/resources/org/sonar/core/rule/DefaultRuleFinderTest/shared.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/rule/DefaultRuleFinderTest/shared.xml
@@ -1,6 +1,4 @@
 <dataset>
-  <rules_categories id="6" name="Efficiency" description="Efficiency" />
-
   <!-- CHECKSTYLE -->
 
   <rules id="1" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck"
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldCountNumberOfRulesOfACategoryForGivenPlugins.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldCountNumberOfRulesOfACategoryForGivenPlugins.xml
index beb32a48647..dc6eb2966ef 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldCountNumberOfRulesOfACategoryForGivenPlugins.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldCountNumberOfRulesOfACategoryForGivenPlugins.xml
@@ -1,8 +1,5 @@
 <dataset>
 
-  <rules_categories id="1" name="category one" description="one"/>
-  <rules_categories id="2" name="category two" description="two"/>
-
   <rules id="1" name="rule one" description="desc" plugin_config_key="config"
          plugin_rule_key="rule_one" plugin_name="plugin1" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
 
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml
index c7505dab4df..f5004757f82 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml
@@ -1,7 +1,5 @@
 <dataset>
 
-  <rules_categories id="1" name="category one" description="one"/>
-
   <rules id="1" name="rule1" description="desc" plugin_config_key="config"
          plugin_rule_key="key1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
 
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml
index c8822914314..ad93402fa5b 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml
@@ -1,7 +1,5 @@
 <dataset>
 
-  <rules_categories id="1" name="category one" description="one"/>
-
   <rules id="1" name="rule1" description="desc" plugin_config_key="config"
          plugin_rule_key="key1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
 
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml
index b8eeab6cd24..394b84a7374 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml
@@ -1,7 +1,5 @@
 <dataset>
 
-  <rules_categories id="1" name="category one" description="one"/>
-
   <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>
   <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>
 
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml
index 21ba79e615a..107805b86f2 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml
@@ -1,7 +1,5 @@
 <dataset>
 
-  <rules_categories id="1" name="category one" description="one"/>
-
   <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>
   <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>
 
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml
index b8eeab6cd24..394b84a7374 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml
@@ -1,7 +1,5 @@
 <dataset>
 
-  <rules_categories id="1" name="category one" description="one"/>
-
   <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>
   <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>
 
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml
index c398ce6e150..8bb3979e8ad 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml
@@ -1,7 +1,5 @@
 <dataset>
 
-  <rules_categories id="1" name="category one" description="one"/>
-
   <!-- Rules -->
   <rules id="1" name="new1" description="test1" plugin_config_key="checker/new1"
          plugin_rule_key="checkstyle.new1" plugin_name="PLUGIN_KEY" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml
index d993d31f910..4d4c0ba987f 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml
@@ -1,7 +1,5 @@
 <dataset>
 
-  <rules_categories id="1" name="category one" description="one"/>
-
   <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"
          plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
 
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRules.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRules.xml
index 9c435f0ff62..35d4172d221 100644
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRules.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRules.xml
@@ -1,7 +1,5 @@
 <dataset>
 
-  <rules_categories id="1" name="category one" description="one"/>
-
   <rules id="1" name="rule one" description="desc" plugin_config_key="other config"
          plugin_rule_key="rule_one" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
   <rules id="2" name="rule two" description="desc" plugin_config_key="config"