SONAR-7453 Fix RULES columns size for Oracle

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/insert_new_issue.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/insert_new_issue.xml
index a149ee1561864ba5196e72e5330e07ce2fa8f5c5..2c62945895ae7e439ea65aa2373d683ee309349e 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/insert_new_issue.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/insert_new_issue.xml
@@ -3,9 +3,9 @@
   <rules id="1" plugin_rule_key="S01" plugin_name="xoo" name="name" description="description" status="READY"
          plugin_config_key="[null]" priority="0" is_template="[true]" language="xoo"  template_id="[null]"
          note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]"
-         remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="1h" default_remediation_coeff="5d"
-         remediation_offset="5min" default_remediation_offset="10h"
+         remediation_function="LINEAR_OFFSET" def_remediation_function="LINEAR_OFFSET"
+         remediation_coeff="1h" def_remediation_coeff="5d"
+         remediation_offset="5min" def_remediation_offset="10h"
          effort_to_fix_description="[null]" description_format="MARKDOWN"
          tags="[null]" system_tags="[null]"
          created_at="1500000000000" updated_at="1500000000000"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml
index 5dba31fbc1015f9b5bab4ae1b75b21d9f6cc68cd..c014ac83323171a29d24eb697bfe89eccf0b926d 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/PersistIssuesStepTest/shared.xml
@@ -3,9 +3,9 @@
   <rules id="1" plugin_rule_key="S01" plugin_name="xoo" name="name" description="description" status="READY"
          plugin_config_key="[null]" priority="0" is_template="[true]" language="xoo"  template_id="[null]"
          note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]"
-         remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET"
-         remediation_gap_mult="1h" default_remediation_gap_mult="5d"
-         remediation_base_effort="5min" default_remediation_base_effort="10h"
+         remediation_function="LINEAR" def_remediation_function="LINEAR_OFFSET"
+         remediation_gap_mult="1h" def_remediation_gap_mult="5d"
+         remediation_base_effort="5min" def_remediation_base_effort="10h"
          gap_description="[null]" description_format="MARKDOWN"
          tags="[null]" system_tags="[null]"
          created_at="1500000000000" updated_at="1500000000000"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/platform/BackendCleanupMediumTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/platform/BackendCleanupMediumTest/shared.xml
index f6cdc7f6fb4062d7b6b273b639b071a8bdc91ffb..800b10343faf7d1fdfc92e2223a3d8efed179433 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/platform/BackendCleanupMediumTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/platform/BackendCleanupMediumTest/shared.xml
@@ -11,9 +11,9 @@
   <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED"
          plugin_config_key="NewConfigKey" priority="0" is_template="[true]" language="dart" template_id="3"
          note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]"
-         remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET"
-         remediation_gap_mult="1h" default_remediation_gap_mult="5d"
-         remediation_base_effort="5min" default_remediation_base_effort="10h"
+         remediation_function="LINEAR" def_remediation_function="LINEAR_OFFSET"
+         remediation_gap_mult="1h" def_remediation_gap_mult="5d"
+         remediation_base_effort="5min" def_remediation_base_effort="10h"
          gap_description="squid.S115.effortToFix" description_format="MARKDOWN"
          created_at="150000" updated_at="150000"
   />

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml
index b7f06686a6eefcc822361bbfe77dbaae58d13b8b..7d217033377e7325fea64ad6bd48098dc1975198 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml
@@ -2,16 +2,16 @@
 
   <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" is_template="[false]" template_id="[null]" language="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_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"
          status="READY" priority="4" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="[null]" default_remediation_coeff="5d"
-         remediation_offset="[null]" default_remediation_offset="10h"
+         remediation_function="[null]" def_remediation_function="LINEAR_OFFSET"
+         remediation_coeff="[null]" def_remediation_coeff="5d"
+         remediation_offset="[null]" def_remediation_offset="10h"
          effort_to_fix_description="squid.S115.effortToFix"/>
 
   <rules_parameters id="1" rule_id="2" default_value="default value one" description="parameter one" name="param1" param_type="STRING"/>
@@ -19,9 +19,9 @@
 
   <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" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml
index 078d5cbea3f71375382bc64250d75efc9b5b64bc..c60b0f2c996bd9778a8b4f998ec8b1585bc89b56 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml
@@ -2,34 +2,34 @@
 
   <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" is_template="[false]" template_id="[null]" language="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          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]"
          status="REMOVED" priority="4" is_template="[false]" template_id="[null]" language="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]"
          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"
          status="READY" priority="4" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="[null]" default_remediation_coeff="5d"
-         remediation_offset="[null]" default_remediation_offset="10h"
+         remediation_function="[null]" def_remediation_function="LINEAR_OFFSET"
+         remediation_coeff="[null]" def_remediation_coeff="5d"
+         remediation_offset="[null]" def_remediation_offset="10h"
          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"
          status="DEPRECATED" priority="0" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]"
          updated_at="2014-03-17 19:10:03.0"/>
 

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml
index ac0637d4cff2c69d14e0b10ee6be93ce5ba46b87..bae9f9b1088d633be870f5dff361c5efd50d8360 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml
@@ -2,17 +2,17 @@
 
   <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" is_template="[false]" template_id="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          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]"
          status="REMOVED" priority="4" is_template="[false]" template_id="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]"
          updated_at="2014-03-16"/>
 

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml
index b8cc5bd3f922b5ee90af2865d0112693f2ce8d42..694d16a8ce01d380483deab6bf25a082027120f0 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml
@@ -2,16 +2,16 @@
 
   <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" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_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"
          status="DEPRECATED" priority="0" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml
index f9947b19bafab5807aad5b04cbef1117418393ee..ca1b6cbc16e2574d02684cb21c41aa8b2904fa0e 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml
@@ -2,9 +2,9 @@
 
   <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" is_template="[false]" template_id="[null]"
-         remediation_function="[null]" default_remediation_function="LINEAR"
-         remediation_coeff="[null]" default_remediation_coeff="14min"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="LINEAR"
+         remediation_coeff="[null]" def_remediation_coeff="14min"
+         remediation_offset="[null]" def_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"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml
index b8cc5bd3f922b5ee90af2865d0112693f2ce8d42..694d16a8ce01d380483deab6bf25a082027120f0 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml
@@ -2,16 +2,16 @@
 
   <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" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_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"
          status="DEPRECATED" priority="0" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml
index e23e6a74eda78b4314fa772dda42c0fb535e4577..105d41a926ec356a82ec39d077669d2bc1a35bb1 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml
@@ -2,16 +2,16 @@
 
   <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" is_template="[false]" template_id="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_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"
          status="READY" priority="1" is_template="[false]" template_id="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml
index da6bb9fabfeb0cda44664a3aed942af9c2c6c272..6dd81a4e1d034c401d54711f6b2da5fd23af2abe 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml
@@ -2,16 +2,16 @@
 
   <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" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="LINEAR_OFFSET" default_remediation_function="[null]"
-         remediation_coeff="5d" default_remediation_coeff="[null]"
-         remediation_offset="10h" default_remediation_offset="[null]"
+         remediation_function="LINEAR_OFFSET" def_remediation_function="[null]"
+         remediation_coeff="5d" def_remediation_coeff="[null]"
+         remediation_offset="10h" def_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"
          status="DEPRECATED" priority="0" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml
index ab8fecac78db60feadc11027cd0814f0213e1ee0..b9926a89f4343f526d457a7a8fa3a3017fb6e086 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml
@@ -2,16 +2,16 @@
 
   <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" is_template="[false]" template_id="[null]"
-         remediation_function="LINEAR_OFFSET" default_remediation_function="[null]"
-         remediation_coeff="5d" default_remediation_coeff="[null]"
-         remediation_offset="10h" default_remediation_offset="[null]"
+         remediation_function="LINEAR_OFFSET" def_remediation_function="[null]"
+         remediation_coeff="5d" def_remediation_coeff="[null]"
+         remediation_offset="10h" def_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"
          status="READY" priority="1" is_template="[false]" template_id="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml
index 6ebc31b027be4ce86172e27cb95ef70279160adc..58430f0f15c7c6a542517d5840351a7bacc3480e 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml
@@ -2,9 +2,9 @@
 
   <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" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="[null]" default_remediation_coeff="5d"
-         remediation_offset="[null]" default_remediation_offset="10h"
+         remediation_function="[null]" def_remediation_function="LINEAR_OFFSET"
+         remediation_coeff="[null]" def_remediation_coeff="5d"
+         remediation_offset="[null]" def_remediation_offset="10h"
          effort_to_fix_description="squid.S115.effortToFix"/>
 
   <rules_parameters id="1" rule_id="1" default_value="default value one" description="parameter one" name="param1" param_type="STRING"/>
@@ -12,9 +12,9 @@
 
   <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" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml
index 2c7186e3a9baad05a23a18267f60e9e91a512e39..fd1f506cabf65ddfcb3ed00c65d277066e7c165e 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml
@@ -2,9 +2,9 @@
 
   <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" is_template="[false]" template_id="[null]"
-         remediation_function="[null]" default_remediation_function="LINEAR"
-         remediation_coeff="[null]" default_remediation_coeff="14min"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="LINEAR"
+         remediation_coeff="[null]" def_remediation_coeff="14min"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]"/>
 
   <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="STRING"/>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml
index 78210b8d2ef83b14f519bf039ea50a2e3e3ad7ee..2612a97f50c051e3e164d696bd5bf90853ea98aa 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml
@@ -2,32 +2,32 @@
 
   <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" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="[null]" default_remediation_coeff="5d"
-         remediation_offset="[null]" default_remediation_offset="10h"
+         remediation_function="[null]" def_remediation_function="LINEAR_OFFSET"
+         remediation_coeff="[null]" def_remediation_coeff="5d"
+         remediation_offset="[null]" def_remediation_offset="10h"
          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]"
          status="READY" priority="4" is_template="[false]" template_id="1" language="java"
-         remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="[null]" default_remediation_coeff="5d"
-         remediation_offset="[null]" default_remediation_offset="10h"
+         remediation_function="[null]" def_remediation_function="LINEAR_OFFSET"
+         remediation_coeff="[null]" def_remediation_coeff="5d"
+         remediation_offset="[null]" def_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"
          status="DEPRECATED" priority="0" is_template="[false]" template_id="[null]" language="java"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          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]"
          status="DEPRECATED" priority="4" is_template="[false]" template_id="3" language="java"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]" />
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml
index 80a4b5d07f68e8fc47c47d7aa5297aae2126fb3f..48567dd54b52bd99e1c0c0d24e5e86f6ee891b33 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml
@@ -2,32 +2,32 @@
 
   <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" is_template="[true]" template_id="[null]" language="[null]"
-         remediation_function="[null]" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="[null]" default_remediation_coeff="5d"
-         remediation_offset="[null]" default_remediation_offset="10h"
+         remediation_function="[null]" def_remediation_function="LINEAR_OFFSET"
+         remediation_coeff="[null]" def_remediation_coeff="5d"
+         remediation_offset="[null]" def_remediation_offset="10h"
          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]"
          status="READY" priority="4" is_template="[false]" template_id="1" language="[null]"
-         remediation_function="[null]" default_remediation_function="LINEAR"
-         remediation_coeff="[null]" default_remediation_coeff="1h"
-         remediation_offset="[null]" default_remediation_offset="15min"
+         remediation_function="[null]" def_remediation_function="LINEAR"
+         remediation_coeff="[null]" def_remediation_coeff="1h"
+         remediation_offset="[null]" def_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"
          status="DEPRECATED" priority="1" is_template="[true]" template_id="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          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]"
          status="READY" priority="4" is_template="[false]" template_id="3"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_coeff="[null]" def_remediation_coeff="[null]"
+         remediation_offset="[null]" def_remediation_offset="[null]"
          effort_to_fix_description="[null]" />
 
 </dataset>

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1117_rename_rules_columns.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1117_rename_rules_columns.rb
index f8471b7c7740d3b8d2173ddf7a39772e4c01458a..146db191344763966d55c74689c2a9052c9adf47 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1117_rename_rules_columns.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1117_rename_rules_columns.rb
@@ -26,10 +26,11 @@ class RenameRulesColumns < ActiveRecord::Migration
 
   def self.up
     rename_column 'rules', 'effort_to_fix_description', 'gap_description'
+    rename_column 'rules', 'default_remediation_function', 'def_remediation_function'
     rename_column 'rules', 'remediation_coeff', 'remediation_gap_mult'
-    rename_column 'rules', 'default_remediation_coeff', 'default_remediation_gap_mult'
+    rename_column 'rules', 'default_remediation_coeff', 'def_remediation_gap_mult'
     rename_column 'rules', 'remediation_offset', 'remediation_base_effort'
-    rename_column 'rules', 'default_remediation_offset', 'default_remediation_base_effort'
+    rename_column 'rules', 'default_remediation_offset', 'def_remediation_base_effort'
   end
 
 end

diff --git a/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
index 00924617ab7ea91085cff0cc7ae37bc09bfdadd1..6dca6fe740642699825cb46c2958ce2e6c97876a 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
@@ -21,11 +21,11 @@
     r.note_created_at as "noteCreatedAt",
     r.note_updated_at as "noteUpdatedAt",
     r.remediation_function as "remediationFunction",
-    r.default_remediation_function as "defaultRemediationFunction",
+    r.def_remediation_function as "defaultRemediationFunction",
     r.remediation_gap_mult as "remediationGapMultiplier",
-    r.default_remediation_gap_mult as "defaultRemediationGapMultiplier",
+    r.def_remediation_gap_mult as "defaultRemediationGapMultiplier",
     r.remediation_base_effort as "remediationBaseEffort",
-    r.default_remediation_base_effort as "defaultRemediationBaseEffort",
+    r.def_remediation_base_effort as "defaultRemediationBaseEffort",
     r.gap_description as "gapDescription",
     r.tags as "tagsField",
     r.system_tags as "systemTagsField",
@@ -129,11 +129,11 @@
     note_created_at=#{noteCreatedAt},
     note_updated_at=#{noteUpdatedAt},
     remediation_function=#{remediationFunction},
-    default_remediation_function=#{defaultRemediationFunction},
+    def_remediation_function=#{defaultRemediationFunction},
     remediation_gap_mult=#{remediationGapMultiplier},
-    default_remediation_gap_mult=#{defaultRemediationGapMultiplier},
+    def_remediation_gap_mult=#{defaultRemediationGapMultiplier},
     remediation_base_effort=#{remediationBaseEffort},
-    default_remediation_base_effort=#{defaultRemediationBaseEffort},
+    def_remediation_base_effort=#{defaultRemediationBaseEffort},
     gap_description=#{gapDescription},
     tags=#{tagsField},
     system_tags=#{systemTagsField},
@@ -145,8 +145,8 @@
   <sql id="insertColumns">
     (plugin_rule_key, plugin_name, description, description_format, status, name, plugin_config_key, priority,
     is_template, language, template_id,
-    remediation_function, default_remediation_function,
-    remediation_gap_mult, default_remediation_gap_mult, remediation_base_effort, default_remediation_base_effort,
+    remediation_function, def_remediation_function,
+    remediation_gap_mult, def_remediation_gap_mult, remediation_base_effort, def_remediation_base_effort,
     gap_description, tags, system_tags, rule_type, note_data, note_user_login, note_created_at, note_updated_at,
     created_at, updated_at)
   </sql>

diff --git a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
index a7111f6dad0699b4320065b4a083ce18f6e9b22e..6e6139fe563773135feb853cbb9469557626b2c2 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
+++ b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
@@ -114,11 +114,11 @@ CREATE TABLE "RULES" (
   "NOTE_CREATED_AT" TIMESTAMP,
   "NOTE_UPDATED_AT" TIMESTAMP,
   "REMEDIATION_FUNCTION" VARCHAR(20),
-  "DEFAULT_REMEDIATION_FUNCTION" VARCHAR(20),
+  "DEF_REMEDIATION_FUNCTION" VARCHAR(20),
   "REMEDIATION_GAP_MULT" VARCHAR(20),
-  "DEFAULT_REMEDIATION_GAP_MULT" VARCHAR(20),
+  "DEF_REMEDIATION_GAP_MULT" VARCHAR(20),
   "REMEDIATION_BASE_EFFORT" VARCHAR(20),
-  "DEFAULT_REMEDIATION_BASE_EFFORT" VARCHAR(20),
+  "DEF_REMEDIATION_BASE_EFFORT" VARCHAR(20),
   "GAP_DESCRIPTION" VARCHAR(4000),
   "TAGS" VARCHAR(4000),
   "SYSTEM_TAGS" VARCHAR(4000),

diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter-result.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter-result.xml
index 6ce3b6763dae04b93d533306152466e0101b4672..09c5a0403c7e57357535a6149fbb1462b3f54cf8 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter-result.xml
@@ -2,9 +2,9 @@
     <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED"
            plugin_config_key="NewConfigKey" priority="0" is_template="[true]" language="dart" template_id="3"
            note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]"
-           remediation_function="linear" default_remediation_function="linear_offset"
-           remediation_gap_mult="1h" default_remediation_gap_mult="5d"
-           remediation_base_effort="5min" default_remediation_base_effort="10h"
+           remediation_function="linear" def_remediation_function="linear_offset"
+           remediation_gap_mult="1h" def_remediation_gap_mult="5d"
+           remediation_base_effort="5min" def_remediation_base_effort="10h"
            gap_description="squid.S115.effortToFix"
            created_at="[null]" updated_at="[null]"
             />

diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter.xml
index 71bd1477503ed7820a7ec33c538dc993dd9fc21f..82a2fb6c47248218c5c0f985ae11e93d476aa986 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/insert_parameter.xml
@@ -2,9 +2,9 @@
     <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED"
            plugin_config_key="NewConfigKey" priority="0" is_template="[true]" language="dart" template_id="3"
            note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]"
-           remediation_function="linear" default_remediation_function="linear_offset"
-           remediation_gap_mult="1h" default_remediation_gap_mult="5d"
-           remediation_base_effort="5min" default_remediation_base_effort="10h"
+           remediation_function="linear" def_remediation_function="linear_offset"
+           remediation_gap_mult="1h" def_remediation_gap_mult="5d"
+           remediation_base_effort="5min" def_remediation_base_effort="10h"
            gap_description="squid.S115.effortToFix"
            created_at="[null]" updated_at="[null]"
             />

diff --git a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectEnabledAndNonManual.xml b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectEnabledAndNonManual.xml
index 38512c1508ff15142fca9f0b50add6cc859b0caf..70caf821e546a9f6ff4d14be78cd6922c504ffda 100644 (file)
--- a/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectEnabledAndNonManual.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/rule/RuleDaoTest/selectEnabledAndNonManual.xml
@@ -2,27 +2,27 @@
 
   <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"
          note_data="Rule note with accents éèà" note_user_login="polop.palap" note_created_at="2013-12-25" description_format="HTML"
-         remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET"
-         remediation_gap_mult="1h" default_remediation_gap_mult="5d"
-         remediation_base_effort="5min" default_remediation_base_effort="10h"
+         remediation_function="LINEAR" def_remediation_function="LINEAR_OFFSET"
+         remediation_gap_mult="1h" def_remediation_gap_mult="5d"
+         remediation_base_effort="5min" def_remediation_base_effort="10h"
          gap_description="squid.S115.effortToFix"
          created_at="1500000000000" updated_at="1600000000000"
   />
 
   <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="squid" name="Avoid Null" description="Should avoid NULL" status="REMOVED"
          note_data="[null]" note_user_login="[null]" note_created_at="[null]" description_format="HTML"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_gap_mult="[null]" default_remediation_gap_mult="[null]"
-         remediation_base_effort="[null]" default_remediation_base_effort="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_gap_mult="[null]" def_remediation_gap_mult="[null]"
+         remediation_base_effort="[null]" def_remediation_base_effort="[null]"
          gap_description="[null]"
          created_at="1500000000000" updated_at="1600000000000"
   />
 
   <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY"
          note_data="[null]" note_user_login="[null]" note_created_at="[null]" description_format="HTML"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_gap_mult="[null]" default_remediation_gap_mult="[null]"
-         remediation_base_effort="[null]" default_remediation_base_effort="[null]"
+         remediation_function="[null]" def_remediation_function="[null]"
+         remediation_gap_mult="[null]" def_remediation_gap_mult="[null]"
+         remediation_base_effort="[null]" def_remediation_base_effort="[null]"
          gap_description="[null]"
          created_at="1500000000000" updated_at="1600000000000"
   />