From b39d57cc2149a922928b92e9969c76ed09c60d1e Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Sat, 10 May 2014 15:09:37 +0200
Subject: [PATCH] Fixed some basic tests for RegisterRule with DAOv.2

---
 .../java/org/sonar/core/rule/RuleDto.java     |  4 +-
 .../org/sonar/server/rule2/RegisterRules.java |  1 +
 .../sonar/server/rule2/RegisterRulesTest.java | 77 +++++++------------
 ...e_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 +-
 .../disable_deprecated_rules.xml              |  4 +-
 ...ate_rules_if_parent_is_disabled-result.xml | 12 +--
 ...e_template_rules_if_parent_is_disabled.xml |  8 +-
 ..._rule_is_linked_on_root_characteristic.xml |  4 +-
 .../insert_extended_repositories-result.xml   |  4 +-
 .../insert_new_rules-result.xml               |  6 +-
 ..._disable_already_disabled_rules-result.xml |  8 +-
 .../not_disable_already_disabled_rules.xml    |  4 +-
 .../not_disable_manual_rules-result.xml       |  8 +-
 .../not_disable_manual_rules.xml              |  4 +-
 ...late_rules_if_parent_is_enabled-result.xml |  6 +-
 ...le_template_rules_if_parent_is_enabled.xml |  4 +-
 ...t_update_already_disabled_rules-result.xml |  4 +-
 .../not_update_already_disabled_rules.xml     |  2 +-
 ...ules_when_repository_is_still_existing.xml |  2 +-
 .../reactivate_disabled_rules-result.xml      |  4 +-
 .../reactivate_disabled_rules.xml             |  2 +-
 ...ctivate_disabled_template_rules-result.xml |  6 +-
 .../reactivate_disabled_template_rules.xml    |  4 +-
 ...c_when_characteristic_not_found-result.xml |  4 +-
 ...teristic_when_characteristic_not_found.xml |  4 +-
 ...rriding_characteristic_disabled-result.xml |  4 +-
 ...and_overriding_characteristic_disabled.xml |  4 +-
 ...racteristic_has_been_overridden-result.xml |  4 +-
 ...but_characteristic_has_been_overridden.xml |  4 +-
 .../server/rule2/RegisterRulesTest/shared.xml |  2 +-
 ...ame_and_description_in_database-result.xml |  4 +-
 .../update_rule_fields-result.xml             |  2 +-
 .../RegisterRulesTest/update_rule_fields.xml  |  2 +-
 .../update_rule_parameters-result.xml         |  4 +-
 .../update_rule_parameters.xml                |  4 +-
 .../update_template_rule_language-result.xml  |  8 +-
 .../update_template_rule_language.xml         |  8 +-
 42 files changed, 124 insertions(+), 144 deletions(-)

diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java b/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
index 6ce40e81d3c..88ba9c64fb3 100644
--- a/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java
@@ -343,12 +343,12 @@ public final class RuleDto implements Dto<RuleKey> {
   }
 
   public RuleDto setTags(Set<String> tags) {
-    this.tags = StringUtils.join(tags, ',');
+    this.tags = tags.isEmpty()?null:StringUtils.join(tags, ',');
     return this;
   }
 
   public RuleDto setSystemTags(Set<String> tags) {
-    this.systemTags = StringUtils.join(tags, ',');
+    this.systemTags =  tags.isEmpty()?null:StringUtils.join(tags, ',');
     return this;
   }
 
diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/RegisterRules.java b/sonar-server/src/main/java/org/sonar/server/rule2/RegisterRules.java
index 64aaa428dba..f9d5f456ca3 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule2/RegisterRules.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/RegisterRules.java
@@ -77,6 +77,7 @@ public class RegisterRules implements Startable {
     this(defLoader, profilesManager, myBatis, ruleDao, activeRuleDao, characteristicDao, System2.INSTANCE);
   }
 
+
   @VisibleForTesting
   RegisterRules(RuleDefinitionsLoader defLoader, ProfilesManager profilesManager,
                 MyBatis myBatis, RuleDao ruleDao, ActiveRuleDao activeRuleDao,
diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesTest.java b/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesTest.java
index 8963e627146..89428a63f35 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesTest.java
@@ -19,10 +19,8 @@
  */
 package org.sonar.server.rule2;
 
-import org.apache.ibatis.session.SqlSession;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -49,14 +47,12 @@ import org.sonar.server.rule.ESRuleTags;
 import org.sonar.server.rule.RuleDefinitionsLoader;
 import org.sonar.server.rule.RuleRegistry;
 import org.sonar.server.rule.RuleRepositories;
-import org.sonar.server.rule.RuleTagOperations;
 
 import java.util.Collection;
 import java.util.Date;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.fest.assertions.Fail.fail;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -85,7 +81,6 @@ public class RegisterRulesTest extends AbstractDaoTestCase {
   @Captor
   ArgumentCaptor<Collection<RuleTagDto>> ruleTagsCaptor;
 
-  RuleTagOperations ruleTagOperations;
   MyBatis myBatis;
   RuleDao ruleDao;
   RuleTagDao ruleTagDao;
@@ -105,7 +100,6 @@ public class RegisterRulesTest extends AbstractDaoTestCase {
     ruleDao = new RuleDao();
     ruleTagDao = new RuleTagDao(myBatis);
     activeRuleDao = new ActiveRuleDao(new QualityProfileDao(myBatis), ruleDao);
-    ruleTagOperations = new RuleTagOperations(ruleTagDao, esRuleTags);
     characteristicDao = new CharacteristicDao(myBatis);
     task = new RegisterRules(new RuleDefinitionsLoader(mock(RuleRepositories.class), new RulesDefinition[]{new FakeRepository()}),
       profilesManager, myBatis, ruleDao, activeRuleDao, characteristicDao, system);
@@ -113,27 +107,10 @@ public class RegisterRulesTest extends AbstractDaoTestCase {
   }
 
   @After
-  public void after(){
+  public void after() {
     session.close();
   }
 
-
-  @Test
-  @Ignore
-  public void insert_new_rules() {
-    setupData("shared");
-    task.start();
-
-    verify(ruleRegistry).reindex(rulesCaptor.capture(), any(SqlSession.class));
-    assertThat(rulesCaptor.getValue()).hasSize(3);
-    verify(ruleRegistry).removeDeletedRules(any(String[].class));
-
-    verify(esRuleTags).putAllTags(ruleTagsCaptor.capture());
-    assertThat(ruleTagsCaptor.getValue()).hasSize(3);
-
-    checkTables("insert_new_rules", EXCLUDED_COLUMN_NAMES, "rules", "rules_parameters", "rules_rule_tags", "rule_tags");
-  }
-
   @Test
   public void update_template_rule_language() {
     setupData("update_template_rule_language");
@@ -298,32 +275,34 @@ public class RegisterRulesTest extends AbstractDaoTestCase {
     checkTables("not_disable_manual_rules", EXCLUDED_COLUMN_NAMES_INCLUDING_DEBT, "rules");
   }
 
-//  @Test
-//  public void test_high_number_of_rules() {
-//    task = new RegisterRules(new RuleDefinitionsLoader(mock(RuleRepositories.class), new RulesDefinition[]{new BigRepository()}),
-//      profilesManager, ruleTagOperations, myBatis, ruleDao, activeRuleDao, characteristicDao, mock(RegisterDebtModel.class));
-//
-//    setupData("shared");
-//    task.start();
-//
-//    // There is already one rule in DB
-//    assertThat(ruleDao.selectAll()).hasSize(BigRepository.SIZE + 1);
-//    assertThat(ruleDao.selectParameters()).hasSize(BigRepository.SIZE * 20);
+  @Test
+  public void test_high_number_of_rules() {
+    task = new RegisterRules(new RuleDefinitionsLoader(mock(RuleRepositories.class), new RulesDefinition[]{new BigRepository()}),
+      profilesManager, myBatis, ruleDao, activeRuleDao, characteristicDao);
+
+    setupData("shared");
+    task.start();
+
+
+    // There is already one rule in DB
+    assertThat(ruleDao.findAll(session)).hasSize(BigRepository.SIZE + 1);
+    assertThat(ruleDao.findAllRuleParams(session)).hasSize(BigRepository.SIZE * 20);
 //    assertThat(ruleDao.selectTags(getMyBatis().openSession(false))).hasSize(BigRepository.SIZE * 3);
-//  }
-
-//  @Test
-//  public void insert_extended_repositories() {
-//    task = new RegisterRules(new RuleDefinitionsLoader(mock(RuleRepositories.class), new RulesDefinition[]{
-//      new FindbugsRepository(), new FbContribRepository()}),
-//      profilesManager, ruleRegistry, esRuleTags, ruleTagOperations, myBatis, ruleDao, ruleTagDao, activeRuleDao, characteristicDao, mock(RegisterDebtModel.class)
-//    );
-//
-//    setupData("empty");
-//    task.start();
-//
-//    checkTables("insert_extended_repositories", EXCLUDED_COLUMN_NAMES_INCLUDING_DEBT, "rules");
-//  }
+  }
+
+  @Test
+  public void insert_extended_repositories() {
+    task = new RegisterRules(new RuleDefinitionsLoader(mock(RuleRepositories.class), new RulesDefinition[]{
+      new FindbugsRepository(), new FbContribRepository()}),
+      profilesManager, myBatis, ruleDao, activeRuleDao, characteristicDao
+    );
+
+
+    setupData("empty");
+    task.start();
+
+    checkTables("insert_extended_repositories", EXCLUDED_COLUMN_NAMES_INCLUDING_DEBT, "rules");
+  }
 
   static class FakeRepository implements RulesDefinition {
     @Override
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 e62e97a793d..dfa2ccff019 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <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"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 5b6e2bc90ed..bf310a09b6a 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="" 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"
+  <rules tags="[null]" 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 4994d92912a..1616973e23e 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="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <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]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[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]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <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"
+  <rules tags="[null]" 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="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 e93d82a6fde..8957a2373d4 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="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <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]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[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]"
          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 f62bcfb60d1..f350c52f77b 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="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <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]"
      status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <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"
                    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="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
+  <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"
                    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 0a9bf6572c3..a19bf8bb48a 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="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <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]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[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]"
          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="" system_tags="tag1,tag3,tag5" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" 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="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 877df431166..d13c0db742f 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="" system_tags="formertag1" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <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]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]"/>
 
-  <rules tags="formertag2" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[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]"
          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 9d0e154fead..81682535971 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="" system_tags="" id="1" plugin_rule_key="disabled_rule" plugin_name="fake" plugin_config_key="[null]" name="Disabled rule" description="[null]"
+  <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]"
          status="REMOVED" priority="4" cardinality="MULTIPLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[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]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="1" language="[null]"/>
 
-  <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"
+  <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"
          status="REMOVED" priority="1" cardinality="SINGLE" parent_id="[null]"  language="[null]"/>
 
-  <rules tags="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[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]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="3" language="[null]"/>
 
-  <rules tags="" system_tags="" id="5" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <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"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="" system_tags="" id="6" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 6091a6bd195..d3e61274471 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="" system_tags="" id="1" plugin_rule_key="disabled_rule" plugin_name="fake" plugin_config_key="[null]" name="Disabled rule" description="[null]"
+  <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]"
          status="REMOVED" priority="4" cardinality="MULTIPLE" parent_id="[null]"/>
 
   <!-- user rule duplicated from rule 1. It is currently enabled. -->
-  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[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]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1"/>
 
   <!-- This rule will be removed... -->
-  <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"
+  <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"
          status="READY" priority="1" cardinality="SINGLE" parent_id="[null]" />
 
   <!-- ...so this template will be removed too -->
-  <rules tags="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[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]"
          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 55f29c2f961..d5dfe74dd1c 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <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"
          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="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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"
          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 680cb48eac0..5ad7d6d57d1 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="findbugs" plugin_config_key="[null]" name="Rule One" description="Description of Rule One"
+  <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"
      status="READY" priority="2" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-    <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"
+    <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"
          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 8bd8da0698b..0578a3d9262 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="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <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]"
          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="" system_tags="" id="2" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <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"
          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="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 3a2aa5a2542..c798a6a0c7a 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="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <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]"
          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="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[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]"
          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="" system_tags="" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <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"
          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="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 44553e69261..13907539477 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="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <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]"
          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="" system_tags="" id="2" plugin_rule_key="deprecated" plugin_name="fake" plugin_config_key="[null]" name="Deprecated fake" description="[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]"
          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 54e13193071..0f73b04c525 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="" system_tags="" id="1" plugin_rule_key="PerformanceIssue" plugin_name="manual" plugin_config_key="[null]" name="Performance Issue" description="[null]"
+  <rules tags="[null]" system_tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="IllegalExceptionCheck" plugin_name="checkstyle" plugin_config_key="[null]" name="Illegal Exception" description="[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]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="[null]"/>
 
-  <rules tags="" system_tags="" id="3" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <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"
          status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="" system_tags="" id="4" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 832e52b92b6..7f175d92749 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="" system_tags="" id="1" plugin_rule_key="PerformanceIssue" plugin_name="manual" plugin_config_key="[null]" name="Performance Issue" description="[null]"
+  <rules tags="[null]" system_tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="IllegalExceptionCheck" plugin_name="checkstyle" plugin_config_key="[null]" name="Illegal Exception" description="[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]"
          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 0c26b40b517..446bbc47029 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="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[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]"
      status="READY" priority="4" cardinality="SINGLE" parent_id="1" language="java"/>
 
-  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
      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 60fffd2389a..8e3bcfb804d 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Rule one" description="[null]"
+  <rules tags="[null]" system_tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[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]"
          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 2f2f453533a..91f0b991742 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="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <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]"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
+  <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"
                    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 56d37d8e543..45e3706d700 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="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <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]"
          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 0e6a0aa4968..f4e73c9239b 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="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="fake" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <rules tags="[null]" system_tags="[null]" 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 13c41591aa5..fe4c1ce3506 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="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
                    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 3ab3113fd4d..d5b82972127 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Old name" description="Old description"
+  <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"
          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 97231e50ef3..518b25fb992 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="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[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]"
          status="READY" priority="4" cardinality="SINGLE" parent_id="1" language="java"/>
 
-  <rules tags="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 b80f5711a04..3982ccb7ca7 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <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"
          status="REMOVED" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="user_rule" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[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]"
          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 b458b548fef..681ce324eaf 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <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"
          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="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 e6ac9b370e0..36041f853cb 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <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"
          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="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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"
          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 728e44a7c18..63d0aaf3239 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="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 1e870c31a76..0c99aac7390 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <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"
          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="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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"
          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 b47f35dcb2b..4bd810288ed 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="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 b7d6edf0310..6ff0decdea8 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="" 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"
+  <rules tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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"
          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 c6bc110446a..c1c3fb31ab4 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="" system_tags="" id="1" plugin_rule_key="deprecated-key" plugin_name="deprecated-repo" plugin_config_key="[null]" name="Deprecated" description="[null]"
+  <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]"
                    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 ea262565bb6..1cfe02dd4ab 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="The One" description="The Description of One"
+  <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"
      status="READY" priority="4" cardinality="SINGLE" parent_id="[null]" language="java"/>
 
-  <rules tags="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="rule2" name="Two" description="Description of Two"
+  <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"
      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 7214b9a16f0..9bbd5d720a8 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="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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 76cfc9b5c7f..b894013a71a 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="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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"
          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 56fce29d554..08777a3cbfb 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="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
                    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 ff8c90bae1c..f1037dcb3f5 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="old_config_key" name="old name" description="old description"
+  <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"
          status="READY" priority="2" cardinality="SINGLE" parent_id="[null]"/>
 
-  <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"
+  <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"
          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 502da4b1342..a7ecc190615 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="" system_tags="tag1,tag3,tag5" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="config1" name="One" description="Description of One"
+  <rules tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="template_rule1" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <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]"
          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="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="[null]" name="Two" description="Description of Two"
+  <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"
          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="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[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]"
          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 a0c956a8c1c..ef467594087 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="" system_tags="" id="1" plugin_rule_key="rule1" plugin_name="fake" plugin_config_key="[null]" name="Rule one" description="[null]"
+  <rules tags="[null]" system_tags="[null]" 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="" system_tags="" id="2" plugin_rule_key="template_rule1" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[null]"
+  <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]"
          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="" system_tags="" id="3" plugin_rule_key="rule2" plugin_name="fake" plugin_config_key="old_config_key2" name="old name2" description="old description2"
+  <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"
          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="" system_tags="" id="4" plugin_rule_key="template_rule2" plugin_name="fake" plugin_config_key="[null]" name="User rule" description="[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]"
          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