From ae91b7834807c0e0e862970eb1f1675f79f62bbd Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sat, 24 May 2014 14:40:57 +0200 Subject: [PATCH] SONAR-5007 move package org.sonar.server.rule2 to rule --- .../java/org/sonar/core/rule/RuleDao.java | 191 +----------- .../org/sonar/core/rule/RuleParamDto.java | 4 - .../java/org/sonar/core/rule/RuleDaoTest.java | 292 ------------------ .../java/org/sonar/server/db/DbClient.java | 2 +- .../server/platform/ServerComponents.java | 29 +- .../QProfileActiveRuleOperations.java | 2 +- .../server/qualityprofile/QProfileBackup.java | 2 +- .../persistence/ActiveRuleDao.java | 2 +- .../ws/BulkRuleActivationActions.java | 2 +- .../rule/DeprecatedRulesDefinition.java | 5 +- .../server/{rule2 => rule}/RegisterRules.java | 3 +- .../sonar/server/rule/RubyRuleService.java | 16 +- .../main/java/org/sonar/server/rule/Rule.java | 76 ++++- .../server/rule/RuleDefinitionsLoader.java | 3 +- .../server/{rule2 => rule}/RuleParam.java | 2 +- .../sonar/server/rule/RuleRepositories.java | 3 +- .../server/{rule2 => rule}/RuleService.java | 12 +- .../server/{rule2 => rule}/RuleTagHelper.java | 4 +- .../persistence => rule/db}/RuleDao.java | 2 +- .../{rule2 => rule/db}/package-info.java | 3 +- .../server/{rule2 => rule}/index/RuleDoc.java | 57 ++-- .../{rule2 => rule}/index/RuleIndex.java | 4 +- .../{rule2 => rule}/index/RuleNormalizer.java | 14 +- .../{rule2 => rule}/index/RuleQuery.java | 4 +- .../{rule2 => rule}/index/RuleResult.java | 4 +- .../{rule2 => rule}/index/package-info.java | 3 +- .../org/sonar/server/rule/package-info.java | 3 +- .../ws/ActiveRuleCompleter.java | 6 +- .../server/{rule2 => rule}/ws/AppAction.java | 2 +- .../{rule2 => rule}/ws/RuleMapping.java | 8 +- .../{rule2 => rule}/ws/RulesWebService.java | 2 +- .../{rule2 => rule}/ws/SearchAction.java | 14 +- .../{rule2 => rule}/ws/SetNoteAction.java | 4 +- .../{rule2 => rule}/ws/SetTagsAction.java | 4 +- .../server/{rule2 => rule}/ws/ShowAction.java | 6 +- .../server/{rule2 => rule}/ws/TagsAction.java | 4 +- .../{rule2 => rule}/ws/package-info.java | 3 +- .../java/org/sonar/server/rule2/Rule.java | 96 ------ .../rule2/persistence/package-info.java | 23 -- ...equirementsFromCharacteristicsToRules.java | 2 +- .../{rule2 => rule}/ws/example-search.json | 0 .../{rule2 => rule}/ws/example-show.json | 0 .../{rule2 => rule}/ws/example-tags.json | 0 .../org/sonar/server/db/DbClientTest.java | 2 +- .../server/debt/DebtModelBackupTest.java | 2 +- .../server/debt/DebtModelOperationsTest.java | 2 +- .../qualityprofile/QProfileBackupTest.java | 2 +- .../index/ActiveRuleIndexMediumTest.java | 2 +- .../persistence/ActiveRuleDaoTest.java | 4 +- .../RegisterRulesMediumTest.java | 10 +- .../{rule2 => rule}/RegisterRulesTest.java | 6 +- .../server/rule/RubyRuleServiceTest.java | 1 - .../{rule2 => rule}/RuleDataMediumTest.java | 16 +- .../sonar/server/rule/RuleOperationsTest.java | 10 +- .../server/rule/RuleRepositoriesTest.java | 10 +- .../RuleServiceMediumTest.java | 8 +- .../{rule2 => rule}/RuleTagHelperTest.java | 2 +- .../rule/RulesDefinitionLoaderTest.java | 10 +- .../persistence => rule/db}/RuleDaoTest.java | 2 +- .../index/RuleIndexMediumTest.java | 12 +- .../{rule2 => rule}/ws/AppActionTest.java | 8 +- .../{rule2 => rule}/ws/RuleMappingTest.java | 4 +- .../ws/RulesWebServiceTest.java | 6 +- .../server/search/IndexClientMediumTest.java | 4 +- ...rementsFromCharacteristicsToRulesTest.java | 2 +- .../db}/RuleDaoTest/empty.xml | 0 .../db}/RuleDaoTest/insert-result.xml | 0 .../db}/RuleDaoTest/insert_all-result.xml | 0 .../RuleDaoTest/insert_parameter-result.xml | 0 .../db}/RuleDaoTest/insert_parameter.xml | 0 .../db}/RuleDaoTest/selectAll.xml | 0 .../db}/RuleDaoTest/selectById.xml | 0 .../db}/RuleDaoTest/selectNonManual.xml | 0 .../db}/RuleDaoTest/selectParameters.xml | 0 .../db}/RuleDaoTest/select_by_name.xml | 0 .../db}/RuleDaoTest/select_by_rule_key.xml | 0 .../select_by_sub_characteristic_id.xml | 0 .../select_enables_and_non_manual.xml | 0 .../select_parameters_by_rule_id.xml | 0 .../select_parameters_by_rule_ids.xml | 0 .../db}/RuleDaoTest/update-result.xml | 0 .../db}/RuleDaoTest/update.xml | 0 .../RuleDaoTest/update_parameter-result.xml | 0 .../db}/RuleDaoTest/update_parameter.xml | 0 .../{rule2 => rule}/ws/AppActionTest/app.json | 0 .../RulesWebServiceTest/filter_by_tags.json | 0 .../get_note_as_markdown_and_html.json | 0 .../ws/RulesWebServiceTest/get_tags.json | 0 .../RulesWebServiceTest/search_2_rules.json | 0 .../search_active_rules.json | 0 .../search_active_rules_params.json | 0 .../RulesWebServiceTest/search_debt_rule.json | 0 .../RulesWebServiceTest/search_no_rules.json | 0 .../search_profile_active_rules.json | 0 .../RulesWebServiceTest/show_rule_active.json | 0 .../show_rule_no_active.json | 0 96 files changed, 251 insertions(+), 792 deletions(-) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/RegisterRules.java (99%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/RuleParam.java (97%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/RuleService.java (93%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/RuleTagHelper.java (92%) rename sonar-server/src/main/java/org/sonar/server/{rule2/persistence => rule/db}/RuleDao.java (99%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule/db}/package-info.java (93%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/index/RuleDoc.java (68%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/index/RuleIndex.java (99%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/index/RuleNormalizer.java (95%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/index/RuleQuery.java (98%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/index/RuleResult.java (94%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/index/package-info.java (93%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/ws/ActiveRuleCompleter.java (96%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/ws/AppAction.java (99%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/ws/RuleMapping.java (96%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/ws/RulesWebService.java (98%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/ws/SearchAction.java (96%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/ws/SetNoteAction.java (96%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/ws/SetTagsAction.java (96%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/ws/ShowAction.java (96%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/ws/TagsAction.java (96%) rename sonar-server/src/main/java/org/sonar/server/{rule2 => rule}/ws/package-info.java (93%) delete mode 100644 sonar-server/src/main/java/org/sonar/server/rule2/Rule.java delete mode 100644 sonar-server/src/main/java/org/sonar/server/rule2/persistence/package-info.java rename sonar-server/src/main/resources/org/sonar/server/{rule2 => rule}/ws/example-search.json (100%) rename sonar-server/src/main/resources/org/sonar/server/{rule2 => rule}/ws/example-show.json (100%) rename sonar-server/src/main/resources/org/sonar/server/{rule2 => rule}/ws/example-tags.json (100%) rename sonar-server/src/test/java/org/sonar/server/{rule2 => rule}/RegisterRulesMediumTest.java (94%) rename sonar-server/src/test/java/org/sonar/server/{rule2 => rule}/RegisterRulesTest.java (98%) rename sonar-server/src/test/java/org/sonar/server/{rule2 => rule}/RuleDataMediumTest.java (95%) rename sonar-server/src/test/java/org/sonar/server/{rule2 => rule}/RuleServiceMediumTest.java (98%) rename sonar-server/src/test/java/org/sonar/server/{rule2 => rule}/RuleTagHelperTest.java (98%) rename sonar-server/src/test/java/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest.java (99%) rename sonar-server/src/test/java/org/sonar/server/{rule2 => rule}/index/RuleIndexMediumTest.java (98%) rename sonar-server/src/test/java/org/sonar/server/{rule2 => rule}/ws/AppActionTest.java (96%) rename sonar-server/src/test/java/org/sonar/server/{rule2 => rule}/ws/RuleMappingTest.java (98%) rename sonar-server/src/test/java/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest.java (99%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/empty.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/insert-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/insert_all-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/insert_parameter-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/insert_parameter.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/selectAll.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/selectById.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/selectNonManual.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/selectParameters.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/select_by_name.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/select_by_rule_key.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/select_by_sub_characteristic_id.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/select_enables_and_non_manual.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/select_parameters_by_rule_id.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/select_parameters_by_rule_ids.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/update-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/update.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/update_parameter-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2/persistence => rule/db}/RuleDaoTest/update_parameter.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/AppActionTest/app.json (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest/filter_by_tags.json (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest/get_note_as_markdown_and_html.json (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest/get_tags.json (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest/search_2_rules.json (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest/search_active_rules.json (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest/search_active_rules_params.json (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest/search_debt_rule.json (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest/search_no_rules.json (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest/search_profile_active_rules.json (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest/show_rule_active.json (100%) rename sonar-server/src/test/resources/org/sonar/server/{rule2 => rule}/ws/RulesWebServiceTest/show_rule_no_active.json (100%) diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleDao.java b/sonar-core/src/main/java/org/sonar/core/rule/RuleDao.java index b46bde45fe3..dcc8cba0a11 100644 --- a/sonar-core/src/main/java/org/sonar/core/rule/RuleDao.java +++ b/sonar-core/src/main/java/org/sonar/core/rule/RuleDao.java @@ -19,19 +19,17 @@ */ package org.sonar.core.rule; -import com.google.common.collect.Lists; import org.apache.ibatis.session.SqlSession; import org.sonar.api.BatchComponent; import org.sonar.api.ServerComponent; -import org.sonar.api.rule.RuleKey; import org.sonar.core.persistence.MyBatis; -import javax.annotation.CheckForNull; -import java.util.Collection; import java.util.List; -import static com.google.common.collect.Lists.newArrayList; - +/** + * @deprecated in 4.4 moved to org.sonar.server.rule.db.RuleDao. + */ +@Deprecated public class RuleDao implements BatchComponent, ServerComponent { private MyBatis mybatis; @@ -40,19 +38,6 @@ public class RuleDao implements BatchComponent, ServerComponent { this.mybatis = mybatis; } - public List selectAll() { - SqlSession session = mybatis.openSession(); - try { - return selectAll(session); - } finally { - MyBatis.closeQuietly(session); - } - } - - public List selectAll(SqlSession session) { - return getMapper(session).selectAll(); - } - public List selectEnablesAndNonManual() { SqlSession session = mybatis.openSession(); try { @@ -66,110 +51,6 @@ public class RuleDao implements BatchComponent, ServerComponent { return getMapper(session).selectEnablesAndNonManual(); } - public List selectNonManual(SqlSession session) { - return getMapper(session).selectNonManual(); - } - - public List selectBySubCharacteristicId(Integer characteristicOrSubCharacteristicId) { - SqlSession session = mybatis.openSession(); - try { - return selectBySubCharacteristicId(characteristicOrSubCharacteristicId, session); - } finally { - MyBatis.closeQuietly(session); - } - } - - /** - * Return all rules (even the REMOVED ones) linked on to a sub characteristic - */ - public List selectBySubCharacteristicId(Integer subCharacteristicId, SqlSession session) { - return getMapper(session).selectBySubCharacteristicId(subCharacteristicId); - } - - @CheckForNull - public RuleDto selectById(Integer id, SqlSession session) { - return getMapper(session).selectById(id); - } - - @CheckForNull - public RuleDto selectById(Integer id) { - SqlSession session = mybatis.openSession(); - try { - return selectById(id, session); - } finally { - MyBatis.closeQuietly(session); - } - } - - @CheckForNull - public RuleDto selectByKey(RuleKey ruleKey, SqlSession session) { - return getMapper(session).selectByKey(ruleKey); - } - - @CheckForNull - public RuleDto selectByKey(RuleKey ruleKey) { - SqlSession session = mybatis.openSession(); - try { - return selectByKey(ruleKey, session); - } finally { - MyBatis.closeQuietly(session); - } - } - - @CheckForNull - public RuleDto selectByName(String name) { - SqlSession session = mybatis.openSession(); - try { - return getMapper(session).selectByName(name); - } finally { - MyBatis.closeQuietly(session); - } - } - - public void update(RuleDto rule, SqlSession session) { - getMapper(session).update(rule); - } - - public void update(RuleDto rule) { - SqlSession session = mybatis.openSession(); - try { - update(rule, session); - session.commit(); - } finally { - MyBatis.closeQuietly(session); - } - } - - public void insert(RuleDto ruleToInsert, SqlSession session) { - getMapper(session).insert(ruleToInsert); - } - - public void insert(RuleDto ruleToInsert) { - SqlSession session = mybatis.openSession(); - try { - insert(ruleToInsert, session); - session.commit(); - } finally { - MyBatis.closeQuietly(session); - } - } - - public void insert(Collection rules) { - SqlSession session = mybatis.openBatchSession(); - try { - for (RuleDto rule : rules) { - getMapper(session).batchInsert(rule); - } - session.commit(); - } finally { - MyBatis.closeQuietly(session); - } - } - - //****************************** - // Methods for Rule Parameters - //****************************** - public List selectParameters() { SqlSession session = mybatis.openSession(); try { @@ -183,70 +64,6 @@ public class RuleDao implements BatchComponent, ServerComponent { return getMapper(session).selectAllParams(); } - public List selectParametersByRuleId(Integer ruleId) { - SqlSession session = mybatis.openSession(); - try { - return selectParametersByRuleId(ruleId, session); - } finally { - MyBatis.closeQuietly(session); - } - } - - public List selectParametersByRuleId(Integer ruleId, SqlSession session) { - return selectParametersByRuleIds(newArrayList(ruleId)); - } - - public List selectParametersByRuleIds(List ruleIds) { - SqlSession session = mybatis.openSession(); - try { - return selectParametersByRuleIds(ruleIds, session); - } finally { - MyBatis.closeQuietly(session); - } - } - - public List selectParametersByRuleIds(List ruleIds, SqlSession session) { - List dtos = newArrayList(); - List> partitionList = Lists.partition(newArrayList(ruleIds), 1000); - for (List partition : partitionList) { - dtos.addAll(getMapper(session).selectParamsByRuleIds(partition)); - } - return dtos; - } - - public void insert(RuleParamDto param, SqlSession session) { - getMapper(session).insertParameter(param); - } - - public void insert(RuleParamDto param) { - SqlSession session = mybatis.openSession(); - try { - insert(param, session); - session.commit(); - } finally { - MyBatis.closeQuietly(session); - } - } - - public void update(RuleParamDto param, SqlSession session) { - getMapper(session).updateParameter(param); - } - - public void update(RuleParamDto param) { - SqlSession session = mybatis.openSession(); - try { - update(param, session); - session.commit(); - } finally { - MyBatis.closeQuietly(session); - } - } - - @CheckForNull - public RuleParamDto selectParamByRuleAndKey(Integer ruleId, String key, SqlSession session) { - return getMapper(session).selectParamByRuleAndKey(ruleId, key); - } - private RuleMapper getMapper(SqlSession session) { return session.getMapper(RuleMapper.class); } diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleParamDto.java b/sonar-core/src/main/java/org/sonar/core/rule/RuleParamDto.java index 1bd0d912aac..7d1436974bc 100644 --- a/sonar-core/src/main/java/org/sonar/core/rule/RuleParamDto.java +++ b/sonar-core/src/main/java/org/sonar/core/rule/RuleParamDto.java @@ -32,10 +32,6 @@ public class RuleParamDto { private String defaultValue; private String description; - public RuleParamDto() { - - } - public Integer getId() { return id; } diff --git a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java b/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java index 1cafd982568..510de0c3fa7 100644 --- a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java @@ -19,24 +19,13 @@ */ package org.sonar.core.rule; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import org.apache.ibatis.session.SqlSession; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import org.sonar.api.rule.RuleKey; -import org.sonar.api.rule.Severity; import org.sonar.api.rules.Rule; -import org.sonar.api.server.debt.DebtRemediationFunction; -import org.sonar.api.utils.DateUtils; -import org.sonar.check.Cardinality; import org.sonar.core.persistence.AbstractDaoTestCase; import java.util.List; -import static com.google.common.collect.Lists.newArrayList; import static org.fest.assertions.Assertions.assertThat; public class RuleDaoTest extends AbstractDaoTestCase { @@ -48,31 +37,6 @@ public class RuleDaoTest extends AbstractDaoTestCase { 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"); @@ -97,198 +61,6 @@ public class RuleDaoTest extends AbstractDaoTestCase { 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"); - SqlSession session = getMyBatis().openSession(); - 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 - @Ignore - //TODO The date is set by BaseDao. fails because of date. Fixed in next merge from @Simon - 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(DebtRemediationFunction.Type.LINEAR.toString()) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.toString()) - .setRemediationCoefficient("1h") - .setDefaultRemediationCoefficient("5d") - .setRemediationOffset("5min") - .setDefaultRemediationOffset("10h") - .setEffortToFixDescription("squid.S115.effortToFix"); - - dao.update(ruleToUpdate); - - checkTables("update", "rules"); - } - - @Test - @Ignore - //TODO The date is set by BaseDao. fails because of date. Fixed in next merge from @Simon - 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(DebtRemediationFunction.Type.LINEAR.toString()) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.toString()) - .setRemediationCoefficient("1h") - .setDefaultRemediationCoefficient("5d") - .setRemediationOffset("5min") - .setDefaultRemediationOffset("10h") - .setEffortToFixDescription("squid.S115.effortToFix"); - - dao.insert(ruleToInsert); - - checkTables("insert", "rules"); - } - - @Test - @Ignore - //TODO The date is set by BaseDao. fails because of date. Fixed in next merge from @Simon - 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(DebtRemediationFunction.Type.LINEAR.toString()) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.toString()) - .setRemediationCoefficient("1h") - .setDefaultRemediationCoefficient("5d") - .setRemediationOffset("5min") - .setDefaultRemediationOffset("10h") - .setEffortToFixDescription("squid.S115.effortToFix"); - - 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(DebtRemediationFunction.Type.LINEAR_OFFSET.toString()) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR.toString()) - .setRemediationCoefficient("5d") - .setDefaultRemediationCoefficient("1h") - .setRemediationOffset("10h") - .setDefaultRemediationOffset("5min") - .setEffortToFixDescription("squid.S115.effortToFix2"); - - dao.insert(ImmutableList.of(ruleToInsert1, ruleToInsert2)); - - checkTables("insert_all", "rules"); - } - @Test public void select_parameters() throws Exception { setupData("selectParameters"); @@ -302,68 +74,4 @@ public class RuleDaoTest extends AbstractDaoTestCase { 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"); - } - - 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/main/java/org/sonar/server/db/DbClient.java b/sonar-server/src/main/java/org/sonar/server/db/DbClient.java index af06f70bb91..4d140874ef6 100644 --- a/sonar-server/src/main/java/org/sonar/server/db/DbClient.java +++ b/sonar-server/src/main/java/org/sonar/server/db/DbClient.java @@ -33,7 +33,7 @@ import org.sonar.core.template.LoadedTemplateDao; import org.sonar.server.component.persistence.ComponentDao; import org.sonar.server.measure.persistence.MeasureDao; import org.sonar.server.qualityprofile.persistence.ActiveRuleDao; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import java.util.Map; diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java index 673f5d11c47..6bdb234aa20 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java @@ -196,18 +196,19 @@ import org.sonar.server.rule.RubyRuleService; import org.sonar.server.rule.RuleDefinitionsLoader; import org.sonar.server.rule.RuleOperations; import org.sonar.server.rule.RuleRepositories; -import org.sonar.server.rule2.RegisterRules; -import org.sonar.server.rule2.RuleService; -import org.sonar.server.rule2.index.RuleIndex; -import org.sonar.server.rule2.index.RuleNormalizer; -import org.sonar.server.rule2.persistence.RuleDao; -import org.sonar.server.rule2.ws.ActiveRuleCompleter; -import org.sonar.server.rule2.ws.RuleMapping; -import org.sonar.server.rule2.ws.RulesWebService; -import org.sonar.server.rule2.ws.SearchAction; -import org.sonar.server.rule2.ws.SetNoteAction; -import org.sonar.server.rule2.ws.SetTagsAction; -import org.sonar.server.rule2.ws.TagsAction; +import org.sonar.server.rule.ws.AppAction; +import org.sonar.server.rule.RegisterRules; +import org.sonar.server.rule.RuleService; +import org.sonar.server.rule.index.RuleIndex; +import org.sonar.server.rule.index.RuleNormalizer; +import org.sonar.server.rule.db.RuleDao; +import org.sonar.server.rule.ws.ActiveRuleCompleter; +import org.sonar.server.rule.ws.RuleMapping; +import org.sonar.server.rule.ws.RulesWebService; +import org.sonar.server.rule.ws.SearchAction; +import org.sonar.server.rule.ws.SetNoteAction; +import org.sonar.server.rule.ws.SetTagsAction; +import org.sonar.server.rule.ws.TagsAction; import org.sonar.server.search.IndexClient; import org.sonar.server.search.IndexQueue; import org.sonar.server.search.IndexQueueWorker; @@ -435,13 +436,13 @@ class ServerComponents { pico.addSingleton(RuleService.class); pico.addSingleton(RulesWebService.class); pico.addSingleton(SearchAction.class); - pico.addSingleton(org.sonar.server.rule2.ws.ShowAction.class); + pico.addSingleton(org.sonar.server.rule.ws.ShowAction.class); pico.addSingleton(TagsAction.class); pico.addSingleton(SetTagsAction.class); pico.addSingleton(SetNoteAction.class); pico.addSingleton(RuleMapping.class); pico.addSingleton(ActiveRuleCompleter.class); - pico.addSingleton(org.sonar.server.rule2.ws.AppAction.class); + pico.addSingleton(AppAction.class); // measure pico.addComponent(MeasuresDao.class, false); diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java index 81cdc65bc3e..eb4f7f80196 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java @@ -34,7 +34,7 @@ import org.sonar.core.rule.RuleDto; import org.sonar.core.rule.RuleParamDto; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.qualityprofile.persistence.ActiveRuleDao; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import org.sonar.server.util.TypeValidations; import javax.annotation.CheckForNull; diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackup.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackup.java index 32cf6846c15..3141b289407 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackup.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackup.java @@ -41,7 +41,7 @@ import org.sonar.core.rule.RuleDto; import org.sonar.jpa.session.DatabaseSessionFactory; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.NotFoundException; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import org.sonar.server.user.UserSession; import java.io.StringReader; diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java index 071eff56704..4dc94127b48 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDao.java @@ -36,7 +36,7 @@ import org.sonar.core.qualityprofile.db.QualityProfileKey; import org.sonar.core.rule.RuleDto; import org.sonar.server.db.BaseDao; import org.sonar.server.qualityprofile.QProfile; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import org.sonar.server.search.IndexDefinition; import org.sonar.server.search.action.IndexAction; import org.sonar.server.search.action.KeyIndexAction; diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java index d012b129af3..f3744c49dc9 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BulkRuleActivationActions.java @@ -27,7 +27,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualityprofile.ActiveRuleService; import org.sonar.server.qualityprofile.BulkRuleActivation; -import org.sonar.server.rule2.ws.SearchAction; +import org.sonar.server.rule.ws.SearchAction; public class BulkRuleActivationActions implements ServerComponent { diff --git a/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinition.java b/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinition.java index bedb756b036..607dd9dce0d 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinition.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinition.java @@ -41,7 +41,6 @@ import org.sonar.server.debt.DebtRulesXMLImporter; import javax.annotation.CheckForNull; import javax.annotation.Nullable; - import java.io.Reader; import java.util.Collection; import java.util.List; @@ -50,9 +49,7 @@ import static com.google.common.collect.Lists.newArrayList; import static org.sonar.server.debt.DebtModelXMLExporter.RuleDebt; /** - * Inject deprecated RuleRepository into RuleDefinitions for backward-compatibility. - * - * @since 4.2 + * Inject deprecated RuleRepository into {@link org.sonar.api.server.rule.RulesDefinition} for backward-compatibility. */ public class DeprecatedRulesDefinition implements RulesDefinition { diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/RegisterRules.java b/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java similarity index 99% rename from sonar-server/src/main/java/org/sonar/server/rule2/RegisterRules.java rename to sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java index 2e2200d17d0..facd752e6f4 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/RegisterRules.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java @@ -17,7 +17,7 @@ * 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; +package org.sonar.server.rule; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -43,7 +43,6 @@ import org.sonar.core.technicaldebt.db.CharacteristicDao; import org.sonar.core.technicaldebt.db.CharacteristicDto; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.ProfilesManager; -import org.sonar.server.rule.RuleDefinitionsLoader; import org.sonar.server.search.IndexDefinition; import org.sonar.server.search.action.EmbeddedIndexAction; import org.sonar.server.search.action.IndexAction; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java b/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java index b25a5c342a1..dbc26d8ff8b 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RubyRuleService.java @@ -26,8 +26,8 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.server.paging.PagedResult; import org.sonar.server.paging.PagingResult; -import org.sonar.server.rule2.RuleService; -import org.sonar.server.rule2.index.RuleResult; +import org.sonar.server.rule.index.RuleQuery; +import org.sonar.server.rule.index.RuleResult; import org.sonar.server.search.QueryOptions; import org.sonar.server.util.RubyUtils; @@ -36,7 +36,10 @@ import java.util.Map; /** * Used through ruby code 
Internal.rules
+ * + * @deprecated in 4.4 because Ruby on Rails is deprecated too ! */ +@Deprecated public class RubyRuleService implements ServerComponent, Startable { private final RuleService service; @@ -49,15 +52,15 @@ public class RubyRuleService implements ServerComponent, Startable { * Used in issues_controller.rb */ @CheckForNull - public org.sonar.server.rule2.Rule findByKey(String ruleKey) { + public org.sonar.server.rule.Rule findByKey(String ruleKey) { return service.getByKey(RuleKey.parse(ruleKey)); } /** * Used in SQALE */ - public PagedResult find(Map params) { - org.sonar.server.rule2.index.RuleQuery query = service.newRuleQuery(); + public PagedResult find(Map params) { + RuleQuery query = service.newRuleQuery(); query.setQueryText(Strings.emptyToNull((String) params.get("searchQuery"))); query.setKey(Strings.emptyToNull((String) params.get("key"))); query.setLanguages(RubyUtils.toStrings(params.get("languages"))); @@ -70,11 +73,12 @@ public class RubyRuleService implements ServerComponent, Startable { QueryOptions options = new QueryOptions(); RuleResult rules = service.search(query, options); - return new PagedResult(rules.getRules(), PagingResult.create(options.getLimit(), 1, rules.getTotal())); + return new PagedResult(rules.getRules(), PagingResult.create(options.getLimit(), 1, rules.getTotal())); } // sqale public void updateRule(Map params) { + //TODO // rules.updateRule(new RuleOperations.RuleChange() // .setRuleKey(RuleKey.parse((String) params.get("ruleKey"))) // .setDebtCharacteristicKey(Strings.emptyToNull((String) params.get("debtCharacteristicKey"))) diff --git a/sonar-server/src/main/java/org/sonar/server/rule/Rule.java b/sonar-server/src/main/java/org/sonar/server/rule/Rule.java index d0b57e0f9b1..5df04fe8a56 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/Rule.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/Rule.java @@ -19,10 +19,80 @@ */ package org.sonar.server.rule; +import org.sonar.api.rule.RuleKey; +import org.sonar.api.rule.RuleStatus; +import org.sonar.api.server.debt.DebtRemediationFunction; + +import javax.annotation.CheckForNull; +import java.util.Date; +import java.util.List; + /** - * @deprecated to be dropped in 4.4 + * @since 4.4 */ -@Deprecated -public class Rule { +public interface Rule { + public static final String MANUAL_REPOSITORY_KEY = "manual"; + + RuleKey key(); + + String language(); + + String name(); + + String htmlDescription(); + + /** + * Default severity when activated on a Quality profile + * + * @see org.sonar.api.rule.Severity + */ + String severity(); + + /** + * @see org.sonar.api.rule.RuleStatus + */ + RuleStatus status(); + + boolean template(); + + /** + * Tags that can be customized by administrators + */ + List tags(); + + /** + * Read-only tags defined by plugins + */ + List systemTags(); + + List params(); + + @CheckForNull + String debtCharacteristicKey(); + + @CheckForNull + String debtSubCharacteristicKey(); + + @CheckForNull + DebtRemediationFunction debtRemediationFunction(); + + Date createdAt(); + + Date updatedAt(); + + @CheckForNull + String internalKey(); + + @CheckForNull + String markdownNote(); + + @CheckForNull + String noteLogin(); + + @CheckForNull + Date noteCreatedAt(); + + @CheckForNull + Date noteUpdatedAt(); } diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java index 399286db5bc..ac4491e18ae 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java @@ -23,7 +23,8 @@ import org.sonar.api.ServerComponent; import org.sonar.api.server.rule.RulesDefinition; /** - * Loads all instances of RuleDefinitions and initializes RuleRepositories. Used at server startup. + * Loads all instances of {@link org.sonar.api.server.rule.RulesDefinition} + * and initializes {@link org.sonar.server.rule.RuleRepositories}. Used at server startup. */ public class RuleDefinitionsLoader implements ServerComponent { private final RulesDefinition[] definitions; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/RuleParam.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java similarity index 97% rename from sonar-server/src/main/java/org/sonar/server/rule2/RuleParam.java rename to sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java index c0207e257a5..fe076ed340e 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/RuleParam.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java @@ -17,7 +17,7 @@ * 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; +package org.sonar.server.rule; import org.sonar.api.server.rule.RuleParamType; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java index 6eb28b6b0d2..1afb001b16b 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java @@ -28,7 +28,6 @@ import org.sonar.api.ServerComponent; import org.sonar.api.server.rule.RulesDefinition; import javax.annotation.CheckForNull; - import java.util.Collection; import java.util.Map; import java.util.SortedSet; @@ -36,7 +35,7 @@ import java.util.SortedSet; /** * This component keeps metadata of rule repositories. *

- * Rule repositories are not persisted into datastores, so their metadata (name) + * Rule repositories are not persisted into database, so their metadata (name) * is kept by this component. * * @since 4.2 diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/RuleService.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleService.java similarity index 93% rename from sonar-server/src/main/java/org/sonar/server/rule2/RuleService.java rename to sonar-server/src/main/java/org/sonar/server/rule/RuleService.java index fa8c8fafcfd..d779ce306fb 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/RuleService.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleService.java @@ -17,7 +17,7 @@ * 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; +package org.sonar.server.rule; import org.apache.commons.lang.StringUtils; import org.sonar.api.ServerComponent; @@ -26,10 +26,10 @@ import org.sonar.core.permission.GlobalPermissions; import org.sonar.core.persistence.DbSession; import org.sonar.core.rule.RuleDto; import org.sonar.server.db.DbClient; -import org.sonar.server.rule2.index.RuleIndex; -import org.sonar.server.rule2.index.RuleNormalizer; -import org.sonar.server.rule2.index.RuleQuery; -import org.sonar.server.rule2.index.RuleResult; +import org.sonar.server.rule.index.RuleIndex; +import org.sonar.server.rule.index.RuleNormalizer; +import org.sonar.server.rule.index.RuleQuery; +import org.sonar.server.rule.index.RuleResult; import org.sonar.server.search.QueryOptions; import org.sonar.server.user.UserSession; @@ -52,7 +52,7 @@ public class RuleService implements ServerComponent { } @CheckForNull - public Rule getByKey(RuleKey key) { + public org.sonar.server.rule.Rule getByKey(RuleKey key) { return index.getByKey(key); } diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/RuleTagHelper.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java similarity index 92% rename from sonar-server/src/main/java/org/sonar/server/rule2/RuleTagHelper.java rename to sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java index c24205a293c..c141eeed071 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/RuleTagHelper.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java @@ -17,7 +17,7 @@ * 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; +package org.sonar.server.rule; import com.google.common.base.Predicate; import com.google.common.collect.Sets; @@ -50,6 +50,6 @@ class RuleTagHelper { } }); rule.setTags(withoutSystemTags); - return withoutSystemTags.size()!=initialTags.size() || !withoutSystemTags.containsAll(initialTags); + return withoutSystemTags.size() != initialTags.size() || !withoutSystemTags.containsAll(initialTags); } } diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/persistence/RuleDao.java b/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java similarity index 99% rename from sonar-server/src/main/java/org/sonar/server/rule2/persistence/RuleDao.java rename to sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java index 0cf2d034f4e..29aa90e4ec7 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/persistence/RuleDao.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.server.rule.db; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/package-info.java b/sonar-server/src/main/java/org/sonar/server/rule/db/package-info.java similarity index 93% rename from sonar-server/src/main/java/org/sonar/server/rule2/package-info.java rename to sonar-server/src/main/java/org/sonar/server/rule/db/package-info.java index 569e8a86a4b..389d01feaa7 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/package-info.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/db/package-info.java @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -@ParametersAreNonnullByDefault -package org.sonar.server.rule2; +@ParametersAreNonnullByDefault package org.sonar.server.rule.db; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleDoc.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java similarity index 68% rename from sonar-server/src/main/java/org/sonar/server/rule2/index/RuleDoc.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java index 41af912ba1e..3a4f0c721cb 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleDoc.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java @@ -17,16 +17,15 @@ * 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.index; +package org.sonar.server.rule.index; import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.server.debt.DebtRemediationFunction; import org.sonar.api.server.rule.RuleParamType; -import org.sonar.server.rule2.Rule; -import org.sonar.server.rule2.RuleParam; -import org.sonar.server.rule2.index.RuleNormalizer.RuleField; +import org.sonar.server.rule.Rule; +import org.sonar.server.rule.RuleParam; import org.sonar.server.search.BaseDoc; import org.sonar.server.search.IndexUtils; @@ -47,7 +46,7 @@ public class RuleDoc extends BaseDoc implements Rule { @Override public RuleKey key() { - String key = getField(RuleField.KEY.key()); + String key = getField(RuleNormalizer.RuleField.KEY.key()); if (key == null || key.isEmpty()) { throw new IllegalStateException("Missing values for RuleKey in RuleDoc"); } else { @@ -65,68 +64,68 @@ public class RuleDoc extends BaseDoc implements Rule { @Override @CheckForNull public String internalKey() { - return getField(RuleField.INTERNAL_KEY.key()); + return getField(RuleNormalizer.RuleField.INTERNAL_KEY.key()); } @Override public String markdownNote() { - return getField(RuleField.NOTE.key()); + return getField(RuleNormalizer.RuleField.NOTE.key()); } @Override @CheckForNull public String language() { - return getField(RuleField.LANGUAGE.key()); + return getField(RuleNormalizer.RuleField.LANGUAGE.key()); } @Override @CheckForNull public String name() { - return getField(RuleField.NAME.key()); + return getField(RuleNormalizer.RuleField.NAME.key()); } @Override @CheckForNull public String htmlDescription() { - return getField(RuleField.HTML_DESCRIPTION.key()); + return getField(RuleNormalizer.RuleField.HTML_DESCRIPTION.key()); } @Override @CheckForNull public String severity() { - return (String) getField(RuleField.SEVERITY.key()); + return (String) getField(RuleNormalizer.RuleField.SEVERITY.key()); } @Override @CheckForNull public RuleStatus status() { - return RuleStatus.valueOf((String) getField(RuleField.STATUS.key())); + return RuleStatus.valueOf((String) getField(RuleNormalizer.RuleField.STATUS.key())); } @Override @CheckForNull public boolean template() { - return (Boolean) getField(RuleField.TEMPLATE.key()); + return (Boolean) getField(RuleNormalizer.RuleField.TEMPLATE.key()); } @Override @CheckForNull public List tags() { - return (List) getField(RuleField.TAGS.key()); + return (List) getField(RuleNormalizer.RuleField.TAGS.key()); } @Override @CheckForNull public List systemTags() { - return (List) getField(RuleField.SYSTEM_TAGS.key()); + return (List) getField(RuleNormalizer.RuleField.SYSTEM_TAGS.key()); } @Override @CheckForNull public List params() { List params = new ArrayList(); - if (this.getField(RuleField.PARAMS.key()) != null) { - List> esParams = this.getField(RuleField.PARAMS.key()); + if (this.getField(RuleNormalizer.RuleField.PARAMS.key()) != null) { + List> esParams = this.getField(RuleNormalizer.RuleField.PARAMS.key()); for (final Map param : esParams) { params.add(new RuleParam() { { @@ -164,20 +163,20 @@ public class RuleDoc extends BaseDoc implements Rule { @Override @CheckForNull public String debtCharacteristicKey() { - return (String) getField(RuleField.CHARACTERISTIC.key()); + return (String) getField(RuleNormalizer.RuleField.CHARACTERISTIC.key()); } @Override @CheckForNull - public String debtSubCharacteristicKey(){ - return (String) getField(RuleField.SUB_CHARACTERISTIC.key()); + public String debtSubCharacteristicKey() { + return (String) getField(RuleNormalizer.RuleField.SUB_CHARACTERISTIC.key()); } @Override @CheckForNull public DebtRemediationFunction debtRemediationFunction() { - final String function = this.getField(RuleField.DEBT_FUNCTION_TYPE.key()); - if(function == null || function.isEmpty()){ + final String function = this.getField(RuleNormalizer.RuleField.DEBT_FUNCTION_TYPE.key()); + if (function == null || function.isEmpty()) { return null; } else { return new DebtRemediationFunction() { @@ -188,12 +187,12 @@ public class RuleDoc extends BaseDoc implements Rule { @Override public String coefficient() { - return (String) getField(RuleField.DEBT_FUNCTION_COEFFICIENT.key()); + return (String) getField(RuleNormalizer.RuleField.DEBT_FUNCTION_COEFFICIENT.key()); } @Override public String offset() { - return (String) getField(RuleField.DEBT_FUNCTION_OFFSET.key()); + return (String) getField(RuleNormalizer.RuleField.DEBT_FUNCTION_OFFSET.key()); } }; } @@ -202,29 +201,29 @@ public class RuleDoc extends BaseDoc implements Rule { @Override @CheckForNull public String noteLogin() { - return (String) getField(RuleField.NOTE_LOGIN.key()); + return (String) getField(RuleNormalizer.RuleField.NOTE_LOGIN.key()); } @Override public Date noteCreatedAt() { - return IndexUtils.parseDateTime((String) getField(RuleField.NOTE_CREATED_AT.key())); + return IndexUtils.parseDateTime((String) getField(RuleNormalizer.RuleField.NOTE_CREATED_AT.key())); } @Override public Date noteUpdatedAt() { - return IndexUtils.parseDateTime((String) getField(RuleField.NOTE_UPDATED_AT.key())); + return IndexUtils.parseDateTime((String) getField(RuleNormalizer.RuleField.NOTE_UPDATED_AT.key())); } @Override @CheckForNull public Date createdAt() { - return IndexUtils.parseDateTime((String)getField(RuleField.CREATED_AT.key())); + return IndexUtils.parseDateTime((String) getField(RuleNormalizer.RuleField.CREATED_AT.key())); } @Override @CheckForNull public Date updatedAt() { - return IndexUtils.parseDateTime((String) getField(RuleField.UPDATED_AT.key())); + return IndexUtils.parseDateTime((String) getField(RuleNormalizer.RuleField.UPDATED_AT.key())); } @Override diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java similarity index 99% rename from sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java index d0e807d034a..bf7a8d044f0 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java @@ -17,7 +17,7 @@ * 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.index; +package org.sonar.server.rule.index; import com.google.common.base.Preconditions; import org.elasticsearch.action.search.SearchRequestBuilder; @@ -39,7 +39,7 @@ import org.sonar.core.cluster.WorkQueue; import org.sonar.core.rule.RuleDto; import org.sonar.server.es.ESNode; import org.sonar.server.qualityprofile.index.ActiveRuleNormalizer; -import org.sonar.server.rule2.Rule; +import org.sonar.server.rule.Rule; import org.sonar.server.search.BaseIndex; import org.sonar.server.search.IndexDefinition; import org.sonar.server.search.QueryOptions; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleNormalizer.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java similarity index 95% rename from sonar-server/src/main/java/org/sonar/server/rule2/index/RuleNormalizer.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java index bf0d08fd825..4831f92d416 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleNormalizer.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java @@ -17,7 +17,7 @@ * 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.index; +package org.sonar.server.rule.index; import com.google.common.base.Function; import com.google.common.collect.Collections2; @@ -81,9 +81,9 @@ public class RuleNormalizer extends BaseNormalizer { return key; } - public static RuleField fromKey(String key){ - for(RuleField ruleField : RuleField.values()){ - if(ruleField.key().equals(key)){ + public static RuleField fromKey(String key) { + for (RuleField ruleField : RuleField.values()) { + if (ruleField.key().equals(key)) { return ruleField; } } @@ -135,7 +135,7 @@ public class RuleNormalizer extends BaseNormalizer { List requests = new ArrayList(); try { requests.addAll(normalize(db.ruleDao().getByKey(key, dbSession))); - for(RuleParamDto param : db.ruleDao().findRuleParamsByRuleKey(key, dbSession)){ + for (RuleParamDto param : db.ruleDao().findRuleParamsByRuleKey(key, dbSession)) { requests.addAll(normalize(param, key)); } } finally { @@ -181,8 +181,8 @@ public class RuleNormalizer extends BaseNormalizer { db.debtCharacteristicDao().selectById(characteristic.getParentId()).getKey()); } } else { - update.put(RuleField.CHARACTERISTIC.key(),null); - update.put(RuleField.SUB_CHARACTERISTIC.key(),null); + update.put(RuleField.CHARACTERISTIC.key(), null); + update.put(RuleField.SUB_CHARACTERISTIC.key(), null); } String dType = null, dCoefficient = null, dOffset = null; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleQuery.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleQuery.java similarity index 98% rename from sonar-server/src/main/java/org/sonar/server/rule2/index/RuleQuery.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleQuery.java index c3fda295626..672625dc9f6 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleQuery.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleQuery.java @@ -17,7 +17,7 @@ * 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.index; +package org.sonar.server.rule.index; import com.google.common.base.Preconditions; import org.sonar.api.rule.RuleStatus; @@ -83,7 +83,7 @@ public class RuleQuery { /** * TODO should not be public * - * @see org.sonar.server.rule2.RuleService#newRuleQuery() + * @see org.sonar.server.rule.RuleService#newRuleQuery() */ public RuleQuery() { } diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleResult.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleResult.java similarity index 94% rename from sonar-server/src/main/java/org/sonar/server/rule2/index/RuleResult.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/RuleResult.java index 30f394c3243..c6e36b09875 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleResult.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleResult.java @@ -17,10 +17,10 @@ * 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.index; +package org.sonar.server.rule.index; import org.elasticsearch.action.search.SearchResponse; -import org.sonar.server.rule2.Rule; +import org.sonar.server.rule.Rule; import org.sonar.server.search.Result; import java.util.Collection; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/index/package-info.java b/sonar-server/src/main/java/org/sonar/server/rule/index/package-info.java similarity index 93% rename from sonar-server/src/main/java/org/sonar/server/rule2/index/package-info.java rename to sonar-server/src/main/java/org/sonar/server/rule/index/package-info.java index 06dac82451f..75c31451e83 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/index/package-info.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/index/package-info.java @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -@ParametersAreNonnullByDefault -package org.sonar.server.rule2.index; +@ParametersAreNonnullByDefault package org.sonar.server.rule.index; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/package-info.java b/sonar-server/src/main/java/org/sonar/server/rule/package-info.java index 2b244eedc36..636d92a3045 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/package-info.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/package-info.java @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -@ParametersAreNonnullByDefault -package org.sonar.server.rule; +@ParametersAreNonnullByDefault package org.sonar.server.rule; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/ActiveRuleCompleter.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java similarity index 96% rename from sonar-server/src/main/java/org/sonar/server/rule2/ws/ActiveRuleCompleter.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java index 1aa41ca85c6..9028e6942e4 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/ActiveRuleCompleter.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java @@ -17,7 +17,7 @@ * 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.ws; +package org.sonar.server.rule.ws; import org.sonar.api.ServerComponent; import org.sonar.api.rule.RuleKey; @@ -26,8 +26,8 @@ import org.sonar.core.qualityprofile.db.ActiveRuleKey; import org.sonar.core.qualityprofile.db.QualityProfileKey; import org.sonar.server.qualityprofile.ActiveRule; import org.sonar.server.qualityprofile.ActiveRuleService; -import org.sonar.server.rule2.Rule; -import org.sonar.server.rule2.index.RuleQuery; +import org.sonar.server.rule.Rule; +import org.sonar.server.rule.index.RuleQuery; import java.util.Arrays; import java.util.Collection; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/AppAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java similarity index 99% rename from sonar-server/src/main/java/org/sonar/server/rule2/ws/AppAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java index 59763896c80..09989302eef 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/AppAction.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java @@ -17,7 +17,7 @@ * 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.ws; +package org.sonar.server.rule.ws; import org.elasticsearch.common.collect.Maps; import org.sonar.api.i18n.I18n; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/RuleMapping.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java similarity index 96% rename from sonar-server/src/main/java/org/sonar/server/rule2/ws/RuleMapping.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java index d983454e380..cef03cc967d 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/RuleMapping.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java @@ -17,15 +17,15 @@ * 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.ws; +package org.sonar.server.rule.ws; import org.sonar.api.resources.Language; import org.sonar.api.resources.Languages; import org.sonar.api.utils.text.JsonWriter; import org.sonar.markdown.Markdown; -import org.sonar.server.rule2.Rule; -import org.sonar.server.rule2.RuleParam; -import org.sonar.server.rule2.index.RuleNormalizer; +import org.sonar.server.rule.Rule; +import org.sonar.server.rule.RuleParam; +import org.sonar.server.rule.index.RuleNormalizer; import org.sonar.server.search.ws.BaseMapping; import org.sonar.server.text.MacroInterpreter; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/RulesWebService.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWebService.java similarity index 98% rename from sonar-server/src/main/java/org/sonar/server/rule2/ws/RulesWebService.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWebService.java index 57780443869..9d547586bfc 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/RulesWebService.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWebService.java @@ -17,7 +17,7 @@ * 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.ws; +package org.sonar.server.rule.ws; import org.sonar.api.server.ws.WebService; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java similarity index 96% rename from sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java index 6bd8c580d49..c0c130a0a86 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java @@ -17,7 +17,7 @@ * 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.ws; +package org.sonar.server.rule.ws; import com.google.common.collect.ImmutableList; import com.google.common.io.Resources; @@ -28,12 +28,12 @@ import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.server.rule2.Rule; -import org.sonar.server.rule2.RuleService; -import org.sonar.server.rule2.index.RuleDoc; -import org.sonar.server.rule2.index.RuleNormalizer; -import org.sonar.server.rule2.index.RuleQuery; -import org.sonar.server.rule2.index.RuleResult; +import org.sonar.server.rule.Rule; +import org.sonar.server.rule.RuleService; +import org.sonar.server.rule.index.RuleDoc; +import org.sonar.server.rule.index.RuleNormalizer; +import org.sonar.server.rule.index.RuleQuery; +import org.sonar.server.rule.index.RuleResult; import org.sonar.server.search.FacetValue; import org.sonar.server.search.QueryOptions; import org.sonar.server.search.ws.SearchOptions; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SetNoteAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/SetNoteAction.java similarity index 96% rename from sonar-server/src/main/java/org/sonar/server/rule2/ws/SetNoteAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/SetNoteAction.java index 962f0f8a0df..d13df5f3428 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SetNoteAction.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/ws/SetNoteAction.java @@ -17,14 +17,14 @@ * 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.ws; +package org.sonar.server.rule.ws; import org.sonar.api.rule.RuleKey; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; -import org.sonar.server.rule2.RuleService; +import org.sonar.server.rule.RuleService; public class SetNoteAction implements RequestHandler { diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SetTagsAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/SetTagsAction.java similarity index 96% rename from sonar-server/src/main/java/org/sonar/server/rule2/ws/SetTagsAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/SetTagsAction.java index a322356a889..e65d25ea241 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SetTagsAction.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/ws/SetTagsAction.java @@ -17,7 +17,7 @@ * 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.ws; +package org.sonar.server.rule.ws; import com.google.common.collect.Sets; import org.sonar.api.rule.RuleKey; @@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; -import org.sonar.server.rule2.RuleService; +import org.sonar.server.rule.RuleService; import java.util.Set; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/ShowAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java similarity index 96% rename from sonar-server/src/main/java/org/sonar/server/rule2/ws/ShowAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java index a517549dddf..9bbc2018630 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/ShowAction.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java @@ -17,7 +17,7 @@ * 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.ws; +package org.sonar.server.rule.ws; import com.google.common.io.Resources; import org.sonar.api.rule.RuleKey; @@ -27,8 +27,8 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.text.JsonWriter; import org.sonar.server.exceptions.NotFoundException; -import org.sonar.server.rule2.Rule; -import org.sonar.server.rule2.RuleService; +import org.sonar.server.rule.Rule; +import org.sonar.server.rule.RuleService; import org.sonar.server.search.BaseDoc; /** diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/TagsAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java similarity index 96% rename from sonar-server/src/main/java/org/sonar/server/rule2/ws/TagsAction.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java index 34d4077146e..9d5785adbca 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/TagsAction.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java @@ -17,7 +17,7 @@ * 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.ws; +package org.sonar.server.rule.ws; import com.google.common.io.Resources; import org.sonar.api.server.ws.Request; @@ -25,7 +25,7 @@ import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.server.rule2.RuleService; +import org.sonar.server.rule.RuleService; import java.util.Set; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/package-info.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java similarity index 93% rename from sonar-server/src/main/java/org/sonar/server/rule2/ws/package-info.java rename to sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java index 8fcf3f3f2f5..9ce96b41372 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/package-info.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/ws/package-info.java @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -@ParametersAreNonnullByDefault -package org.sonar.server.rule2.ws; +@ParametersAreNonnullByDefault package org.sonar.server.rule.ws; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/Rule.java b/sonar-server/src/main/java/org/sonar/server/rule2/Rule.java deleted file mode 100644 index 2582e03c57b..00000000000 --- a/sonar-server/src/main/java/org/sonar/server/rule2/Rule.java +++ /dev/null @@ -1,96 +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.api.rule.RuleKey; -import org.sonar.api.rule.RuleStatus; -import org.sonar.api.server.debt.DebtRemediationFunction; - -import javax.annotation.CheckForNull; -import java.util.Date; -import java.util.List; - -/** - * @since 4.4 - */ -public interface Rule { - - RuleKey key(); - - String language(); - - String name(); - - String htmlDescription(); - - /** - * Default severity when activated on a Quality profile - * - * @see org.sonar.api.rule.Severity - */ - String severity(); - - /** - * @see org.sonar.api.rule.RuleStatus - */ - RuleStatus status(); - - boolean template(); - - /** - * Tags that can be customized by administrators - */ - List tags(); - - /** - * Read-only tags defined by plugins - */ - List systemTags(); - - List params(); - - @CheckForNull - String debtCharacteristicKey(); - - @CheckForNull - String debtSubCharacteristicKey(); - - @CheckForNull - DebtRemediationFunction debtRemediationFunction(); - - Date createdAt(); - - Date updatedAt(); - - @CheckForNull - String internalKey(); - - @CheckForNull - String markdownNote(); - - @CheckForNull - String noteLogin(); - - @CheckForNull - Date noteCreatedAt(); - - @CheckForNull - Date noteUpdatedAt(); -} diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/persistence/package-info.java b/sonar-server/src/main/java/org/sonar/server/rule2/persistence/package-info.java deleted file mode 100644 index bbe1f0d5fdb..00000000000 --- a/sonar-server/src/main/java/org/sonar/server/rule2/persistence/package-info.java +++ /dev/null @@ -1,23 +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. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.rule2.persistence; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java b/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java index bd4e0d8b33b..e47d8112f6b 100644 --- a/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java +++ b/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java @@ -38,7 +38,7 @@ import org.sonar.core.persistence.MyBatis; import org.sonar.core.rule.RuleDto; import org.sonar.core.technicaldebt.db.CharacteristicMapper; import org.sonar.server.db.DbClient; -import org.sonar.server.rule2.RegisterRules; +import org.sonar.server.rule.RegisterRules; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-server/src/main/resources/org/sonar/server/rule2/ws/example-search.json b/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-search.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/rule2/ws/example-search.json rename to sonar-server/src/main/resources/org/sonar/server/rule/ws/example-search.json diff --git a/sonar-server/src/main/resources/org/sonar/server/rule2/ws/example-show.json b/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-show.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/rule2/ws/example-show.json rename to sonar-server/src/main/resources/org/sonar/server/rule/ws/example-show.json diff --git a/sonar-server/src/main/resources/org/sonar/server/rule2/ws/example-tags.json b/sonar-server/src/main/resources/org/sonar/server/rule/ws/example-tags.json similarity index 100% rename from sonar-server/src/main/resources/org/sonar/server/rule2/ws/example-tags.json rename to sonar-server/src/main/resources/org/sonar/server/rule/ws/example-tags.json diff --git a/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java b/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java index a9ab4d21df0..92e86abd1a2 100644 --- a/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java +++ b/sonar-server/src/test/java/org/sonar/server/db/DbClientTest.java @@ -26,7 +26,7 @@ import org.sonar.core.persistence.MyBatis; import org.sonar.core.persistence.TestDatabase; import org.sonar.core.qualityprofile.db.QualityProfileDao; import org.sonar.server.qualityprofile.persistence.ActiveRuleDao; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java b/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java index 4a4419fe3fe..3c0cd89ef00 100644 --- a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java +++ b/sonar-server/src/test/java/org/sonar/server/debt/DebtModelBackupTest.java @@ -48,7 +48,7 @@ import org.sonar.server.debt.DebtModelXMLExporter.DebtModel; import org.sonar.server.debt.DebtModelXMLExporter.RuleDebt; import org.sonar.server.rule.RuleDefinitionsLoader; import org.sonar.server.rule.RuleOperations; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import org.sonar.server.user.MockUserSession; import java.io.Reader; diff --git a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java b/sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java index cf3695f9cad..642e41491bd 100644 --- a/sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/debt/DebtModelOperationsTest.java @@ -44,7 +44,7 @@ import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import org.sonar.server.user.MockUserSession; import java.util.Date; diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackupTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackupTest.java index cef2a5a444f..da241eff92b 100644 --- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackupTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackupTest.java @@ -48,7 +48,7 @@ import org.sonar.jpa.session.DatabaseSessionFactory; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import org.sonar.server.user.MockUserSession; import org.sonar.server.user.UserSession; diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexMediumTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexMediumTest.java index 3fde39826c9..914f55f1601 100644 --- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexMediumTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexMediumTest.java @@ -38,7 +38,7 @@ import org.sonar.core.rule.RuleDto; import org.sonar.core.rule.RuleParamDto; import org.sonar.server.qualityprofile.ActiveRule; import org.sonar.server.qualityprofile.persistence.ActiveRuleDao; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import org.sonar.server.tester.ServerTester; import java.util.Collection; diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDaoTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDaoTest.java index 12689e3569e..cd450fecbd7 100644 --- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDaoTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/persistence/ActiveRuleDaoTest.java @@ -31,7 +31,7 @@ import org.sonar.core.qualityprofile.db.ActiveRuleDto; import org.sonar.core.qualityprofile.db.QualityProfileDao; import org.sonar.core.qualityprofile.db.QualityProfileDto; import org.sonar.core.rule.RuleDto; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import static org.fest.assertions.Assertions.assertThat; @@ -76,4 +76,4 @@ public class ActiveRuleDaoTest extends AbstractDaoTestCase{ assertThat(result).isNotNull(); assertThat(result.getKey()).isNotNull(); } -} \ No newline at end of file +} diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java similarity index 94% rename from sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java index 10e12ce01ef..b5d3347d938 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesMediumTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.rule2; +package org.sonar.server.rule; import org.junit.Test; import org.sonar.api.rule.Severity; @@ -29,10 +29,10 @@ import org.sonar.core.rule.RuleDto; import org.sonar.core.rule.RuleParamDto; import org.sonar.server.db.DbClient; import org.sonar.server.platform.Platform; -import org.sonar.server.rule2.index.RuleIndex; -import org.sonar.server.rule2.index.RuleQuery; -import org.sonar.server.rule2.index.RuleResult; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; +import org.sonar.server.rule.index.RuleIndex; +import org.sonar.server.rule.index.RuleQuery; +import org.sonar.server.rule.index.RuleResult; import org.sonar.server.search.QueryOptions; import org.sonar.server.tester.ServerTester; diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java similarity index 98% rename from sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java index ae940efbff8..544df94bdd0 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/RegisterRulesTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java @@ -17,7 +17,7 @@ * 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; +package org.sonar.server.rule; import com.google.common.collect.Sets; import org.junit.After; @@ -38,9 +38,7 @@ import org.sonar.core.technicaldebt.db.CharacteristicDao; import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.ProfilesManager; import org.sonar.server.qualityprofile.persistence.ActiveRuleDao; -import org.sonar.server.rule.RuleDefinitionsLoader; -import org.sonar.server.rule.RuleRepositories; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import java.util.Date; import java.util.List; diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java index 5566e5cd0de..b64b784c193 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RubyRuleServiceTest.java @@ -25,7 +25,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.rule.RuleKey; -import org.sonar.server.rule2.RuleService; import java.util.Map; diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/RuleDataMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleDataMediumTest.java similarity index 95% rename from sonar-server/src/test/java/org/sonar/server/rule2/RuleDataMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/RuleDataMediumTest.java index c239a23c8e9..74a11ceb5d0 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/RuleDataMediumTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleDataMediumTest.java @@ -17,7 +17,7 @@ * 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; +package org.sonar.server.rule; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; @@ -37,8 +37,8 @@ import org.sonar.core.rule.RuleDto; import org.sonar.core.rule.RuleParamDto; import org.sonar.core.technicaldebt.db.CharacteristicDto; import org.sonar.server.db.DbClient; -import org.sonar.server.rule2.index.RuleIndex; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; +import org.sonar.server.rule.index.RuleIndex; import org.sonar.server.tester.ServerTester; import java.util.List; @@ -252,7 +252,7 @@ public class RuleDataMediumTest { .setParentId(char1.getId()); db.debtCharacteristicDao().insert(char11, dbSession); - RuleKey ruleKey = RuleKey.of("test","r1"); + RuleKey ruleKey = RuleKey.of("test", "r1"); RuleDto ruleDto = newRuleDto(ruleKey) .setDefaultSubCharacteristicId(char11.getId()); dao.insert(ruleDto, dbSession); @@ -260,10 +260,10 @@ public class RuleDataMediumTest { // 0. assert chars in DB - assertThat(db.debtCharacteristicDao().selectByKey("c1",dbSession)).isNotNull(); - assertThat(db.debtCharacteristicDao().selectByKey("c1",dbSession).getParentId()).isNull(); - assertThat(db.debtCharacteristicDao().selectByKey("c11",dbSession)).isNotNull(); - assertThat(db.debtCharacteristicDao().selectByKey("c11",dbSession).getParentId()).isEqualTo(char1.getId()); + assertThat(db.debtCharacteristicDao().selectByKey("c1", dbSession)).isNotNull(); + assertThat(db.debtCharacteristicDao().selectByKey("c1", dbSession).getParentId()).isNull(); + assertThat(db.debtCharacteristicDao().selectByKey("c11", dbSession)).isNotNull(); + assertThat(db.debtCharacteristicDao().selectByKey("c11", dbSession).getParentId()).isEqualTo(char1.getId()); // 1. find char and subChar from rule Rule rule = index.getByKey(ruleKey); diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java index 4b16bc5bbb9..5d1f562b54e 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleOperationsTest.java @@ -28,8 +28,6 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.sonar.api.rule.RuleKey; -import org.sonar.api.utils.DateUtils; -import org.sonar.api.utils.System2; import org.sonar.core.permission.GlobalPermissions; import org.sonar.core.persistence.DbSession; import org.sonar.core.rule.RuleDto; @@ -39,18 +37,14 @@ import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.rule.RuleOperations.RuleChange; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import org.sonar.server.user.MockUserSession; import org.sonar.server.user.UserSession; -import java.util.Date; - import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; @RunWith(MockitoJUnitRunner.class) public class RuleOperationsTest { diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java index 5ec62083e5c..be71187ff0e 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java @@ -75,7 +75,7 @@ public class RuleRepositoriesTest { new RulesDefinition() { @Override public void define(Context context) { - context.createRepository("javascript", "js").setName("SonarQube").done(); + context.createRepository("javascript", "js").setName("SonarQube").done(); } }.define(context); @@ -91,8 +91,8 @@ public class RuleRepositoriesTest { NewRepository repo = context.createRepository("findbugs", "java"); repo.setName("Findbugs"); repo.createRule("ABC") - .setName("ABC") - .setHtmlDescription("Description of ABC"); + .setName("ABC") + .setHtmlDescription("Description of ABC"); repo.done(); } } @@ -103,8 +103,8 @@ public class RuleRepositoriesTest { NewRepository repo = context.createRepository("squid", "java"); repo.setName("Squid"); repo.createRule("DEF") - .setName("DEF") - .setHtmlDescription("Description of DEF"); + .setName("DEF") + .setHtmlDescription("Description of DEF"); repo.done(); } } diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/RuleServiceMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java similarity index 98% rename from sonar-server/src/test/java/org/sonar/server/rule2/RuleServiceMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java index 4119d09eaad..1b141a58c1e 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/RuleServiceMediumTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleServiceMediumTest.java @@ -17,7 +17,7 @@ * 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; +package org.sonar.server.rule; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -40,9 +40,9 @@ import org.sonar.core.rule.RuleDto; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.qualityprofile.persistence.ActiveRuleDao; -import org.sonar.server.rule2.index.RuleIndex; -import org.sonar.server.rule2.index.RuleNormalizer; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; +import org.sonar.server.rule.index.RuleIndex; +import org.sonar.server.rule.index.RuleNormalizer; import org.sonar.server.tester.ServerTester; import org.sonar.server.user.MockUserSession; diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/RuleTagHelperTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java similarity index 98% rename from sonar-server/src/test/java/org/sonar/server/rule2/RuleTagHelperTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java index 5a9c07bf084..3a216db889e 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/RuleTagHelperTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java @@ -17,7 +17,7 @@ * 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; +package org.sonar.server.rule; import com.google.common.collect.Sets; import org.junit.Test; diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RulesDefinitionLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RulesDefinitionLoaderTest.java index 53781d28fe8..a5e6a23e0b9 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RulesDefinitionLoaderTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RulesDefinitionLoaderTest.java @@ -40,7 +40,7 @@ public class RulesDefinitionLoaderTest { RuleRepositories repositories = new RuleRepositories(); RulesDefinition.Context context = new RuleDefinitionsLoader(repositories, new RulesDefinition[]{ - new FindbugsDefinitions(), new SquidDefinitions() + new FindbugsDefinitions(), new SquidDefinitions() }).load(); assertThat(context.repositories()).hasSize(2); @@ -57,8 +57,8 @@ public class RulesDefinitionLoaderTest { NewRepository repo = context.createRepository("findbugs", "java"); repo.setName("Findbugs"); repo.createRule("ABC") - .setName("ABC") - .setHtmlDescription("Description of ABC"); + .setName("ABC") + .setHtmlDescription("Description of ABC"); repo.done(); } } @@ -69,8 +69,8 @@ public class RulesDefinitionLoaderTest { NewRepository repo = context.createRepository("squid", "java"); repo.setName("Squid"); repo.createRule("DEF") - .setName("DEF") - .setHtmlDescription("Description of DEF"); + .setName("DEF") + .setHtmlDescription("Description of DEF"); repo.done(); } } diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/persistence/RuleDaoTest.java b/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java similarity index 99% rename from sonar-server/src/test/java/org/sonar/server/rule2/persistence/RuleDaoTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java index bdec7a13955..4a056caec1b 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/persistence/RuleDaoTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java @@ -17,7 +17,7 @@ * 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.persistence; +package org.sonar.server.rule.db; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/index/RuleIndexMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java similarity index 98% rename from sonar-server/src/test/java/org/sonar/server/rule2/index/RuleIndexMediumTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java index 6776c714d88..1eaac2f36ed 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/index/RuleIndexMediumTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java @@ -17,7 +17,7 @@ * 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.index; +package org.sonar.server.rule.index; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; @@ -38,8 +38,8 @@ import org.sonar.core.qualityprofile.db.QualityProfileDto; import org.sonar.core.rule.RuleDto; import org.sonar.core.technicaldebt.db.CharacteristicDto; import org.sonar.server.db.DbClient; -import org.sonar.server.rule2.Rule; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.Rule; +import org.sonar.server.rule.db.RuleDao; import org.sonar.server.search.FacetValue; import org.sonar.server.search.QueryOptions; import org.sonar.server.search.Result; @@ -259,7 +259,7 @@ public class RuleIndexMediumTest { } @Test - public void search_by_any_of_languages() throws InterruptedException { + public void search_by_any_of_languages() throws InterruptedException { dao.insert(newRuleDto(RuleKey.of("java", "S001")).setLanguage("java"), dbSession); dao.insert(newRuleDto(RuleKey.of("javascript", "S002")).setLanguage("js"), dbSession); dbSession.commit(); @@ -341,7 +341,7 @@ public class RuleIndexMediumTest { assertThat(index.search(query, new QueryOptions()).getHits()).hasSize(1); // search by SubChar & Char - query = new RuleQuery().setQueryText(char11.getKey()+" "+char1.getKey()); + query = new RuleQuery().setQueryText(char11.getKey() + " " + char1.getKey()); assertThat(index.search(query, new QueryOptions()).getHits()).hasSize(1); } @@ -486,7 +486,7 @@ public class RuleIndexMediumTest { // 3. get all rules not active on profile index.search(new RuleQuery().setActivation(false).setQProfileKey(qualityProfileDto2.getKey().toString()), - new QueryOptions()); + new QueryOptions()); // TODO assertThat(result.getRules()).hasSize(1); diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/ws/AppActionTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java similarity index 96% rename from sonar-server/src/test/java/org/sonar/server/rule2/ws/AppActionTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java index 23fbc0e986e..7d5f6366672 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/ws/AppActionTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java @@ -17,7 +17,7 @@ * 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.ws; +package org.sonar.server.rule.ws; import com.google.common.collect.ImmutableList; import org.junit.Test; @@ -73,8 +73,8 @@ public class AppActionTest { MockUserSession.set().setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN); - QualityProfileDto profile1 = QualityProfileDto.createFor("Profile One","bf"); - QualityProfileDto profile2 = QualityProfileDto.createFor("Profile Two","bf").setParent("Profile One"); + QualityProfileDto profile1 = QualityProfileDto.createFor("Profile One", "bf"); + QualityProfileDto profile2 = QualityProfileDto.createFor("Profile Two", "bf").setParent("Profile One"); when(qualityProfileService.findAll()).thenReturn(ImmutableList.of(profile1, profile2)); Language brainfsck = mock(Language.class); @@ -83,7 +83,7 @@ public class AppActionTest { Language whitespace = mock(Language.class); when(whitespace.getKey()).thenReturn("ws"); when(whitespace.getName()).thenReturn("Whitespace"); - when(languages.all()).thenReturn(new Language[] { brainfsck, whitespace }); + when(languages.all()).thenReturn(new Language[]{brainfsck, whitespace}); RuleRepositories.Repository repo1 = mock(RuleRepositories.Repository.class); when(repo1.key()).thenReturn("squid"); diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/ws/RuleMappingTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java similarity index 98% rename from sonar-server/src/test/java/org/sonar/server/rule2/ws/RuleMappingTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java index adf763572e7..f3d31ef3137 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/ws/RuleMappingTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java @@ -17,12 +17,12 @@ * 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.ws; +package org.sonar.server.rule.ws; import org.junit.Test; import org.sonar.api.resources.Languages; import org.sonar.api.server.ws.internal.SimpleGetRequest; -import org.sonar.server.rule2.index.RuleNormalizer; +import org.sonar.server.rule.index.RuleNormalizer; import org.sonar.server.search.QueryOptions; import org.sonar.server.search.ws.SearchOptions; import org.sonar.server.text.MacroInterpreter; diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/ws/RulesWebServiceTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceTest.java similarity index 99% rename from sonar-server/src/test/java/org/sonar/server/rule2/ws/RulesWebServiceTest.java rename to sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceTest.java index 0fea3103698..8eda69d5564 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/ws/RulesWebServiceTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceTest.java @@ -17,7 +17,7 @@ * 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.ws; +package org.sonar.server.rule.ws; import com.google.common.collect.ImmutableSet; import org.junit.After; @@ -39,8 +39,8 @@ import org.sonar.core.qualityprofile.db.QualityProfileDto; import org.sonar.core.rule.RuleDto; import org.sonar.core.rule.RuleParamDto; import org.sonar.server.qualityprofile.persistence.ActiveRuleDao; -import org.sonar.server.rule2.index.RuleNormalizer; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; +import org.sonar.server.rule.index.RuleNormalizer; import org.sonar.server.search.ws.SearchOptions; import org.sonar.server.tester.ServerTester; import org.sonar.server.user.MockUserSession; diff --git a/sonar-server/src/test/java/org/sonar/server/search/IndexClientMediumTest.java b/sonar-server/src/test/java/org/sonar/server/search/IndexClientMediumTest.java index 85d13055b58..b4992d05afb 100644 --- a/sonar-server/src/test/java/org/sonar/server/search/IndexClientMediumTest.java +++ b/sonar-server/src/test/java/org/sonar/server/search/IndexClientMediumTest.java @@ -21,7 +21,7 @@ package org.sonar.server.search; import org.junit.ClassRule; import org.junit.Test; -import org.sonar.server.rule2.index.RuleIndex; +import org.sonar.server.rule.index.RuleIndex; import org.sonar.server.tester.ServerTester; import static org.fest.assertions.Assertions.assertThat; @@ -38,4 +38,4 @@ public class IndexClientMediumTest{ assertThat(tester.get(RuleIndex.class)) .isEqualTo(indexClient.get(RuleIndex.class)); } -} \ No newline at end of file +} diff --git a/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java b/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java index 26d2d7dc27c..9c7cfbeeaa6 100644 --- a/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java +++ b/sonar-server/src/test/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRulesTest.java @@ -31,7 +31,7 @@ import org.sonar.api.utils.System2; import org.sonar.core.persistence.TestDatabase; import org.sonar.core.rule.RuleDto; import org.sonar.server.db.DbClient; -import org.sonar.server.rule2.persistence.RuleDao; +import org.sonar.server.rule.db.RuleDao; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.when; diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/empty.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/empty.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/empty.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/empty.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/insert-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/insert-result.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/insert_all-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_all-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/insert_all-result.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_all-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/insert_parameter-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/insert_parameter-result.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/insert_parameter.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/insert_parameter.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/insert_parameter.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/selectAll.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectAll.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/selectAll.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectAll.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/selectById.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectById.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/selectById.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectById.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/selectNonManual.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectNonManual.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/selectNonManual.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectNonManual.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/selectParameters.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectParameters.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/selectParameters.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/selectParameters.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_by_name.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_name.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_by_name.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_name.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_by_rule_key.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_rule_key.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_by_rule_key.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_rule_key.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_by_sub_characteristic_id.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_sub_characteristic_id.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_by_sub_characteristic_id.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_by_sub_characteristic_id.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_enables_and_non_manual.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_enables_and_non_manual.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_parameters_by_rule_id.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_id.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_parameters_by_rule_id.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_id.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_parameters_by_rule_ids.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_ids.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/select_parameters_by_rule_ids.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_parameters_by_rule_ids.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/update-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/update-result.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/update.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/update.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/update_parameter-result.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/update_parameter-result.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/update_parameter.xml b/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/persistence/RuleDaoTest/update_parameter.xml rename to sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/update_parameter.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/AppActionTest/app.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/AppActionTest/app.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/AppActionTest/app.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/AppActionTest/app.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/filter_by_tags.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/filter_by_tags.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/filter_by_tags.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/filter_by_tags.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/get_note_as_markdown_and_html.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/get_note_as_markdown_and_html.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/get_note_as_markdown_and_html.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/get_note_as_markdown_and_html.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/get_tags.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/get_tags.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/get_tags.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/get_tags.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_2_rules.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_2_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_2_rules.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_2_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_active_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_active_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules_params.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_active_rules_params.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules_params.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_active_rules_params.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_debt_rule.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_debt_rule.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_debt_rule.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_debt_rule.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_no_rules.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_no_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_no_rules.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_no_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_profile_active_rules.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_profile_active_rules.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_profile_active_rules.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/search_profile_active_rules.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/show_rule_active.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/show_rule_active.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/show_rule_active.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/show_rule_active.json diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/show_rule_no_active.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/show_rule_no_active.json similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/show_rule_no_active.json rename to sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceTest/show_rule_no_active.json -- 2.39.5