From: Simon Brandhof Date: Wed, 7 May 2014 13:08:06 +0000 (+0200) Subject: SONAR-5007 add columns RULES.TAGS and SYSTEM_TAGS X-Git-Tag: 4.4-RC1~1171 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=571284bed52c0b263fd5ce2e17de3a1466fc7e9e;p=sonarqube.git SONAR-5007 add columns RULES.TAGS and SYSTEM_TAGS --- 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 @@ - - 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 @@ - - 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 @@ - - 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"/> - - @@ -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]"/> - \ No newline at end of file + 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 @@ - - \ No newline at end of file + 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 @@ - - - - - - - - - - { 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 { 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" @@ -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) @@ -111,7 +113,7 @@ #{severity}, #{cardinality}, #{language}, #{parentId}, #{subCharacteristicId}, #{defaultSubCharacteristicId}, #{remediationFunction}, #{defaultRemediationFunction}, #{remediationCoefficient}, #{defaultRemediationCoefficient}, #{remediationOffset}, #{defaultRemediationOffset}, - #{effortToFixDescription}, + #{effortToFixDescription}, #{tagsField}, #{systemTagsField}, #{createdAt}, #{updatedAt}) @@ -121,7 +123,7 @@ #{severity}, #{cardinality}, #{language}, #{parentId}, #{subCharacteristicId}, #{defaultSubCharacteristicId}, #{remediationFunction}, #{defaultRemediationFunction}, #{remediationCoefficient}, #{defaultRemediationCoefficient}, #{remediationOffset}, #{defaultRemediationOffset}, - #{effortToFixDescription}, + #{effortToFixDescription}, #{tagsField}, #{systemTagsField}, #{createdAt}, #{updatedAt}) 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 @@ - - + + 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 @@ - 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 @@ - 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 @@ - - + + - - + + - \ No newline at end of file + 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 @@ - - - - - \ No newline at end of file + 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 @@ - - - - - \ No newline at end of file + 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 @@ - - - - - - + + - \ No newline at end of file + 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 @@ - - + + 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 @@ - + 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 @@ - - + + - \ No newline at end of file + 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 @@ - - + + - \ No newline at end of file + 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"/> - - - - - - - - - + - + 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 @@ - - - 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 @@ - - - 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 @@ - 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 @@ - - - - - \ No newline at end of file + 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 @@ - @@ -17,4 +17,4 @@ - \ No newline at end of file + 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 @@ - @@ -16,4 +16,4 @@ - \ No newline at end of file + 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 @@ - - - - \ No newline at end of file + 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 @@ - - - @@ -18,4 +18,4 @@ - \ No newline at end of file + 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 @@ - - - - \ No newline at end of file + 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 @@ - - @@ -14,4 +14,4 @@ - \ No newline at end of file + 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 @@ - - \ No newline at end of file + 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 @@ - - - \ No newline at end of file + 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 { 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 { } } - - 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, 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 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 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 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 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 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 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 keys = dao.keysOfRowsUpdatedAfter(DateUtils.parseDate("2014-05-17").getTime()); -// assertThat(keys).hasSize(1); -// assertThat(Iterables.getFirst(keys, null).rule()).isEqualTo("R2"); -// } -// -// private List idsFromRuleDtos(List ruleDtos){ -// return newArrayList(Iterables.transform(ruleDtos, new Function() { -// @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 @@ - 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 @@ - 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 @@ - - 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 @@ - - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - - 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 @@ - - 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 @@ - 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 @@ - 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 @@ - - 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 @@ - 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 @@ - - - - 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 @@ - - 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 @@ - - @@ -11,7 +11,7 @@ - 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 @@ - - - - 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 @@ - - 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 @@ - - - - - - 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 @@ - - - - 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 @@ - - 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 @@ - - 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 @@ - - - - - - - - - - - - - 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 @@ - - 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 @@ - - - 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 @@ - - 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 @@ - - 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 @@ - 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 @@ - 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 @@ - - 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 @@ - 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 @@ - - - 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 @@ - - 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 @@ - - - - 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 @@ - - - - - - - - - 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 @@ - - 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 @@ - - - - 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 @@ - - 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 @@ - - 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 @@ - - - - - - - - - - - - - - - - - - + + - \ No newline at end of file + 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 @@ - - + + 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 @@ - + 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 @@ - - + + - \ No newline at end of file + 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 @@ - - + + - \ No newline at end of file + 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"/> - - - - - - - - - + - + 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 @@ - - - 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 @@ - - - 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 @@ - - - - - - - - - - - - - - - - - -