From a061b03797d481eb555891811a29298c44e7601f Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Sat, 10 May 2014 14:58:28 +0200
Subject: [PATCH] Update RegisterRuleTest db files for Tags

---
 .../disable_deprecated_active_rule_params-result.xml |  4 ++--
 .../disable_deprecated_active_rule_params.xml        |  2 +-
 .../disable_deprecated_active_rules-result.xml       |  8 ++++----
 .../disable_deprecated_active_rules.xml              |  4 ++--
 .../disable_deprecated_repositories-result.xml       |  6 +++---
 .../disable_deprecated_rules-result.xml              |  8 ++++----
 .../RegisterRulesTest/disable_deprecated_rules.xml   |  4 ++--
 ...e_template_rules_if_parent_is_disabled-result.xml | 12 ++++++------
 .../disable_template_rules_if_parent_is_disabled.xml |  8 ++++----
 ...ions_if_rule_is_linked_on_root_characteristic.xml |  4 ++--
 .../insert_extended_repositories-result.xml          |  4 ++--
 .../RegisterRulesTest/insert_new_rules-result.xml    |  6 +++---
 .../not_disable_already_disabled_rules-result.xml    |  8 ++++----
 .../not_disable_already_disabled_rules.xml           |  4 ++--
 .../not_disable_manual_rules-result.xml              |  8 ++++----
 .../RegisterRulesTest/not_disable_manual_rules.xml   |  4 ++--
 ...le_template_rules_if_parent_is_enabled-result.xml |  6 +++---
 ...t_disable_template_rules_if_parent_is_enabled.xml |  4 ++--
 .../not_update_already_disabled_rules-result.xml     |  4 ++--
 .../not_update_already_disabled_rules.xml            |  2 +-
 ...moved_rules_when_repository_is_still_existing.xml |  2 +-
 .../reactivate_disabled_rules-result.xml             |  4 ++--
 .../RegisterRulesTest/reactivate_disabled_rules.xml  |  2 +-
 .../reactivate_disabled_template_rules-result.xml    |  6 +++---
 .../reactivate_disabled_template_rules.xml           |  4 ++--
 ...teristic_when_characteristic_not_found-result.xml |  4 ++--
 ..._characteristic_when_characteristic_not_found.xml |  4 ++--
 ...and_overriding_characteristic_disabled-result.xml |  4 ++--
 ..._found_and_overriding_characteristic_disabled.xml |  4 ++--
 ...but_characteristic_has_been_overridden-result.xml |  4 ++--
 ..._found_but_characteristic_has_been_overridden.xml |  4 ++--
 .../sonar/server/rule2/RegisterRulesTest/shared.xml  |  2 +-
 ...undle_name_and_description_in_database-result.xml |  4 ++--
 .../RegisterRulesTest/update_rule_fields-result.xml  |  2 +-
 .../rule2/RegisterRulesTest/update_rule_fields.xml   |  2 +-
 .../update_rule_parameters-result.xml                |  4 ++--
 .../RegisterRulesTest/update_rule_parameters.xml     |  4 ++--
 .../update_template_rule_language-result.xml         |  8 ++++----
 .../update_template_rule_language.xml                |  8 ++++----
 39 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml
index dfa2ccff019..e62e97a793d 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
   <rules_parameters id="1" rule_id="1" default_value="default value one" description="parameter one" name="param1" param_type="STRING"/>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params.xml
index 2f429f49bbb..5b6e2bc90ed 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rule_params.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]" />
 
   <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="STRING"/>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules-result.xml
index 931499501cc..4994d92912a 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules-result.xml
@@ -1,15 +1,15 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="tag1,tag3,tag5" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules.xml
index 8957a2373d4..e93d82a6fde 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_active_rules.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="deprecated-prop" description="[null]" param_type="STRING"/>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_repositories-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_repositories-result.xml
index f350c52f77b..f62bcfb60d1 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_repositories-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_repositories-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
      status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
                    status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
   <rules_parameters id="1" rule_id="2" default_value="default value one" description="parameter one" name="param1" param_type="STRING"/>
   <rules_parameters id="2" rule_id="2" default_value="default value two" description="parameter two" name="param2" param_type="STRING"/>
@@ -11,7 +11,7 @@
   <rule_tags id="2" rule_id="2" tag="tag3" tag_type="SYSTEM"/>
   <rule_tags id="3" rule_id="2" tag="tag5" tag_type="SYSTEM"/>
 
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
                    status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
   
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules-result.xml
index e87230b12d6..0a9bf6572c3 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules-result.xml
@@ -1,20 +1,20 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="deprecated-prop" description="[null]" param_type="STRING" default_value="[null]"/>
 
-  <rules tags="[null]" system_tags="tag1,tag2,tag5" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="tag1,tag3,tag5" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
   <rules_parameters id="2" rule_id="3" default_value="default value one" description="parameter one" name="param1" param_type="STRING"/>
   <rules_parameters id="3" rule_id="3" default_value="default value two" description="parameter two" name="param2" param_type="STRING"/>
 
-  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules.xml
index d13c0db742f..877df431166 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_deprecated_rules.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="formertag1" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="formertag1" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
-  <rules tags="formertag2" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="formertag2" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="deprecated-prop" description="[null]" param_type="STRING"/>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml
index 81682535971..9d0e154fead 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml
@@ -1,21 +1,21 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="disabled_rule" plugin_name="fake" plugin_config_key="[null]" name="Disabled rule" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="disabled_rule" plugin_name="fake" plugin_config_key="[null]" name="Disabled rule" description="[null]"
          status="REMOVED" priority="4" cardinality="MULTIPLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="1" language="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="disabled_rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="" system_tags="" id="3" plugin_rule_key="disabled_rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="REMOVED" priority="1" cardinality="SINGLE" parent_id="[null]"  language="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="3" language="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="5" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="" id="5" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="6" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="6" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml
index d3e61274471..6091a6bd195 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml
@@ -1,19 +1,19 @@
 <dataset>
 
   <!-- Rule as been removed -->
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="disabled_rule" plugin_name="fake" plugin_config_key="[null]" name="Disabled rule" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="disabled_rule" plugin_name="fake" plugin_config_key="[null]" name="Disabled rule" description="[null]"
          status="REMOVED" priority="4" cardinality="MULTIPLE" parent_id="[null]"/>
 
   <!-- user rule duplicated from rule 1. It is currently enabled. -->
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1"/>
 
   <!-- This rule will be removed... -->
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="disabled_rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="" system_tags="" id="3" plugin_rule_key="disabled_rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="READY" priority="1" cardinality="SINGLE" parent_id="[null]" />
 
   <!-- ...so this template will be removed too -->
-  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="3"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml
index d5dfe74dd1c..55f29c2f961 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="2" kee="MEMORY_EFFICIENCY" name="Efficiency" parent_id="[null]" characteristic_order="[null]" enabled="[true]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="200"
          remediation_function="[null]" default_remediation_function="LINEAR"
@@ -10,7 +10,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="squid.S1115.effortTotFix"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="READY" priority="1" cardinality="SINGLE" parent_id="[null]"/>
 
 
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_extended_repositories-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_extended_repositories-result.xml
index 5ad7d6d57d1..680cb48eac0 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_extended_repositories-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_extended_repositories-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="findbugs" plugin_config_key="[null]" name="Rule One" description="Description of Rule One"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="findbugs" plugin_config_key="[null]" name="Rule One" description="Description of Rule One"
      status="READY" priority="2" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-    <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="findbugs" plugin_config_key="[null]" name="Rule Two" description="Description of Rule Two"
+    <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="findbugs" plugin_config_key="[null]" name="Rule Two" description="Description of Rule Two"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_new_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_new_rules-result.xml
index 0578a3d9262..8bd8da0698b 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_new_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/insert_new_rules-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -8,7 +8,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="2"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
@@ -27,7 +27,7 @@
   <rules_rule_tags id="2" rule_id="2" rule_tag_id="2" tag_type="SYSTEM"/>
   <rules_rule_tags id="3" rule_id="2" rule_tag_id="3" tag_type="SYSTEM"/>
 
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules-result.xml
index c798a6a0c7a..3a2aa5a2542 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -9,7 +9,7 @@
          effort_to_fix_description="[null]"
          updated_at="2014-03-16"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -19,7 +19,7 @@
          updated_at="2014-03-16"/>
 
  <!-- New rules -->
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="2"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
@@ -28,7 +28,7 @@
          effort_to_fix_description="squid.S115.effortToFix"
          updated_at="2014-03-17 19:10:03.0"/>
 
-  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules.xml
index 13907539477..44553e69261 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_already_disabled_rules.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="2" kee="MEMORY_EFFICIENCY" name="Memory Efficiency" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -11,7 +11,7 @@
          effort_to_fix_description="[null]"
          updated_at="2014-03-16"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules-result.xml
index 0f73b04c525..54e13193071 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules-result.xml
@@ -1,15 +1,15 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="PerformanceIssue" plugin_name="manual" plugin_config_key="[null]" name="Performance Issue" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="PerformanceIssue" plugin_name="manual" plugin_config_key="[null]" name="Performance Issue" description="[null]"
          status="READY" priority="[null]" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="IllegalExceptionCheck" plugin_name="checkstyle" plugin_config_key="[null]" name="Illegal Exception" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="IllegalExceptionCheck" plugin_name="checkstyle" plugin_config_key="[null]" name="Illegal Exception" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules.xml
index 7f175d92749..832e52b92b6 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_manual_rules.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="PerformanceIssue" plugin_name="manual" plugin_config_key="[null]" name="Performance Issue" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="PerformanceIssue" plugin_name="manual" plugin_config_key="[null]" name="Performance Issue" description="[null]"
          status="READY" priority="[null]" cardinality="SINGLE" parent_id="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="IllegalExceptionCheck" plugin_name="checkstyle" plugin_config_key="[null]" name="Illegal Exception" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="IllegalExceptionCheck" plugin_name="checkstyle" plugin_config_key="[null]" name="Illegal Exception" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml
index e4a4196bcce..0c26b40b517 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml
@@ -1,12 +1,12 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
      status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
      status="READY" priority="4" cardinality="SINGLE" parent_id="1" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
      status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml
index 8e3bcfb804d..60fffd2389a 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Rule one" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Rule one" description="[null]"
          status="READY" priority="4" cardinality="MULTIPLE" parent_id="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules-result.xml
index 91f0b991742..2f2f453533a 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
                    status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules.xml
index 45e3706d700..56d37d8e543 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/not_update_already_disabled_rules.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml
index f4e73c9239b..0e6a0aa4968 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="fake" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="fake" plugin_config_key="[null]" name="Deprecated" description="[null]"
                    status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules-result.xml
index 57d8e33ed85..13c41591aa5 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
                    status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
                    status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules.xml
index d5b82972127..3ab3113fd4d 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_rules.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Old name" description="Old description"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Old name" description="Old description"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules-result.xml
index 7e0166ec64c..97231e50ef3 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules-result.xml
@@ -1,12 +1,12 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules.xml
index 3982ccb7ca7..b80f5711a04 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/reactivate_disabled_template_rules.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="1" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml
index 681ce324eaf..b458b548fef 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -8,7 +8,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml
index 36041f853cb..e6ac9b370e0 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="999" kee="NEW" name="New" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="200"
          remediation_function="[null]" default_remediation_function="LINEAR"
@@ -10,7 +10,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="READY" priority="1" cardinality="SINGLE" parent_id="[null]"/>
 
 
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml
index 7da79185196..728e44a7c18 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="-1" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -8,7 +8,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml
index 0c99aac7390..1e870c31a76 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="999" kee="NEW" name="New" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="-1" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -10,7 +10,7 @@
          remediation_offset="[null]" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="READY" priority="1" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml
index d4f6269c2a9..b47f35dcb2b 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="3" default_characteristic_id="[null]"
          remediation_function="LINEAR_OFFSET" default_remediation_function="[null]"
@@ -8,7 +8,7 @@
          remediation_offset="10h" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml
index 8439879859b..b7d6edf0310 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml
@@ -4,7 +4,7 @@
   <characteristics id="2" kee="MEMORY_EFFICIENCY" name="Memory Efficiency" parent_id="1" characteristic_order="1" enabled="[false]"/>
   <characteristics id="3" kee="COMPILER" name="Compiler" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="3" default_characteristic_id="[null]"
          remediation_function="LINEAR_OFFSET" default_remediation_function="[null]"
@@ -12,7 +12,7 @@
          remediation_offset="10h" default_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="READY" priority="1" cardinality="SINGLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/shared.xml
index c1c3fb31ab4..c6bc110446a 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/shared.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/shared.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="2" kee="MEMORY_EFFICIENCY" name="Memory Efficiency" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
                    status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml
index 1cfe02dd4ab..ea262565bb6 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="The One" description="The Description of One"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="The One" description="The Description of One"
      status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
      status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields-result.xml
index 9bbd5d720a8..7214b9a16f0 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields-result.xml
@@ -12,7 +12,7 @@
   <rules_parameters id="2" rule_id="1" default_value="default value two" description="parameter two" name="param2" param_type="STRING"/>
 
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields.xml
index b894013a71a..76cfc9b5c7f 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_fields.xml
@@ -12,7 +12,7 @@
 
   <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="STRING"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="READY" priority="1" cardinality="SINGLE" parent_id="[null]"/>
 
 
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters-result.xml
index e4eb07ec541..56fce29d554 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters-result.xml
@@ -1,11 +1,11 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
                    status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
   <rules_parameters id="1" rule_id="1" default_value="default value one" description="parameter one" name="param1" param_type="STRING"/>
   <rules_parameters id="3" rule_id="1" default_value="default value two" description="parameter two" name="param2" param_type="STRING"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
                    status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
 </dataset>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters.xml
index f1037dcb3f5..ff8c90bae1c 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_rule_parameters.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="READY" priority="1" cardinality="SINGLE" parent_id="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="param1" description="old description" param_type="STRING"/>
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language-result.xml
index 0e038147bec..502da4b1342 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language-result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language-result.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="100"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
@@ -9,7 +9,7 @@
          effort_to_fix_description="squid.S115.effortToFix" />
 
   <!-- Instance of old rule 1 :/ -->
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="template_rule1" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="template_rule1" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1" language="java"
          characteristic_id="[null]" default_characteristic_id="100"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
@@ -17,7 +17,7 @@
          remediation_offset="[null]" default_remediation_offset="10h"
          effort_to_fix_description="squid.S115.effortToFix" />
 
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
          status="DEPRECATED" priority="0" cardinality="SINGLE" parent_id="[null]" language="java"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -26,7 +26,7 @@
          effort_to_fix_description="[null]" />
 
   <!-- Template of old rule 3 :/ -->
-  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="DEPRECATED" priority="4" cardinality="SINGLE" parent_id="3" language="java"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language.xml
index ef467594087..a0c956a8c1c 100644
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RegisterRulesTest/update_template_rule_language.xml
@@ -2,7 +2,7 @@
 
   <characteristics id="100" kee="MEMORY_EFFICIENCY" name="Memory Efficiency" parent_id="1" characteristic_order="1" enabled="[true]"/>
 
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Rule one" description="[null]"
+  <rules tags="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Rule one" description="[null]"
          status="READY" priority="4" cardinality="MULTIPLE" parent_id="[null]" language="[null]"
          characteristic_id="[null]" default_characteristic_id="100"
          remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
@@ -11,7 +11,7 @@
          effort_to_fix_description="squid.S115.effortToFix" />
 
   <!-- Instance of rule 1 -->
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="template_rule1" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="2" plugin_rule_key="template_rule1" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1" language="[null]"
          characteristic_id="[null]" default_characteristic_id="200"
          remediation_function="[null]" default_remediation_function="LINEAR"
@@ -19,7 +19,7 @@
          remediation_offset="[null]" default_remediation_offset="15min"
          effort_to_fix_description="squid.S115.effortToFix2" />
 
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
          status="DEPRECATED" priority="1" cardinality="MULTIPLE" parent_id="[null]"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
@@ -28,7 +28,7 @@
          effort_to_fix_description="[null]" />
 
   <!-- Instance of rule 3 -->
-  <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <rules tags="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="3"
          characteristic_id="[null]" default_characteristic_id="[null]"
          remediation_function="[null]" default_remediation_function="[null]"
-- 
2.39.5