diff options
131 files changed, 363 insertions, 733 deletions
diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shared.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shared.xml index 6e87c1c42e2..4b0310365c9 100644 --- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shared.xml +++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shared.xml @@ -1,10 +1,10 @@ <dataset> - <rules id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" + <rules tags="[null]" system_tags="[null]" id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck" + <rules tags="[null]" system_tags="[null]" id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck" plugin_config_key="Checker/TreeWalker/EqualsAvoidNull" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]"/> diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml index 6dbd46f73b0..79d1887ae65 100644 --- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml +++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldCopyPermanentIdFromReferenceViolation-result.xml @@ -1,10 +1,10 @@ <dataset> - <rules id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" + <rules tags="[null]" system_tags="[null]" id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck" + <rules tags="[null]" system_tags="[null]" id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck" plugin_config_key="Checker/TreeWalker/EqualsAvoidNull" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]"/> diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml index e5e944bff02..4d57dd5f12b 100644 --- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml +++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest/shouldSaveViolations-result.xml @@ -1,9 +1,9 @@ <dataset> - <rules id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" + <rules tags="[null]" system_tags="[null]" id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck" + <rules tags="[null]" system_tags="[null]" id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck" plugin_config_key="Checker/TreeWalker/EqualsAvoidNull" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]"/> diff --git a/sonar-batch/src/test/resources/org/sonar/batch/components/PastMeasuresLoaderTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/components/PastMeasuresLoaderTest/shared.xml index 5fcc8de67be..4e8910eff80 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/components/PastMeasuresLoaderTest/shared.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/components/PastMeasuresLoaderTest/shared.xml @@ -6,11 +6,11 @@ enabled="true" worst_value="0" optimized_best_value="true" best_value="100" direction="1" hidden="false"/> - <rules id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" + <rules tags="[null]" system_tags="[null]" id="30" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck" + <rules tags="[null]" system_tags="[null]" id="31" name="Equals Avoid Null" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck" plugin_config_key="Checker/TreeWalker/EqualsAvoidNull" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]"/> @@ -79,4 +79,4 @@ RULE_ID="[null]" text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]" alert_status="[null]" description="[null]" rule_priority="[null]" characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-batch/src/test/resources/org/sonar/batch/phases/UpdateStatusJobTest/sharedFixture.xml b/sonar-batch/src/test/resources/org/sonar/batch/phases/UpdateStatusJobTest/sharedFixture.xml index 8cc0d86f00a..1b5ba6a8e92 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/phases/UpdateStatusJobTest/sharedFixture.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/phases/UpdateStatusJobTest/sharedFixture.xml @@ -1,5 +1,5 @@ <dataset> - <rules id="1" name="foo" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="maven-checkstyle-plugin" description="description" cardinality="SINGLE" parent_id="[null]"/> <metrics delete_historical_data="[null]" id="1" name="ncloc" val_type="INT" description="[null]" domain="[null]" @@ -34,4 +34,4 @@ name="[null]" root_id="1" description="[null]" enabled="true" language="java" copy_resource_id="[null]" person_id="[null]"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_and_overridden_debt_definitions.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_and_overridden_debt_definitions.xml index 177d376274d..c0d5fae6d18 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_and_overridden_debt_definitions.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_and_overridden_debt_definitions.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" characteristic_id="103" default_characteristic_id="101" remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET" remediation_coeff="2h" default_remediation_coeff="5d" diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_disable_characteristic.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_disable_characteristic.xml index 8ae55a45cc2..87d3d9bc215 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_disable_characteristic.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_disable_characteristic.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" characteristic_id="-1" default_characteristic_id="103" remediation_function="[null]" default_remediation_function="LINEAR" remediation_coeff="[null]" default_remediation_coeff="2h" diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_overridden_function.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_overridden_function.xml index 7ad3ec81ff4..60f9e72e2b3 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_overridden_function.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_characteristic_and_overridden_function.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" characteristic_id="[null]" default_characteristic_id="103" remediation_function="LINEAR" default_remediation_function="[null]" remediation_coeff="2h" default_remediation_coeff="[null]" diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_debt_definitions.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_debt_definitions.xml index 19f27fb7910..13ae30d6985 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_debt_definitions.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_default_debt_definitions.xml @@ -20,7 +20,7 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" characteristic_id="[null]" default_characteristic_id="101" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" remediation_coeff="[null]" default_remediation_coeff="5d" diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_disable_characteristic.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_disable_characteristic.xml index b874787f82c..474785cc9b9 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_disable_characteristic.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_disable_characteristic.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" characteristic_id="-1" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" remediation_coeff="[null]" default_remediation_coeff="[null]" diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_characteristic_and_default_function.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_characteristic_and_default_function.xml index 18e42626eb5..0e31dc4ef98 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_characteristic_and_default_function.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_characteristic_and_default_function.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" characteristic_id="103" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="LINEAR" remediation_coeff="[null]" default_remediation_coeff="2h" diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_debt_definitions.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_debt_definitions.xml index 9207e1dd492..2181f4db1f8 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_debt_definitions.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/build_rules_with_overridden_debt_definitions.xml @@ -20,7 +20,7 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" characteristic_id="103" default_characteristic_id="[null]" remediation_function="LINEAR" default_remediation_function="[null]" remediation_coeff="2h" default_remediation_coeff="[null]" diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_characteristic_not_found.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_characteristic_not_found.xml index 1fe98c77cd3..c304332b5c3 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_characteristic_not_found.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_characteristic_not_found.xml @@ -20,7 +20,7 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" characteristic_id="[null]" default_characteristic_id="999" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" remediation_coeff="[null]" default_remediation_coeff="5d" diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_no_function.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_no_function.xml index 59edbad53bd..82db0e3e956 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_no_function.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/fail_if_no_function.xml @@ -20,7 +20,7 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" characteristic_id="[null]" default_characteristic_id="101" remediation_function="[null]" default_remediation_function="[null]" remediation_coeff="[null]" default_remediation_coeff="5d" diff --git a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/shared.xml index b1f414976eb..9d8884a2f4b 100644 --- a/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/shared.xml +++ b/sonar-batch/src/test/resources/org/sonar/batch/rule/RulesProviderTest/shared.xml @@ -20,7 +20,7 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" priority="1" characteristic_id="[null]" default_characteristic_id="101" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" remediation_coeff="[null]" default_remediation_coeff="5d" diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java index c76a886736b..f29fabf4839 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java @@ -33,7 +33,7 @@ import java.util.List; */ public class DatabaseVersion implements BatchComponent, ServerComponent { - public static final int LAST_VERSION = 532; + public static final int LAST_VERSION = 533; public static enum Status { UP_TO_DATE, REQUIRES_UPGRADE, REQUIRES_DOWNGRADE, FRESH_INSTALL 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 20e0b188813..c4b8ebf2ee3 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 @@ -19,6 +19,8 @@ */ package org.sonar.core.rule; +import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ReflectionToStringBuilder; @@ -59,6 +61,8 @@ public final class RuleDto implements Dto<RuleKey> { private String remediationOffset; private String defaultRemediationOffset; private String effortToFixDescription; + private String tags; + private String systemTags; private Date createdAt; private Date updatedAt; @@ -307,6 +311,40 @@ public final class RuleDto implements Dto<RuleKey> { return this; } + public String[] getTags() { + return tags == null ? ArrayUtils.EMPTY_STRING_ARRAY : StringUtils.split(tags, ','); + } + + public String[] getSystemTags() { + return systemTags == null ? ArrayUtils.EMPTY_STRING_ARRAY : StringUtils.split(systemTags, ','); + } + + private String getTagsField() { + return tags; + } + + private String getSystemTagsField() { + return systemTags; + } + + private void setTagsField(String s) { + tags = s; + } + + private void setSystemTagsField(String s) { + systemTags = s; + } + + public RuleDto setTags(String[] tags) { + this.tags = StringUtils.join(tags, ','); + return this; + } + + public RuleDto setSystemTags(String[] tags) { + this.systemTags = StringUtils.join(tags, ','); + return this; + } + public Date getCreatedAt() { return createdAt; } diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql index b45f1705b25..4b4c50a33ae 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql @@ -228,6 +228,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('526'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('530'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('531'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('532'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('533'); INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '2011-09-26 22:27:48.0', '2011-09-26 22:27:48.0', null, null); ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2; diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl index 1e78c753b0b..a6b6038c2df 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl @@ -157,6 +157,8 @@ CREATE TABLE "RULES" ( "REMEDIATION_OFFSET" VARCHAR(20), "DEFAULT_REMEDIATION_OFFSET" VARCHAR(20), "EFFORT_TO_FIX_DESCRIPTION" VARCHAR(4000), + "TAGS" VARCHAR(4000), + "SYSTEM_TAGS" VARCHAR(4000), "CREATED_AT" TIMESTAMP, "UPDATED_AT" TIMESTAMP ); diff --git a/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml b/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml index e27be96abb0..03f2dbcbefd 100644 --- a/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml @@ -28,6 +28,8 @@ r.remediation_offset as "remediationOffset", r.default_remediation_offset as "defaultRemediationOffset", r.effort_to_fix_description as "effortToFixDescription", + r.tags as "tagsField", + r.system_tags as "systemTagsField", r.created_at as "createdAt", r.updated_at as "updatedAt" </sql> @@ -101,7 +103,7 @@ (plugin_rule_key, plugin_name, description, status, name, plugin_config_key, priority, cardinality, language, parent_id, characteristic_id, default_characteristic_id, remediation_function, default_remediation_function, remediation_coeff, default_remediation_coeff, remediation_offset, default_remediation_offset, - effort_to_fix_description, + effort_to_fix_description, tags, system_tags, created_at, updated_at) </sql> @@ -111,7 +113,7 @@ #{severity}, #{cardinality}, #{language}, #{parentId}, #{subCharacteristicId}, #{defaultSubCharacteristicId}, #{remediationFunction}, #{defaultRemediationFunction}, #{remediationCoefficient}, #{defaultRemediationCoefficient}, #{remediationOffset}, #{defaultRemediationOffset}, - #{effortToFixDescription}, + #{effortToFixDescription}, #{tagsField}, #{systemTagsField}, #{createdAt}, #{updatedAt}) </insert> @@ -121,7 +123,7 @@ #{severity}, #{cardinality}, #{language}, #{parentId}, #{subCharacteristicId}, #{defaultSubCharacteristicId}, #{remediationFunction}, #{defaultRemediationFunction}, #{remediationCoefficient}, #{defaultRemediationCoefficient}, #{remediationOffset}, #{defaultRemediationOffset}, - #{effortToFixDescription}, + #{effortToFixDescription}, #{tagsField}, #{systemTagsField}, #{createdAt}, #{updatedAt}) </insert> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml index 89d4696e367..1a7ef5f4246 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml @@ -12,7 +12,7 @@ <snapshots id="102" project_id="401" root_snapshot_id="100" parent_snapshot_id="101" root_project_id="399" path="100.101." islast="[true]" /> <snapshots id="103" project_id="402" root_snapshot_id="100" parent_snapshot_id="101" root_project_id="399" path="100.101." islast="[true]" /> - <rules id="500" plugin_rule_key="AvoidCycle" plugin_name="squid" language="java" /> - <rules id="501" plugin_rule_key="NullRef" plugin_name="squid" language="xoo" /> + <rules tags="[null]" system_tags="[null]" id="500" plugin_rule_key="AvoidCycle" plugin_name="squid" language="java" /> + <rules tags="[null]" system_tags="[null]" id="501" plugin_rule_key="NullRef" plugin_name="squid" language="xoo" /> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml index 76e711ccf7b..26b0dd5f351 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates-result.xml @@ -1,5 +1,5 @@ <dataset> - <rules id="200" name="Avoid Cycles" plugin_rule_key="AvoidCycles" + <rules tags="[null]" system_tags="[null]" id="200" name="Avoid Cycles" plugin_rule_key="AvoidCycles" plugin_config_key="[null]" plugin_name="squid"/> <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates.xml index 18c1d52c639..b2422b190af 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_resolve_conflicts_on_updates.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="200" name="Avoid Cycles" plugin_rule_key="AvoidCycles" + <rules tags="[null]" system_tags="[null]" id="200" name="Avoid Cycles" plugin_rule_key="AvoidCycles" plugin_config_key="[null]" plugin_name="squid" /> <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml index 81202018530..0e4d0a2dfff 100644 --- a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml +++ b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml @@ -69,8 +69,8 @@ <project_measures id="18" value="120" metric_id="2" snapshot_id="3013" /> - <rules id="500" plugin_rule_key="AvoidCycle" plugin_name="squid"/> - <rules id="501" plugin_rule_key="NullRef" plugin_name="squid"/> + <rules tags="[null]" system_tags="[null]" id="500" plugin_rule_key="AvoidCycle" plugin_name="squid"/> + <rules tags="[null]" system_tags="[null]" id="501" plugin_rule_key="NullRef" plugin_name="squid"/> <!-- issues in module --> <issues diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml index d25ce652ec8..4f76dd1d7ba 100644 --- a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml +++ b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml @@ -15,8 +15,8 @@ <snapshots id="101" project_id="400" root_snapshot_id="100" path="100." islast="[true]"/> <snapshots id="102" project_id="401" root_snapshot_id="100" path="100." islast="[true]"/> - <rules id="500" plugin_rule_key="AvoidCycle" plugin_name="squid"/> - <rules id="501" plugin_rule_key="NullRef" plugin_name="squid"/> + <rules tags="[null]" system_tags="[null]" id="500" plugin_rule_key="AvoidCycle" plugin_name="squid"/> + <rules tags="[null]" system_tags="[null]" id="501" plugin_rule_key="NullRef" plugin_name="squid"/> <issues id="100" @@ -66,4 +66,4 @@ updated_at="[null]" /> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/CacheRuleFinderTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/rule/CacheRuleFinderTest/shared.xml index f4b9ba30d12..f2c16456745 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/CacheRuleFinderTest/shared.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/CacheRuleFinderTest/shared.xml @@ -1,18 +1,18 @@ <dataset> <!-- CHECKSTYLE --> - <rules id="1" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" + <rules tags="[null]" system_tags="[null]" id="1" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]"/> <!-- disabled rule --> - <rules id="2" name="Disabled checked" plugin_rule_key="DisabledCheck" + <rules tags="[null]" system_tags="[null]" id="2" name="Disabled checked" plugin_rule_key="DisabledCheck" plugin_config_key="Checker/Treewalker/DisabledCheck" plugin_name="checkstyle" description="[null]" priority="4" status="REMOVED" cardinality="SINGLE" parent_id="[null]" /> - <rules id="3" name="Check Annotation" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck" + <rules tags="[null]" system_tags="[null]" id="3" name="Check Annotation" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck" plugin_config_key="Checker/Treewalker/AnnotationUseStyleCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]" /> <!-- PMD --> - <rules id="4" name="Call Super First" plugin_rule_key="CallSuperFirst" + <rules tags="[null]" system_tags="[null]" id="4" name="Call Super First" plugin_rule_key="CallSuperFirst" plugin_config_key="rulesets/android.xml/CallSuperFirst" plugin_name="pmd" description="[null]" priority="2" status="READY" cardinality="SINGLE" parent_id="[null]" /> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/DefaultRuleFinderTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/rule/DefaultRuleFinderTest/shared.xml index f4b9ba30d12..f2c16456745 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/DefaultRuleFinderTest/shared.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/DefaultRuleFinderTest/shared.xml @@ -1,18 +1,18 @@ <dataset> <!-- CHECKSTYLE --> - <rules id="1" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" + <rules tags="[null]" system_tags="[null]" id="1" name="Check Header" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck" plugin_config_key="Checker/Treewalker/HeaderCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]"/> <!-- disabled rule --> - <rules id="2" name="Disabled checked" plugin_rule_key="DisabledCheck" + <rules tags="[null]" system_tags="[null]" id="2" name="Disabled checked" plugin_rule_key="DisabledCheck" plugin_config_key="Checker/Treewalker/DisabledCheck" plugin_name="checkstyle" description="[null]" priority="4" status="REMOVED" cardinality="SINGLE" parent_id="[null]" /> - <rules id="3" name="Check Annotation" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck" + <rules tags="[null]" system_tags="[null]" id="3" name="Check Annotation" plugin_rule_key="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck" plugin_config_key="Checker/Treewalker/AnnotationUseStyleCheck" plugin_name="checkstyle" description="[null]" priority="4" status="READY" cardinality="SINGLE" parent_id="[null]" /> <!-- PMD --> - <rules id="4" name="Call Super First" plugin_rule_key="CallSuperFirst" + <rules tags="[null]" system_tags="[null]" id="4" name="Call Super First" plugin_rule_key="CallSuperFirst" plugin_config_key="rulesets/android.xml/CallSuperFirst" plugin_name="pmd" description="[null]" priority="2" status="READY" cardinality="SINGLE" parent_id="[null]" /> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert-result.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert-result.xml index e7e1d53d554..f9b97c6bbc0 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert-result.xml @@ -20,7 +20,7 @@ <dataset> - <rules id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED" + <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" cardinality="MULTIPLE" language="dart" created_at="2013-12-16" updated_at="2013-12-17" parent_id="3" note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]" characteristic_id="100" default_characteristic_id="101" diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert_all-result.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert_all-result.xml index 878e3d586ed..0a7c5c43e93 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert_all-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/insert_all-result.xml @@ -20,7 +20,7 @@ <dataset> - <rules id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED" + <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" cardinality="MULTIPLE" language="dart" created_at="2013-12-16" updated_at="2013-12-17" parent_id="3" note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]" characteristic_id="100" default_characteristic_id="101" @@ -30,7 +30,7 @@ effort_to_fix_description="squid.S115.effortToFix" /> - <rules id="2" plugin_rule_key="NewRuleKey2" plugin_name="plugin2" name="new name2" description="new description2" status="BETA" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="NewRuleKey2" plugin_name="plugin2" name="new name2" description="new description2" status="BETA" plugin_config_key="NewConfigKey2" priority="2" cardinality="SINGLE" language="js" created_at="2013-12-14" updated_at="2013-12-15" parent_id="[null]" note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]" characteristic_id="102" default_characteristic_id="103" diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml index 04f7a7fb3da..2dbc0f1c3cf 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectAll.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" + <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" characteristic_id="100" default_characteristic_id="101" remediation_function="linear" default_remediation_function="linear_offset" diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectById.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectById.xml index dc8fe1e2615..ee6c7b8a0b8 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectById.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectById.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> - <rules id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectNonManual.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectNonManual.xml index f5b69dc8f87..53e9a2dfecc 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectNonManual.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectNonManual.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> - <rules id="2" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectParameters.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectParameters.xml index 9753a48c8f0..9d9c8de2343 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectParameters.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/selectParameters.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> <rules_parameters id="1" rule_id="1" name="myParameter" param_type="plop" default_value="plouf" description="My Parameter"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_name.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_name.xml index dc8fe1e2615..ee6c7b8a0b8 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_name.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_name.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> - <rules id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_rule_key.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_rule_key.xml index dc8fe1e2615..ee6c7b8a0b8 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_rule_key.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_rule_key.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> - <rules id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_sub_characteristic_id.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_sub_characteristic_id.xml index a6677ee6b63..9c2569a1832 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_sub_characteristic_id.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_by_sub_characteristic_id.xml @@ -24,35 +24,35 @@ created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Rule linked to a sub characteristic --> - <rules id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY" characteristic_id="2" default_characteristic_id="50" remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5d" remediation_offset="10h" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a sub characteristic --> - <rules id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="3" default_characteristic_id="50" remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5d" remediation_offset="10h" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a disabled sub characteristic -> should never be returned --> - <rules id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="READY" + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="READY" characteristic_id="11" default_characteristic_id="50" remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Removed rule linked to one enable sub characteristic --> - <rules id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="REMOVED" + <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="REMOVED" characteristic_id="3" default_characteristic_id="50" remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5min" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a sub characteristic, but only default characteristic is linked --> - <rules id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY" + <rules tags="[null]" system_tags="[null]" id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="[null]" default_characteristic_id="3" remediation_function="[null]" default_remediation_function="LINEAR" remediation_coeff="[null]" default_remediation_coeff="5d" diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_enables_and_non_manual.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_enables_and_non_manual.xml index b29914ea915..38d6cc5ce02 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_enables_and_non_manual.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_enables_and_non_manual.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" + <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" characteristic_id="100" default_characteristic_id="101" remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET" @@ -8,7 +8,7 @@ remediation_offset="5min" default_remediation_offset="10h" effort_to_fix_description="squid.S115.effortToFix"/> - <rules id="2" plugin_rule_key="AvoidNull" plugin_name="squid" name="Avoid Null" description="Should avoid NULL" status="REMOVED" + <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]" characteristic_id="[null]" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" @@ -16,7 +16,7 @@ remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> - <rules id="3" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY" + <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]" characteristic_id="[null]" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_id.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_id.xml index 3b21b8a8ae9..887fbbcf910 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_id.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/select_parameters_by_rule_id.xml @@ -1,8 +1,8 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> <rules_parameters id="1" rule_id="1" name="myParameter" param_type="plop" default_value="plouf" description="My Parameter"/> - <rules id="2" plugin_rule_key="Unused" plugin_name="unused" name="Unused Rule" description="Not used" status="REMOVED"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Unused" plugin_name="unused" name="Unused Rule" description="Not used" status="REMOVED"/> <rules_parameters id="2" rule_id="2" name="otherParam" param_type="plop" default_value="plouf" description="Other Parameter"/> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update-result.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update-result.xml index 5c2ad7484e4..f42a13b2fb6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED" + <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" cardinality="MULTIPLE" language="dart" created_at="2011-04-25 01:05:00" updated_at="2013-12-17" parent_id="3" note_data="My note" note_user_login="admin" note_created_at="2013-12-19" note_updated_at="2013-12-20" characteristic_id="100" default_characteristic_id="101" @@ -10,11 +10,11 @@ effort_to_fix_description="squid.S115.effortToFix" /> - <rules id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" plugin_config_key="Parent1" priority="2" cardinality="SINGLE" language="golo" created_at="1981-10-24 15:20:00" updated_at="[null]" parent_id="[null]" note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]"/> - <rules id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" plugin_config_key="Parent2" priority="2" cardinality="SINGLE" language="dart" created_at="1982-12-14 03:15:00" updated_at="[null]" parent_id="[null]" note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update.xml index d7e11ca1d24..f7f20504f15 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleDaoTest/update.xml @@ -1,12 +1,12 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" plugin_config_key="AvoidNull" priority="2" cardinality="SINGLE" language="golo" created_at="2011-04-25 01:05:00" parent_id="2"/> - <rules id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" plugin_config_key="Parent1" priority="2" cardinality="SINGLE" language="golo" created_at="1981-10-24 15:20:00" /> - <rules id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" plugin_config_key="Parent2" priority="2" cardinality="SINGLE" language="dart" created_at="1982-12-14 03:15:00" /> </dataset> diff --git a/sonar-core/src/test/resources/org/sonar/core/rule/RuleTagDaoTest/select-unused.xml b/sonar-core/src/test/resources/org/sonar/core/rule/RuleTagDaoTest/select-unused.xml index 93bfa7ca339..dcae0d0f74e 100644 --- a/sonar-core/src/test/resources/org/sonar/core/rule/RuleTagDaoTest/select-unused.xml +++ b/sonar-core/src/test/resources/org/sonar/core/rule/RuleTagDaoTest/select-unused.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <rules 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]" /> <rule_tags id="1" tag="tag1"/> diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldCountNumberOfRulesOfACategoryForGivenPlugins.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldCountNumberOfRulesOfACategoryForGivenPlugins.xml index f9753b86dbb..80eca772f66 100644 --- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldCountNumberOfRulesOfACategoryForGivenPlugins.xml +++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldCountNumberOfRulesOfACategoryForGivenPlugins.xml @@ -1,14 +1,14 @@ <dataset> - <rules id="1" name="rule one" description="desc" plugin_config_key="config" + <rules tags="[null]" system_tags="[null]" id="1" name="rule one" description="desc" plugin_config_key="config" plugin_rule_key="rule_one" plugin_name="plugin1" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="2" name="rule two" description="desc" plugin_config_key="config" + <rules tags="[null]" system_tags="[null]" id="2" name="rule two" description="desc" plugin_config_key="config" plugin_rule_key="rule_two" plugin_name="plugin2" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="3" name="rule three" description="desc" plugin_config_key="config" + <rules tags="[null]" system_tags="[null]" id="3" name="rule three" description="desc" plugin_config_key="config" plugin_rule_key="rule_three" plugin_name="plugin2" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="4" name="rule 4" description="desc" plugin_config_key="config" + <rules tags="[null]" system_tags="[null]" id="4" name="rule 4" description="desc" plugin_config_key="config" plugin_rule_key="rule_4" plugin_name="plugin2" status="READY" cardinality="SINGLE" parent_id="[null]"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml index d3643948265..2890c5c5db8 100644 --- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml +++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="rule1" description="desc" plugin_config_key="config" + <rules tags="[null]" system_tags="[null]" id="1" name="rule1" description="desc" plugin_config_key="config" plugin_rule_key="key1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="REGULAR_EXPRESSION"/> @@ -17,4 +17,4 @@ <!--<active_rule_parameters id="2" active_rule_id="2" rules_parameter_id="1" value="15"/>--> <active_rule_parameters id="3" active_rule_id="2" rules_parameter_id="2" value="15"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml index 28edad5e9f1..2372c6501a6 100644 --- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml +++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRuleParametersFromARuleParameter.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="rule1" description="desc" plugin_config_key="config" + <rules tags="[null]" system_tags="[null]" id="1" name="rule1" description="desc" plugin_config_key="config" plugin_rule_key="key1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_parameters id="1" rule_id="1" name="param1" description="foo" param_type="REGULAR_EXPRESSION"/> @@ -16,4 +16,4 @@ <active_rule_parameters id="2" active_rule_id="2" rules_parameter_id="1" value="15"/> <active_rule_parameters id="3" active_rule_id="2" rules_parameter_id="2" value="15"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml index e133d524eea..db0aa2f2efe 100644 --- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml +++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml @@ -3,15 +3,15 @@ <rules_profiles id="1" name="profile one" language="java"/> <rules_profiles id="2" name="profile two" language="java"/> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="2" name="bar" description="test" plugin_config_key="checker/bar" + <rules tags="[null]" system_tags="[null]" id="2" name="bar" description="test" plugin_config_key="checker/bar" plugin_rule_key="checkstyle.rule2" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="3" name="baz" description="test" plugin_config_key="checker/baz" + <rules tags="[null]" system_tags="[null]" id="3" name="baz" description="test" plugin_config_key="checker/baz" plugin_rule_key="checkstyle.rule3" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/> <active_rules id="2" profile_id="1" rule_id="2" failure_level="2"/> <active_rules id="3" profile_id="1" rule_id="3" failure_level="2"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml index 7b01e946779..c5b2976f405 100644 --- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml +++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml @@ -3,11 +3,11 @@ <rules_profiles id="1" name="profile one" language="java" /> <rules_profiles id="2" name="profile two" language="java" /> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="2" name="bar" description="test" plugin_config_key="checker/bar" + <rules tags="[null]" system_tags="[null]" id="2" name="bar" description="test" plugin_config_key="checker/bar" plugin_rule_key="checkstyle.rule2" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="3" name="baz" description="test" plugin_config_key="checker/baz" + <rules tags="[null]" system_tags="[null]" id="3" name="baz" description="test" plugin_config_key="checker/baz" plugin_rule_key="checkstyle.rule3" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/> @@ -18,4 +18,4 @@ <active_rules id="5" profile_id="2" rule_id="2" failure_level="2"/> <active_rules id="6" profile_id="2" rule_id="3" failure_level="2"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml index 95931ae62bb..793c98f5a80 100644 --- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml +++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml @@ -3,15 +3,15 @@ <rules_profiles id="1" name="profile one" language="java" /> <rules_profiles id="2" name="profile two" language="java" /> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="2" name="bar" description="test" plugin_config_key="checker/bar" + <rules tags="[null]" system_tags="[null]" id="2" name="bar" description="test" plugin_config_key="checker/bar" plugin_rule_key="checkstyle.rule2" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="3" name="baz" description="test" plugin_config_key="checker/baz" + <rules tags="[null]" system_tags="[null]" id="3" name="baz" description="test" plugin_config_key="checker/baz" plugin_rule_key="checkstyle.rule3" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/> <active_rules id="2" profile_id="1" rule_id="2" failure_level="2"/> <active_rules id="3" profile_id="1" rule_id="3" failure_level="2"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml index 36b61fee0c4..c432e2f26aa 100644 --- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml +++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml @@ -1,9 +1,9 @@ <dataset> <!-- Rules --> - <rules id="1" name="new1" description="test1" plugin_config_key="checker/new1" + <rules tags="[null]" system_tags="[null]" id="1" name="new1" description="test1" plugin_config_key="checker/new1" plugin_rule_key="checkstyle.new1" plugin_name="PLUGIN_KEY" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="2" name="new2" description="test2" plugin_config_key="checker/new2" + <rules tags="[null]" system_tags="[null]" id="2" name="new2" description="test2" plugin_config_key="checker/new2" plugin_rule_key="checkstyle.new2" plugin_name="PLUGIN_KEY" status="READY" cardinality="SINGLE" parent_id="[null]"/> <!-- Rules parameters --> @@ -14,4 +14,4 @@ <rules_parameters id="3" rule_id="2" name="rule2_param1" description="rule2_desc1" param_type="REGULAR_EXPRESSION" /> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml index 861a86aa8e4..547bd111a77 100644 --- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml +++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRules.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRules.xml index c3c159f949b..f5856156dbd 100644 --- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRules.xml +++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRules.xml @@ -1,8 +1,8 @@ <dataset> - <rules id="1" name="rule one" description="desc" plugin_config_key="other config" + <rules tags="[null]" system_tags="[null]" id="1" name="rule one" description="desc" plugin_config_key="other config" plugin_rule_key="rule_one" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="2" name="rule two" description="desc" plugin_config_key="config" + <rules tags="[null]" system_tags="[null]" id="2" name="rule two" description="desc" plugin_config_key="config" plugin_rule_key="rule_two" plugin_name="other plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_parameters id="1" rule_id="1" name="rule1_param1" description="rule1_desc1" param_type="REGULAR_EXPRESSION" @@ -10,4 +10,4 @@ <rules_parameters id="2" rule_id="2" name="rule2_param1" description="rule2_desc1" param_type="REGULAR_EXPRESSION" /> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/RuleNormalizer.java b/sonar-server/src/main/java/org/sonar/server/rule2/RuleNormalizer.java index 65ccbe11153..8a98be2e7d8 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/RuleNormalizer.java +++ b/sonar-server/src/main/java/org/sonar/server/rule2/RuleNormalizer.java @@ -27,8 +27,6 @@ import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; import org.sonar.core.rule.RuleDto; import org.sonar.core.rule.RuleParamDto; -import org.sonar.core.rule.RuleRuleTagDto; -import org.sonar.core.rule.RuleTagType; import org.sonar.server.search.BaseNormalizer; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -123,8 +121,8 @@ public class RuleNormalizer extends BaseNormalizer<RuleDto, RuleKey> { indexField(RuleField.INTERNAL_KEY.key(), rule.getConfigKey(), document); indexField(RuleField.TEMPLATE.key(), rule.getCardinality() == Cardinality.MULTIPLE, document); - document.startArray(RuleField.TAGS.key()).endArray(); - document.startArray(RuleField.SYSTEM_TAGS.key()).endArray(); + document.array(RuleField.TAGS.key(), rule.getTags()); + document.array(RuleField.SYSTEM_TAGS.key(), rule.getSystemTags()); document.startObject(RuleField.PARAMS.key()).endObject(); document.startObject(RuleField.ACTIVE.key()).endObject(); @@ -163,19 +161,4 @@ public class RuleNormalizer extends BaseNormalizer<RuleDto, RuleKey> { } } - - public UpdateRequest normalize(RuleRuleTagDto tag, RuleKey key) { - try { - String field = RuleField.TAGS.key(); - if (tag.getType().equals(RuleTagType.SYSTEM)) { - field = RuleField.SYSTEM_TAGS.key(); - } - return new UpdateRequest() - .script("ctx._source." + field + " += tag") - .addScriptParam("tag", tag.getTag()); - } catch (Exception e) { - throw new IllegalStateException(String.format("Could not normalize Object (%s) for key %s", - tag.getClass().getSimpleName(), key.toString()), e); - } - } } diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java b/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java index 4b9329467b5..8cea549b397 100644 --- a/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java +++ b/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java @@ -72,40 +72,4 @@ public abstract class BaseNormalizer<E extends Dto<K>, K extends Serializable> { LOG.error("Could not set {} to {} in ESDocument", field, value); } } - - -// protected void indexField(Fields field, Object dto, XContentBuilder document) { -// try { -// document.field(field.key(), field.method.invoke(dto)); -// } catch (IllegalArgumentException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (IOException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (IllegalAccessException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (InvocationTargetException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } -// } -// -// -// -//private static Method getReadMethod(String method){ -// try { -// return RuleDto.class.getDeclaredMethod(method); -// } catch (SecurityException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (NoSuchMethodException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } -// return null; -//} - - } diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexAction.java b/sonar-server/src/main/java/org/sonar/server/search/IndexAction.java index 3c568e72d61..5409d5fc366 100644 --- a/sonar-server/src/main/java/org/sonar/server/search/IndexAction.java +++ b/sonar-server/src/main/java/org/sonar/server/search/IndexAction.java @@ -19,14 +19,10 @@ */ package org.sonar.server.search; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.sonar.core.cluster.QueueAction; public abstract class IndexAction extends QueueAction { - private static final Logger LOG = LoggerFactory.getLogger(IndexAction.class); - public enum Method { INSERT, UPDATE, DELETE } @@ -36,13 +32,13 @@ public abstract class IndexAction extends QueueAction { protected Index index; - public IndexAction(String indexType, Method method){ + public IndexAction(String indexType, Method method) { super(); this.indexType = indexType; this.method = method; } - public Method getMethod(){ + public Method getMethod() { return this.method; } diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/533_add_rule_tags_columns.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/533_add_rule_tags_columns.rb new file mode 100644 index 00000000000..92e497417d6 --- /dev/null +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/533_add_rule_tags_columns.rb @@ -0,0 +1,32 @@ +# +# SonarQube, open source software quality management tool. +# Copyright (C) 2008-2014 SonarSource +# mailto:contact AT sonarsource DOT com +# +# SonarQube is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 3 of the License, or (at your option) any later version. +# +# SonarQube is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + +# +# SonarQube 4.4 +# SONAR-5007 +# +class AddRuleTagsColumns < ActiveRecord::Migration + + def self.up + add_column 'rules', :tags, :string, :null => true, :limit => 4000 + add_column 'rules', :system_tags, :string, :null => true, :limit => 4000 + end + +end diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/RuleDaoTest.java b/sonar-server/src/test/java/org/sonar/server/rule2/RuleDaoTest.java deleted file mode 100644 index 84baa4c4221..00000000000 --- a/sonar-server/src/test/java/org/sonar/server/rule2/RuleDaoTest.java +++ /dev/null @@ -1,393 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.rule2; - -import org.sonar.core.persistence.AbstractDaoTestCase; - -public class RuleDaoTest extends AbstractDaoTestCase { - -// private static RuleDao dao; -// -// @Before -// public void createDao() throws Exception { -// dao = new RuleDao(getMyBatis()); -// } -// -// @Test -// public void select_all() throws Exception { -// setupData("selectAll"); -// List<RuleDto> ruleDtos = dao.selectAll(); -// -// assertThat(ruleDtos).hasSize(1); -// -// RuleDto ruleDto = ruleDtos.get(0); -// assertThat(ruleDto.getId()).isEqualTo(1); -// assertThat(ruleDto.getName()).isEqualTo("Avoid Null"); -// assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL"); -// assertThat(ruleDto.getStatus()).isEqualTo(Rule.STATUS_READY); -// assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle"); -// assertThat(ruleDto.getNoteData()).isEqualTo("Rule note with accents \u00e9\u00e8\u00e0"); -// assertThat(ruleDto.getSubCharacteristicId()).isEqualTo(100); -// assertThat(ruleDto.getDefaultSubCharacteristicId()).isEqualTo(101); -// assertThat(ruleDto.getRemediationFunction()).isEqualTo("linear"); -// assertThat(ruleDto.getDefaultRemediationFunction()).isEqualTo("linear_offset"); -// assertThat(ruleDto.getRemediationCoefficient()).isEqualTo("1h"); -// assertThat(ruleDto.getDefaultRemediationCoefficient()).isEqualTo("5d"); -// assertThat(ruleDto.getRemediationOffset()).isEqualTo("5min"); -// assertThat(ruleDto.getDefaultRemediationOffset()).isEqualTo("10h"); -// assertThat(ruleDto.getEffortToFixDescription()).isEqualTo("squid.S115.effortToFix"); -// } -// -// @Test -// public void select_enables_and_non_manual() throws Exception { -// setupData("select_enables_and_non_manual"); -// List<RuleDto> ruleDtos = dao.selectEnablesAndNonManual(); -// -// assertThat(ruleDtos.size()).isEqualTo(1); -// RuleDto ruleDto = ruleDtos.get(0); -// assertThat(ruleDto.getId()).isEqualTo(1); -// assertThat(ruleDto.getName()).isEqualTo("Avoid Null"); -// assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL"); -// assertThat(ruleDto.getStatus()).isEqualTo(Rule.STATUS_READY); -// assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle"); -// assertThat(ruleDto.getNoteData()).isEqualTo("Rule note with accents \u00e9\u00e8\u00e0"); -// assertThat(ruleDto.getSubCharacteristicId()).isEqualTo(100); -// assertThat(ruleDto.getDefaultSubCharacteristicId()).isEqualTo(101); -// assertThat(ruleDto.getRemediationFunction()).isEqualTo("LINEAR"); -// assertThat(ruleDto.getDefaultRemediationFunction()).isEqualTo("LINEAR_OFFSET"); -// assertThat(ruleDto.getRemediationCoefficient()).isEqualTo("1h"); -// assertThat(ruleDto.getDefaultRemediationCoefficient()).isEqualTo("5d"); -// assertThat(ruleDto.getRemediationOffset()).isEqualTo("5min"); -// assertThat(ruleDto.getDefaultRemediationOffset()).isEqualTo("10h"); -// assertThat(ruleDto.getEffortToFixDescription()).isEqualTo("squid.S115.effortToFix"); -// } -// -// @Test -// public void select_by_id() throws Exception { -// setupData("selectById"); -// RuleDto ruleDto = dao.selectById(2); -// -// assertThat(ruleDto.getId()).isEqualTo(2); -// assertThat(ruleDto.getName()).isEqualTo("Avoid Null"); -// assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL"); -// assertThat(ruleDto.getStatus()).isEqualTo(Rule.STATUS_READY); -// assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle"); -// } -// -// @Test -// public void select_by_rule_key() throws Exception { -// setupData("select_by_rule_key"); -// assertThat(dao.selectByKey(RuleKey.of("checkstyle", "AvoidComparison"))).isNotNull(); -// assertThat(dao.selectByKey(RuleKey.of("checkstyle", "Unknown"))).isNull(); -// assertThat(dao.selectByKey(RuleKey.of("Unknown", "AvoidComparison"))).isNull(); -// } -// -// @Test -// public void select_by_name() throws Exception { -// setupData("select_by_name"); -// RuleDto ruleDto = dao.selectByName("Avoid Null"); -// -// assertThat(ruleDto.getId()).isEqualTo(2); -// assertThat(ruleDto.getName()).isEqualTo("Avoid Null"); -// assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL"); -// assertThat(ruleDto.getStatus()).isEqualTo(Rule.STATUS_READY); -// assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle"); -// } -// -// @Test -// public void select_non_manual() throws Exception { -// setupData("selectNonManual"); -// DbSession session = getMyBatis().openSession(false); -// List<RuleDto> ruleDtos = dao.selectNonManual(session); -// session.commit(); -// session.close(); -// -// assertThat(ruleDtos.size()).isEqualTo(1); -// RuleDto ruleDto = ruleDtos.get(0); -// assertThat(ruleDto.getId()).isEqualTo(1); -// assertThat(ruleDto.getName()).isEqualTo("Avoid Null"); -// assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL"); -// assertThat(ruleDto.getStatus()).isEqualTo(Rule.STATUS_READY); -// assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle"); -// } -// -// @Test -// public void select_by_sub_characteristic_id(){ -// setupData("select_by_sub_characteristic_id"); -// -// // Rules from sub characteristic (even REMOVED ones are returned) -// List<RuleDto> ruleDtos = dao.selectBySubCharacteristicId(3); -// assertThat(ruleDtos).hasSize(3); -// assertThat(idsFromRuleDtos(ruleDtos)).containsExactly(2, 4, 5); -// -// // Nothing on root characteristic -// ruleDtos = dao.selectBySubCharacteristicId(1); -// assertThat(ruleDtos).isEmpty(); -// -// // Rules from disabled characteristic -// ruleDtos = dao.selectBySubCharacteristicId(11); -// assertThat(idsFromRuleDtos(ruleDtos)).containsExactly(3); -// } -// -// @Test -// public void update() { -// setupData("update"); -// -// RuleDto ruleToUpdate = new RuleDto() -// .setId(1) -// .setRuleKey("NewRuleKey") -// .setRepositoryKey("plugin") -// .setName("new name") -// .setDescription("new description") -// .setStatus(Rule.STATUS_DEPRECATED) -// .setConfigKey("NewConfigKey") -// .setSeverity(Severity.INFO) -// .setCardinality(Cardinality.MULTIPLE) -// .setLanguage("dart") -// .setParentId(3) -// .setNoteData("My note") -// .setNoteUserLogin("admin") -// .setNoteCreatedAt(DateUtils.parseDate("2013-12-19")) -// .setNoteUpdatedAt(DateUtils.parseDate("2013-12-20")) -// .setSubCharacteristicId(100) -// .setDefaultSubCharacteristicId(101) -// .setRemediationFunction("linear") -// .setDefaultRemediationFunction("linear_offset") -// .setRemediationCoefficient("1h") -// .setDefaultRemediationCoefficient("5d") -// .setRemediationOffset("5min") -// .setDefaultRemediationOffset("10h") -// .setEffortToFixDescription("squid.S115.effortToFix") -// .setUpdatedAt(DateUtils.parseDate("2013-12-17")); -// -// dao.update(ruleToUpdate); -// -// checkTables("update", "rules"); -// } -// -// @Test -// public void insert() { -// setupData("empty"); -// -// RuleDto ruleToInsert = new RuleDto() -// .setId(1) -// .setRuleKey("NewRuleKey") -// .setRepositoryKey("plugin") -// .setName("new name") -// .setDescription("new description") -// .setStatus(Rule.STATUS_DEPRECATED) -// .setConfigKey("NewConfigKey") -// .setSeverity(Severity.INFO) -// .setCardinality(Cardinality.MULTIPLE) -// .setLanguage("dart") -// .setParentId(3) -// .setSubCharacteristicId(100) -// .setDefaultSubCharacteristicId(101) -// .setRemediationFunction("linear") -// .setDefaultRemediationFunction("linear_offset") -// .setRemediationCoefficient("1h") -// .setDefaultRemediationCoefficient("5d") -// .setRemediationOffset("5min") -// .setDefaultRemediationOffset("10h") -// .setEffortToFixDescription("squid.S115.effortToFix") -// .setCreatedAt(DateUtils.parseDate("2013-12-16")) -// .setUpdatedAt(DateUtils.parseDate("2013-12-17")); -// -// dao.insert(ruleToInsert); -// -// checkTables("insert", "rules"); -// } -// -// @Test -// public void insert_all() { -// setupData("empty"); -// -// RuleDto ruleToInsert1 = new RuleDto() -// .setId(1) -// .setRuleKey("NewRuleKey") -// .setRepositoryKey("plugin") -// .setName("new name") -// .setDescription("new description") -// .setStatus(Rule.STATUS_DEPRECATED) -// .setConfigKey("NewConfigKey") -// .setSeverity(Severity.INFO) -// .setCardinality(Cardinality.MULTIPLE) -// .setLanguage("dart") -// .setParentId(3) -// .setSubCharacteristicId(100) -// .setDefaultSubCharacteristicId(101) -// .setRemediationFunction("linear") -// .setDefaultRemediationFunction("linear_offset") -// .setRemediationCoefficient("1h") -// .setDefaultRemediationCoefficient("5d") -// .setRemediationOffset("5min") -// .setDefaultRemediationOffset("10h") -// .setEffortToFixDescription("squid.S115.effortToFix") -// .setCreatedAt(DateUtils.parseDate("2013-12-16")) -// .setUpdatedAt(DateUtils.parseDate("2013-12-17")); -// -// RuleDto ruleToInsert2 = new RuleDto() -// .setId(2) -// .setRuleKey("NewRuleKey2") -// .setRepositoryKey("plugin2") -// .setName("new name2") -// .setDescription("new description2") -// .setStatus(Rule.STATUS_BETA) -// .setConfigKey("NewConfigKey2") -// .setSeverity(Severity.MAJOR) -// .setCardinality(Cardinality.SINGLE) -// .setLanguage("js") -// .setParentId(null) -// .setSubCharacteristicId(102) -// .setDefaultSubCharacteristicId(103) -// .setRemediationFunction("linear_offset") -// .setDefaultRemediationFunction("linear") -// .setRemediationCoefficient("5d") -// .setDefaultRemediationCoefficient("1h") -// .setRemediationOffset("10h") -// .setDefaultRemediationOffset("5min") -// .setEffortToFixDescription("squid.S115.effortToFix2") -// .setCreatedAt(DateUtils.parseDate("2013-12-14")) -// .setUpdatedAt(DateUtils.parseDate("2013-12-15")); -// -// dao.insert(ImmutableList.of(ruleToInsert1, ruleToInsert2)); -// -// checkTables("insert_all", "rules"); -// } -// -// @Test -// public void select_parameters() throws Exception { -// setupData("selectParameters"); -// List<RuleParamDto> ruleDtos = dao.selectParameters(); -// -// assertThat(ruleDtos.size()).isEqualTo(1); -// RuleParamDto ruleDto = ruleDtos.get(0); -// assertThat(ruleDto.getId()).isEqualTo(1); -// assertThat(ruleDto.getName()).isEqualTo("myParameter"); -// assertThat(ruleDto.getDescription()).isEqualTo("My Parameter"); -// assertThat(ruleDto.getType()).isEqualTo("plop"); -// assertThat(ruleDto.getDefaultValue()).isEqualTo("plouf"); -// } -// -// @Test -// public void select_parameters_by_rule_id() throws Exception { -// setupData("select_parameters_by_rule_id"); -// int ruleId = 1; -// List<RuleParamDto> ruleDtos = dao.selectParametersByRuleId(ruleId); -// -// assertThat(ruleDtos.size()).isEqualTo(1); -// RuleParamDto ruleDto = ruleDtos.get(0); -// assertThat(ruleDto.getId()).isEqualTo(1); -// assertThat(ruleDto.getName()).isEqualTo("myParameter"); -// assertThat(ruleDto.getDescription()).isEqualTo("My Parameter"); -// assertThat(ruleDto.getType()).isEqualTo("plop"); -// assertThat(ruleDto.getRuleId()).isEqualTo(ruleId); -// } -// -// @Test -// public void select_parameters_by_rule_ids() throws Exception { -// setupData("select_parameters_by_rule_ids"); -// -// assertThat(dao.selectParametersByRuleIds(newArrayList(1, 2))).hasSize(2); -// assertThat(dao.selectParametersByRuleIds(newArrayList(1))).hasSize(1); -// } -// -// @Test -// public void insert_parameter() { -// setupData("insert_parameter"); -// -// RuleParamDto param = new RuleParamDto() -// .setRuleId(1) -// .setName("max") -// .setType("INTEGER") -// .setDefaultValue("30") -// .setDescription("My Parameter"); -// -// dao.insert(param); -// -// checkTables("insert_parameter", "rules_parameters"); -// } -// -// @Test -// public void update_parameter() { -// setupData("update_parameter"); -// -// RuleParamDto param = new RuleParamDto() -// .setId(1) -// .setName("format") -// .setType("STRING") -// .setDefaultValue("^[a-z]+(\\.[a-z][a-z0-9]*)*$") -// .setDescription("Regular expression used to check the package names against."); -// -// dao.update(param); -// -// checkTables("update_parameter", "rules_parameters"); -// } -// -// @Test -// public void select_tags_by_rule_id() throws Exception { -// setupData("select_tags_by_rule_id"); -// -// assertThat(dao.selectTagsByRuleId(3)).hasSize(2); -// } -// -// @Test -// public void select_tags_by_rule_ids() throws Exception { -// setupData("select_tags_by_rule_ids"); -// -// assertThat(dao.selectTagsByRuleIds(newArrayList(3, 4))).hasSize(3); -// } -// -// @Test -// public void keysOfRowsUpdatedAfter() throws Exception { -// setupData("empty"); -// -// RuleDto rule1 = new RuleDto() -// .setId(1) -// .setRepositoryKey("foo") -// .setRuleKey("R1") -// .setName("ROne") -// .setCreatedAt(DateUtils.parseDate("2013-12-16")) -// .setUpdatedAt(DateUtils.parseDate("2013-12-16")); -// RuleDto rule2 = new RuleDto() -// .setId(2) -// .setRepositoryKey("foo") -// .setRuleKey("R2") -// .setName("RTwo") -// .setCreatedAt(DateUtils.parseDate("2014-01-28")) -// .setUpdatedAt(DateUtils.parseDate("2014-05-19")); -// dao.insert(Arrays.asList(rule1, rule2)); -// -// assertThat(dao.keysOfRowsUpdatedAfter(DateUtils.parseDate("2014-06-01").getTime())).isEmpty(); -// assertThat(dao.keysOfRowsUpdatedAfter(DateUtils.parseDate("2012-01-01").getTime())).hasSize(2); -// Iterable<RuleKey> keys = dao.keysOfRowsUpdatedAfter(DateUtils.parseDate("2014-05-17").getTime()); -// assertThat(keys).hasSize(1); -// assertThat(Iterables.getFirst(keys, null).rule()).isEqualTo("R2"); -// } -// -// private List<Integer> idsFromRuleDtos(List<RuleDto> ruleDtos){ -// return newArrayList(Iterables.transform(ruleDtos, new Function<RuleDto, Integer>() { -// @Override -// public Integer apply(RuleDto input) { -// return input.getId(); -// } -// })); -// } -} diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/RuleServiceMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule2/RuleServiceMediumTest.java index f0fd11d80f4..2a2b9c95472 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/RuleServiceMediumTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule2/RuleServiceMediumTest.java @@ -74,6 +74,8 @@ public class RuleServiceMediumTest { assertThat(persistedDto.getId()).isGreaterThanOrEqualTo(0); assertThat(persistedDto.getRuleKey()).isEqualTo(ruleKey.rule()); assertThat(persistedDto.getLanguage()).isEqualTo("js"); + assertThat(persistedDto.getTags()).containsOnly("tag1", "tag2"); + assertThat(persistedDto.getSystemTags()).containsOnly("systag1", "systag2"); // verify that rule is indexed in es index.refresh(); @@ -91,9 +93,8 @@ public class RuleServiceMediumTest { assertThat(hit.internalKey()).isEqualTo("InternalKeyS001"); assertThat(hit.severity()).isEqualTo("INFO"); assertThat(hit.template()).isFalse(); - - //TODO assertThat((Collection) hit.getField(RuleNormalizer.RuleField.SYSTEM_TAGS.key())).isEmpty(); - //TODO assertThat((Collection) hit.getField(RuleNormalizer.RuleField.TAGS.key())).isEmpty(); + assertThat(hit.tags()).containsOnly("tag1", "tag2"); + assertThat(hit.systemTags()).containsOnly("systag1", "systag2"); } @@ -155,6 +156,8 @@ public class RuleServiceMediumTest { .setRemediationOffset("5min") .setDefaultRemediationOffset("10h") .setEffortToFixDescription(ruleKey.repository() + "." + ruleKey.rule() + ".effortToFix") + .setTags(new String[]{"tag1", "tag2"}) + .setSystemTags(new String[]{"systag1", "systag2"}) .setCreatedAt(DateUtils.parseDate("2013-12-16")) .setUpdatedAt(DateUtils.parseDate("2013-12-17")); } diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren-result.xml index 6990ee887cf..414d5bb6324 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="REGULAR_EXPRESSION"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren.xml index cf8d9f25a59..aad208af42c 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="REGULAR_EXPRESSION"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent-result.xml index 50c7913ddce..d6989307b66 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent-result.xml @@ -1,9 +1,9 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="2" name="bar" description="test" plugin_config_key="checker/bar" + <rules tags="[null]" system_tags="[null]" id="2" name="bar" description="test" plugin_config_key="checker/bar" plugin_rule_key="checkstyle.rule2" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="1" used_profile="true" name="parent" language="java" parent_name="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent.xml index 226d04aa39f..5dc5943c65f 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent.xml @@ -1,9 +1,9 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="2" name="bar" description="test" plugin_config_key="checker/bar" + <rules tags="[null]" system_tags="[null]" id="2" name="bar" description="test" plugin_config_key="checker/bar" plugin_rule_key="checkstyle.rule2" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="1" used_profile="true" name="parent" language="java" parent_name="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldCheckCycles.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldCheckCycles.xml index 2a34f38f480..3ef5b6a1aaf 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldCheckCycles.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldCheckCycles.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="1" used_profile="true" name="level1" language="java" parent_name="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren-result.xml index 97b54867590..fa429c2f63c 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="2" used_profile="false" name="parent" language="java" parent_name="[null]"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren.xml index 90ca7db8e7b..a26558a9af0 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="1" used_profile="true" name="parent" language="java" parent_name="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml index 3f3236668d6..b5b657f7dcc 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="2" used_profile="false" name="parent" language="java" parent_name="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml index 7fdf1b787b6..abb43308bbb 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="1" used_profile="true" name="parent" language="java" parent_name="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent-result.xml index 11c9b33673b..e9b31aeabab 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="1" used_profile="true" name="parent" language="java" parent_name="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent.xml index da1f234bdf4..4c07b2f63d6 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="1" used_profile="true" name="parent" language="java" parent_name="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent-result.xml index af743bcc7a9..2731d011132 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="1" used_profile="true" name="parent" language="java" parent_name="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent.xml index 15bb039df75..e96c33fdad2 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="1" used_profile="true" name="parent" language="java" parent_name="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile.xml index d1a4eea9b8b..9b9803081e1 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile.xml @@ -1,9 +1,9 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="2" name="bar" description="test2" plugin_config_key="checker/bar" + <rules tags="[null]" system_tags="[null]" id="2" name="bar" description="test2" plugin_config_key="checker/bar" plugin_rule_key="checkstyle.rule2" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_parameters id="13" rule_id="2" name="param1" description="[null]" param_type="REGULAR_EXPRESSION"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/initialData.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/initialData.xml index 6b30e58185b..c5241085e2e 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/initialData.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/initialData.xml @@ -1,9 +1,9 @@ <dataset> - <rules id="1" name="foo" description="test" plugin_config_key="checker/foo" + <rules tags="[null]" system_tags="[null]" id="1" name="foo" description="test" plugin_config_key="checker/foo" plugin_rule_key="checkstyle.rule1" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> - <rules id="2" name="bar" description="test2" plugin_config_key="checker/bar" + <rules tags="[null]" system_tags="[null]" id="2" name="bar" description="test2" plugin_config_key="checker/bar" plugin_rule_key="checkstyle.rule2" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_parameters id="13" rule_id="2" name="param1" description="[null]" param_type="REGULAR_EXPRESSION"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted.xml index 5ef9bf1a269..7103bfacf12 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="2" name="bar" description="test2" plugin_config_key="checker/bar" + <rules tags="[null]" system_tags="[null]" id="2" name="bar" description="test2" plugin_config_key="checker/bar" plugin_rule_key="checkstyle.rule2" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_parameters id="13" rule_id="2" name="param1" description="[null]" param_type="REGULAR_EXPRESSION"/> <rules_parameters id="14" rule_id="2" name="param2" description="[null]" param_type="REGULAR_EXPRESSION"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml index 3aa3efa4fb3..c3129c4f001 100644 --- a/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml +++ b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="2" name="bar" description="test2" plugin_config_key="checker/bar" + <rules tags="[null]" system_tags="[null]" id="2" name="bar" description="test2" plugin_config_key="checker/bar" plugin_rule_key="checkstyle.rule2" plugin_name="plugin" status="READY" cardinality="SINGLE" parent_id="[null]"/> <rules_profiles id="1" version="1" used_profile="true" name="parent" language="java" parent_name="[null]" /> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml index d802714fa76..dfa2ccff019 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params-result.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/disable_deprecated_active_rule_params.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params.xml index 8b124e9c6c6..2f429f49bbb 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rule_params.xml @@ -1,6 +1,6 @@ <dataset> - <rules 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_parameters id="1" rule_id="1" name="param1" description="[null]" param_type="STRING"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules-result.xml index 9d782421156..931499501cc 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules-result.xml @@ -1,15 +1,15 @@ <dataset> - <rules 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 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 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 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/rule/RegisterRulesTest/disable_deprecated_active_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules.xml index 1e4bfe7b714..8957a2373d4 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_active_rules.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/disable_deprecated_repositories-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_repositories-result.xml index c360f7632fe..f350c52f77b 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_repositories-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_repositories-result.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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 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/rule/RegisterRulesTest/disable_deprecated_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules-result.xml index 6fbbd458ed6..fdf0c45f489 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules-result.xml @@ -1,20 +1,20 @@ <dataset> - <rules 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 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 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_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 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"/> <rule_tags id="3" tag="tag1"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules.xml index 02da4a352cd..2c47ca23004 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_deprecated_rules.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml index 9b4c8e7fec4..81682535971 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled-result.xml @@ -1,21 +1,21 @@ <dataset> - <rules 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 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 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 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 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 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/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml index 3ec546d9b46..d3e61274471 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/disable_template_rules_if_parent_is_disabled.xml @@ -1,19 +1,19 @@ <dataset> <!-- Rule as been removed --> - <rules 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 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 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 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/rule/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml index f292f0a01f6..d5dfe74dd1c 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/ignore_rule_debt_definitions_if_rule_is_linked_on_root_characteristic.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/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 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 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/rule/RegisterRulesTest/insert_extended_repositories-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_extended_repositories-result.xml index c8b08ab37e8..5ad7d6d57d1 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_extended_repositories-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_extended_repositories-result.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/insert_new_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml index d0de3d15a9d..0578a3d9262 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/insert_new_rules-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules 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 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 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/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml index b78b8804371..c798a6a0c7a 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules 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 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 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 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/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml index a512738cc04..13907539477 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_already_disabled_rules.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/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 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 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/rule/RegisterRulesTest/not_disable_manual_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules-result.xml index 7aa9839d5ad..0f73b04c525 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules-result.xml @@ -1,15 +1,15 @@ <dataset> - <rules 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 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 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 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/rule/RegisterRulesTest/not_disable_manual_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules.xml index f745b821f72..7f175d92749 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_manual_rules.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml index ddc9c940e81..e4a4196bcce 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled-result.xml @@ -1,12 +1,12 @@ <dataset> - <rules 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 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 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/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml index 4260a86f9a6..8e3bcfb804d 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_disable_template_rules_if_parent_is_enabled.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/not_update_already_disabled_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules-result.xml index c8f9fa8f786..91f0b991742 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules-result.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/not_update_already_disabled_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules.xml index 7a8a2fa8e95..45e3706d700 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/not_update_already_disabled_rules.xml @@ -1,6 +1,6 @@ <dataset> - <rules 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/rule/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml index 1d08110ddd6..f4e73c9239b 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/notify_for_removed_rules_when_repository_is_still_existing.xml @@ -1,6 +1,6 @@ <dataset> - <rules 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/rule/RegisterRulesTest/reactivate_disabled_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules-result.xml index 18f0f55b16e..57d8e33ed85 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules-result.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/reactivate_disabled_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules.xml index 146807e3afc..d5b82972127 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_rules.xml @@ -1,6 +1,6 @@ <dataset> - <rules 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/rule/RegisterRulesTest/reactivate_disabled_template_rules-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules-result.xml index df9a1cef966..7e0166ec64c 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules-result.xml @@ -1,12 +1,12 @@ <dataset> - <rules 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 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 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/rule/RegisterRulesTest/reactivate_disabled_template_rules.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules.xml index 17e94e974ca..3982ccb7ca7 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/reactivate_disabled_template_rules.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml index 3fd0dc9c746..681ce324eaf 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml index 4ccf94bbaa3..36041f853cb 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_characteristic_not_found.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/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 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 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/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml b/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 6046c08a0cd..7da79185196 100644 --- a/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/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules 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="-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 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/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml index 1a5aac45ef0..0c99aac7390 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/set_no_characteristic_when_default_characteristic_not_found_and_overriding_characteristic_disabled.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/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 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 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/rule/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/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden-result.xml index 1ccbc8dfb68..d4f6269c2a9 100644 --- a/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/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 @@ -1,6 +1,6 @@ <dataset> - <rules 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="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 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/rule/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/rule/RegisterRulesTest/set_no_default_characteristic_when_default_characteristic_not_found_but_characteristic_has_been_overridden.xml index 4a0da7b3377..8439879859b 100644 --- a/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/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 @@ -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 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="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 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/rule/RegisterRulesTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/shared.xml index d74823494b0..c1c3fb31ab4 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/shared.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/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 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/rule/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml index b7d93c5a21b..1cfe02dd4ab 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/store_bundle_name_and_description_in_database-result.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/update_rule_fields-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml index 214576567d6..7ac88187557 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules 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="200" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" @@ -21,7 +21,7 @@ <rules_rule_tags id="4" rule_id="1" rule_tag_id="4" tag_type="ADMIN"/> <rules_rule_tags id="5" rule_id="1" rule_tag_id="5" tag_type="SYSTEM"/> - <rules 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/rule/RegisterRulesTest/update_rule_fields.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml index 158e65dd3dd..dddc193f1d8 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_fields.xml @@ -2,7 +2,7 @@ <characteristics id="200" kee="MEMORY_EFFICIENCY" name="Memory Efficiency" parent_id="1" characteristic_order="1" enabled="[true]"/> - <rules 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" @@ -22,7 +22,7 @@ <rules_rule_tags id="3" rule_id="1" rule_tag_id="3" tag_type="ADMIN"/> <rules_rule_tags id="4" rule_id="1" rule_tag_id="4" tag_type="ADMIN"/> - <rules 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/rule/RegisterRulesTest/update_rule_parameters-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters-result.xml index 337a28e1605..e4eb07ec541 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters-result.xml @@ -1,11 +1,11 @@ <dataset> - <rules 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_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 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/rule/RegisterRulesTest/update_rule_parameters.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters.xml index 6e63e30e606..f1037dcb3f5 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_rule_parameters.xml @@ -1,9 +1,9 @@ <dataset> - <rules 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 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/rule/RegisterRulesTest/update_template_rule_language-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml index 10e1584dd73..0e038147bec 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules 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="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 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 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 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/rule/RegisterRulesTest/update_template_rule_language.xml b/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml index 3328bafc00c..ef467594087 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/RegisterRulesTest/update_template_rule_language.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule/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 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 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 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 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]" diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/empty.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/empty.xml index 2e8f2f255af..192f6531b7a 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/empty.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/empty.xml @@ -1,7 +1,7 @@ <dataset> <rules_parameters id="1" rule_id="10" name="max" param_type="INTEGER" default_value="30" description="My Parameter"/> - <rules id="10" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" + <rules tags="[null]" system_tags="[null]" id="10" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" plugin_config_key="Parent1" priority="2" cardinality="SINGLE" language="golo" created_at="1981-10-24 15:20:00" /> <rules_profiles id="1" name="Child" language="java" parent_name="Parent" version="1" diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/insert_parameter.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/insert_parameter.xml index d19f7846620..4f5c6f53de6 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/insert_parameter.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/insert_parameter.xml @@ -4,7 +4,7 @@ <active_rules id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED" note_created_at="2013-12-18" note_updated_at="2013-12-18" note_user_login="henry" note_data="some note"/> - <rules id="10" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" + <rules tags="[null]" system_tags="[null]" id="10" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" plugin_config_key="Parent1" priority="2" cardinality="SINGLE" language="golo" created_at="1981-10-24 15:20:00" /> <rules_profiles id="1" name="Child" language="java" parent_name="Parent" version="1" diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/shared.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/shared.xml index 5c555d473e8..b62e0405864 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/shared.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/ActiveRuleDaoTest/shared.xml @@ -1,8 +1,8 @@ <dataset> - <rules id="10" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" + <rules tags="[null]" system_tags="[null]" id="10" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" plugin_config_key="Parent1" priority="2" cardinality="SINGLE" language="golo" created_at="1981-10-24 15:20:00" /> - <rules id="11" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" + <rules tags="[null]" system_tags="[null]" id="11" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" plugin_config_key="Parent1" priority="2" cardinality="SINGLE" language="golo" created_at="1981-10-24 15:20:00" /> <active_rules id="1" profile_id="1" rule_id="10" failure_level="2" inheritance="INHERITED" diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/insert-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/insert-result.xml index e7e1d53d554..f9b97c6bbc0 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/insert-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/insert-result.xml @@ -20,7 +20,7 @@ <dataset> - <rules id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED" + <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" cardinality="MULTIPLE" language="dart" created_at="2013-12-16" updated_at="2013-12-17" parent_id="3" note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]" characteristic_id="100" default_characteristic_id="101" diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/insert_all-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/insert_all-result.xml index 878e3d586ed..0a7c5c43e93 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/insert_all-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/insert_all-result.xml @@ -20,7 +20,7 @@ <dataset> - <rules id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED" + <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" cardinality="MULTIPLE" language="dart" created_at="2013-12-16" updated_at="2013-12-17" parent_id="3" note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]" characteristic_id="100" default_characteristic_id="101" @@ -30,7 +30,7 @@ effort_to_fix_description="squid.S115.effortToFix" /> - <rules id="2" plugin_rule_key="NewRuleKey2" plugin_name="plugin2" name="new name2" description="new description2" status="BETA" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="NewRuleKey2" plugin_name="plugin2" name="new name2" description="new description2" status="BETA" plugin_config_key="NewConfigKey2" priority="2" cardinality="SINGLE" language="js" created_at="2013-12-14" updated_at="2013-12-15" parent_id="[null]" note_data="[null]" note_user_login="[null]" note_created_at="[null]" note_updated_at="[null]" characteristic_id="102" default_characteristic_id="103" diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectAll.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectAll.xml index 04f7a7fb3da..2dbc0f1c3cf 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectAll.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectAll.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" + <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" characteristic_id="100" default_characteristic_id="101" remediation_function="linear" default_remediation_function="linear_offset" diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectById.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectById.xml index dc8fe1e2615..ee6c7b8a0b8 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectById.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectById.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> - <rules id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectNonManual.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectNonManual.xml index f5b69dc8f87..53e9a2dfecc 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectNonManual.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectNonManual.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> - <rules id="2" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY"/> </dataset> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectParameters.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectParameters.xml index 9753a48c8f0..9d9c8de2343 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectParameters.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/selectParameters.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> <rules_parameters id="1" rule_id="1" name="myParameter" param_type="plop" default_value="plouf" description="My Parameter"/> </dataset> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_name.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_name.xml index dc8fe1e2615..ee6c7b8a0b8 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_name.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_name.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> - <rules id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_rule_key.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_rule_key.xml index dc8fe1e2615..ee6c7b8a0b8 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_rule_key.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_rule_key.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> - <rules id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidComparison" plugin_name="checkstyle" name="Avoid Comparison" description="Should avoid ==" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_sub_characteristic_id.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_sub_characteristic_id.xml index a6677ee6b63..9c2569a1832 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_sub_characteristic_id.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_by_sub_characteristic_id.xml @@ -24,35 +24,35 @@ created_at="2013-11-20" updated_at="2013-11-22"/> <!-- Rule linked to a sub characteristic --> - <rules id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY" characteristic_id="2" default_characteristic_id="50" remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5d" remediation_offset="10h" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a sub characteristic --> - <rules id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="3" default_characteristic_id="50" remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5d" remediation_offset="10h" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a disabled sub characteristic -> should never be returned --> - <rules id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="READY" + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="READY" characteristic_id="11" default_characteristic_id="50" remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Removed rule linked to one enable sub characteristic --> - <rules id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="REMOVED" + <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="REMOVED" characteristic_id="3" default_characteristic_id="50" remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET" remediation_coeff="5d" default_remediation_coeff="5min" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a sub characteristic, but only default characteristic is linked --> - <rules id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY" + <rules tags="[null]" system_tags="[null]" id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="[null]" default_characteristic_id="3" remediation_function="[null]" default_remediation_function="LINEAR" remediation_coeff="[null]" default_remediation_coeff="5d" diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_enables_and_non_manual.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_enables_and_non_manual.xml index b29914ea915..38d6cc5ce02 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_enables_and_non_manual.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_enables_and_non_manual.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" + <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" characteristic_id="100" default_characteristic_id="101" remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET" @@ -8,7 +8,7 @@ remediation_offset="5min" default_remediation_offset="10h" effort_to_fix_description="squid.S115.effortToFix"/> - <rules id="2" plugin_rule_key="AvoidNull" plugin_name="squid" name="Avoid Null" description="Should avoid NULL" status="REMOVED" + <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]" characteristic_id="[null]" default_characteristic_id="[null]" remediation_function="[null]" default_remediation_function="[null]" @@ -16,7 +16,7 @@ remediation_offset="[null]" default_remediation_offset="[null]" effort_to_fix_description="[null]"/> - <rules id="3" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY" + <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]" 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/RuleDaoTest/select_parameters_by_rule_id.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_parameters_by_rule_id.xml index 3b21b8a8ae9..887fbbcf910 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_parameters_by_rule_id.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/select_parameters_by_rule_id.xml @@ -1,8 +1,8 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"/> <rules_parameters id="1" rule_id="1" name="myParameter" param_type="plop" default_value="plouf" description="My Parameter"/> - <rules id="2" plugin_rule_key="Unused" plugin_name="unused" name="Unused Rule" description="Not used" status="REMOVED"/> + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Unused" plugin_name="unused" name="Unused Rule" description="Not used" status="REMOVED"/> <rules_parameters id="2" rule_id="2" name="otherParam" param_type="plop" default_value="plouf" description="Other Parameter"/> </dataset> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/update-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/update-result.xml index 5c2ad7484e4..f42a13b2fb6 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/update-result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/update-result.xml @@ -1,6 +1,6 @@ <dataset> - <rules id="1" plugin_rule_key="NewRuleKey" plugin_name="plugin" name="new name" description="new description" status="DEPRECATED" + <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" cardinality="MULTIPLE" language="dart" created_at="2011-04-25 01:05:00" updated_at="2013-12-17" parent_id="3" note_data="My note" note_user_login="admin" note_created_at="2013-12-19" note_updated_at="2013-12-20" characteristic_id="100" default_characteristic_id="101" @@ -10,11 +10,11 @@ effort_to_fix_description="squid.S115.effortToFix" /> - <rules id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" plugin_config_key="Parent1" priority="2" cardinality="SINGLE" language="golo" created_at="1981-10-24 15:20:00" updated_at="[null]" parent_id="[null]" note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]"/> - <rules id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" plugin_config_key="Parent2" priority="2" cardinality="SINGLE" language="dart" created_at="1982-12-14 03:15:00" updated_at="[null]" parent_id="[null]" note_created_at="[null]" note_data="[null]" note_updated_at="[null]" note_user_login="[null]"/> diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/update.xml b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/update.xml index d7e11ca1d24..f7f20504f15 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/update.xml +++ b/sonar-server/src/test/resources/org/sonar/server/rule2/RuleDaoTest/update.xml @@ -1,12 +1,12 @@ <dataset> - <rules id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY" plugin_config_key="AvoidNull" priority="2" cardinality="SINGLE" language="golo" created_at="2011-04-25 01:05:00" parent_id="2"/> - <rules id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="Parent1" plugin_name="checkstyle" name="Parent Rule 1" description="Parent Rule 1" status="READY" plugin_config_key="Parent1" priority="2" cardinality="SINGLE" language="golo" created_at="1981-10-24 15:20:00" /> - <rules id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="Parent2" plugin_name="checkstyle" name="Parent Rule 2" description="Parent Rule 2" status="READY" plugin_config_key="Parent2" priority="2" cardinality="SINGLE" language="dart" created_at="1982-12-14 03:15:00" /> </dataset> diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml index 05fb8c17653..ab27ac400fd 100644 --- a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml +++ b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules.xml @@ -1,63 +1,63 @@ <dataset> <!-- Rule not linked to a requirement -> Nothing to do --> - <rules id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a disabled requirement -> Update rule to disable characteristic --> - <rules id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Removed rule linked to a disabled requirement -> Do nothing --> - <rules id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="REMOVED" + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="REMOVED" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement, with same value of debt -> Nothing to do --> - <rules id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="READY" + <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="READY" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" remediation_coeff="[null]" default_remediation_coeff="5min" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement, with different value of debt -> Update rule --> - <rules id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY" + <rules tags="[null]" system_tags="[null]" id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="[null]" default_characteristic_id="20" remediation_function="[null]" default_remediation_function="LINEAR" remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement on Constant per issue function (with a coefficient of 0d -> to be replaced by null), with different value of debt -> Update rule --> - <rules id="6" plugin_rule_key="HiddenFieldCheck" plugin_name="squid" name="HiddenFieldCheck" description="HiddenFieldCheck" status="READY" + <rules tags="[null]" system_tags="[null]" id="6" plugin_rule_key="HiddenFieldCheck" plugin_name="squid" name="HiddenFieldCheck" description="HiddenFieldCheck" status="READY" characteristic_id="[null]" default_characteristic_id="20" remediation_function="[null]" default_remediation_function="LINEAR" remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement on Linear function (with a coeeficient of 0min -> to be replaced by null), with different value of debt -> Update rule --> - <rules id="7" plugin_rule_key="ForLoopCounterChangedCheck" plugin_name="squid" name="ForLoopCounterChangedCheck" description="ForLoopCounterChangedCheck" status="READY" + <rules tags="[null]" system_tags="[null]" id="7" plugin_rule_key="ForLoopCounterChangedCheck" plugin_name="squid" name="ForLoopCounterChangedCheck" description="ForLoopCounterChangedCheck" status="READY" characteristic_id="[null]" default_characteristic_id="20" remediation_function="[null]" default_remediation_function="LINEAR" remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement on Linear with offset function (with a offset of 0h -> should be replaced by 0d), with different value of debt -> Update rule --> - <rules id="8" plugin_rule_key="ClassVariableVisibilityCheck" plugin_name="squid" name="ClassVariableVisibilityCheck" description="ClassVariableVisibilityCheck" status="READY" + <rules tags="[null]" system_tags="[null]" id="8" plugin_rule_key="ClassVariableVisibilityCheck" plugin_name="squid" name="ClassVariableVisibilityCheck" description="ClassVariableVisibilityCheck" status="READY" characteristic_id="[null]" default_characteristic_id="20" remediation_function="[null]" default_remediation_function="LINEAR" remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="[null" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement on Linear function (with a coefficient of 0d -> should keep 0d), with different value of debt -> Update rule --> - <rules id="9" plugin_rule_key="SwitchLastCaseIsDefaultCheck" plugin_name="squid" name="SwitchLastCaseIsDefaultCheck" description="SwitchLastCaseIsDefaultCheck" status="READY" + <rules tags="[null]" system_tags="[null]" id="9" plugin_rule_key="SwitchLastCaseIsDefaultCheck" plugin_name="squid" name="SwitchLastCaseIsDefaultCheck" description="SwitchLastCaseIsDefaultCheck" status="READY" characteristic_id="[null]" default_characteristic_id="20" remediation_function="[null]" default_remediation_function="LINEAR" remediation_coeff="[null]" default_remediation_coeff="5d" diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml index b7557ad1c88..6c9d260c2b9 100644 --- a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml +++ b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/copy_requirements_from_characteristics_to_rules_result.xml @@ -1,63 +1,63 @@ <dataset> <!-- Rule not linked to a requirement -> Nothing to do --> - <rules id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY" + <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="UselessImportCheck" plugin_name="squid" name="UselessImportCheck" description="Useless imports should be removed" status="READY" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to a disabled requirements -> Update rule to disable characteristic --> - <rules id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY" + <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="LeftCurlyBraceStartLineCheck" plugin_name="squid" name="LeftCurlyBraceStartLineCheck" description="Left curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="-1" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-03-13 19:10:03.0"/> <!-- Removed rule linked to a disabled requirement -> Do nothing --> - <rules id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="REMOVED" + <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="CallToFileDeleteOnExitMethod" plugin_name="squid" name="CallToFileDeleteOnExitMethod" description="CallToFileDeleteOnExitMethod" status="REMOVED" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement, with same value of debt -> Nothing to do --> - <rules id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="READY" + <rules tags="[null]" system_tags="[null]" id="4" plugin_rule_key="ObjectFinalizeOverridenCallsSuperFinalizeCheck" plugin_name="squid" name="ObjectFinalizeOverridenCallsSuperFinalizeCheck" description="super.finalize() should be called at the end of Object.finalize() implementations" status="READY" characteristic_id="[null]" default_characteristic_id="10" remediation_function="[null]" default_remediation_function="LINEAR_OFFSET" remediation_coeff="[null]" default_remediation_coeff="5min" remediation_offset="[null]" default_remediation_offset="10h" updated_at="2014-02-19"/> <!-- Rule linked to one enable requirement, with different value of debt -> Update rule --> - <rules id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY" + <rules tags="[null]" system_tags="[null]" id="5" plugin_rule_key="RightCurlyBraceStartLineCheck" plugin_name="squid" name="RightCurlyBraceStartLineCheck" description="Right curly braces should be located at the beginning of lines of code" status="READY" characteristic_id="10" default_characteristic_id="20" remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR" remediation_coeff="20min" default_remediation_coeff="5d" remediation_offset="30h" default_remediation_offset="[null]" updated_at="2014-03-13 19:10:03.0"/> <!-- Rule linked to one enable requirement on Constant per issue function (with a coefficient of 0d -> to be replaced by null), with different value of debt -> Update rule --> - <rules id="6" plugin_rule_key="HiddenFieldCheck" plugin_name="squid" name="HiddenFieldCheck" description="HiddenFieldCheck" status="READY" + <rules tags="[null]" system_tags="[null]" id="6" plugin_rule_key="HiddenFieldCheck" plugin_name="squid" name="HiddenFieldCheck" description="HiddenFieldCheck" status="READY" characteristic_id="10" default_characteristic_id="20" remediation_function="CONSTANT_ISSUE" default_remediation_function="LINEAR" remediation_coeff="[null]" default_remediation_coeff="5d" remediation_offset="15min" default_remediation_offset="[null]" updated_at="2014-03-13 19:10:03.0"/> <!-- Rule linked to one enable requirement on Linear function (with a coeeficient of 0min -> to be replaced by null), with different value of debt -> Update rule --> - <rules id="7" plugin_rule_key="ForLoopCounterChangedCheck" plugin_name="squid" name="ForLoopCounterChangedCheck" description="ForLoopCounterChangedCheck" status="READY" + <rules tags="[null]" system_tags="[null]" id="7" plugin_rule_key="ForLoopCounterChangedCheck" plugin_name="squid" name="ForLoopCounterChangedCheck" description="ForLoopCounterChangedCheck" status="READY" characteristic_id="10" default_characteristic_id="20" remediation_function="LINEAR" default_remediation_function="LINEAR" remediation_coeff="0min" default_remediation_coeff="5d" remediation_offset="[null]" default_remediation_offset="[null]" updated_at="2014-03-13 19:10:03.0"/> <!-- Rule linked to one enable requirement on Linear with offset function (with a offset of 0h -> should keep 0h), with different value of debt -> Update rule --> - <rules id="8" plugin_rule_key="ClassVariableVisibilityCheck" plugin_name="squid" name="ClassVariableVisibilityCheck" description="ClassVariableVisibilityCheck" status="READY" + <rules tags="[null]" system_tags="[null]" id="8" plugin_rule_key="ClassVariableVisibilityCheck" plugin_name="squid" name="ClassVariableVisibilityCheck" description="ClassVariableVisibilityCheck" status="READY" characteristic_id="10" default_characteristic_id="20" remediation_function="LINEAR_OFFSET" default_remediation_function="LINEAR" remediation_coeff="5d" default_remediation_coeff="5d" remediation_offset="0h" default_remediation_offset="[null" updated_at="2014-03-13 19:10:03.0"/> <!-- Rule linked to one enable requirement on Linear function (with a coefficient of 0d -> should keep 0d), with different value of debt -> Update rule --> - <rules id="9" plugin_rule_key="SwitchLastCaseIsDefaultCheck" plugin_name="squid" name="SwitchLastCaseIsDefaultCheck" description="SwitchLastCaseIsDefaultCheck" status="READY" + <rules tags="[null]" system_tags="[null]" id="9" plugin_rule_key="SwitchLastCaseIsDefaultCheck" plugin_name="squid" name="SwitchLastCaseIsDefaultCheck" description="SwitchLastCaseIsDefaultCheck" status="READY" characteristic_id="10" default_characteristic_id="20" remediation_function="LINEAR" default_remediation_function="LINEAR" remediation_coeff="0d" default_remediation_coeff="5d" diff --git a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql index da87904a95c..7b4b9075ddc 100644 --- a/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql +++ b/sonar-server/src/test/resources/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest/schema.sql @@ -13,6 +13,8 @@ CREATE TABLE "RULES" ( "DEFAULT_REMEDIATION_COEFF" VARCHAR(20), "REMEDIATION_OFFSET" VARCHAR(20), "DEFAULT_REMEDIATION_OFFSET" VARCHAR(20), + "TAGS" VARCHAR(4000), + "SYSTEM_TAGS" VARCHAR(4000), "UPDATED_AT" TIMESTAMP ); |