From 341f02c4f952bf85854b4c184d3945ce99a1801d Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 1 Mar 2016 17:58:49 +0100 Subject: [PATCH] SONAR-7329 Cleanup some remaining characteristics stuff --- .../java/org/sonar/server/rule/ws/SearchAction.java | 12 ------------ .../server/qualityprofile/ws/QProfilesWsTest.java | 2 +- .../src/main/java/org/sonar/db/rule/RuleDto.java | 2 -- .../sonarqube/ws/client/rule/RulesWsParameters.java | 12 ++---------- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java index 7ed6347411d..c9b811198a5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java @@ -77,8 +77,6 @@ import static org.sonarqube.ws.client.rule.RulesWsParameters.OPTIONAL_FIELDS; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_ACTIVATION; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_ACTIVE_SEVERITIES; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_AVAILABLE_SINCE; -import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_DEBT_CHARACTERISTICS; -import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_HAS_DEBT_CHARACTERISTIC; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_INHERITANCE; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_IS_TEMPLATE; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_KEY; @@ -229,16 +227,6 @@ public class SearchAction implements RulesWsAction { .setDescription("Filters rules added since date. Format is yyyy-MM-dd") .setExampleValue("2014-06-22"); - action - .createParam(PARAM_DEBT_CHARACTERISTICS) - .setDescription("Comma-separated list of technical debt characteristics or sub-characteristics") - .setExampleValue("RELIABILITY"); - - action - .createParam(PARAM_HAS_DEBT_CHARACTERISTIC) - .setDescription("Filter rules that have a technical debt characteristic") - .setBooleanPossibleValues(); - action .createParam(PARAM_TAGS) .setDescription("Comma-separated list of tags. Returned rules match any of the tags (OR operator)") diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java index 52ab1060cf9..2ae27085596 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java @@ -202,7 +202,7 @@ public class QProfilesWsTest { WebService.Action restoreProfiles = controller.action(BulkRuleActivationActions.BULK_DEACTIVATE_ACTION); assertThat(restoreProfiles).isNotNull(); assertThat(restoreProfiles.isPost()).isTrue(); - assertThat(restoreProfiles.params()).hasSize(20); + assertThat(restoreProfiles.params()).hasSize(18); } @Test diff --git a/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java index 130674dd9bf..1bab2f50806 100644 --- a/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java +++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java @@ -39,8 +39,6 @@ import static com.google.common.base.Preconditions.checkArgument; public class RuleDto { - public static final int DISABLED_CHARACTERISTIC_ID = -1; - public enum Format { HTML, MARKDOWN } diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/rule/RulesWsParameters.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/rule/RulesWsParameters.java index d636e7966e5..503ba93a322 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/rule/RulesWsParameters.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/rule/RulesWsParameters.java @@ -32,8 +32,6 @@ public class RulesWsParameters { public static final String PARAM_AVAILABLE_SINCE = "available_since"; public static final String PARAM_STATUSES = "statuses"; public static final String PARAM_LANGUAGES = "languages"; - public static final String PARAM_DEBT_CHARACTERISTICS = "debt_characteristics"; - public static final String PARAM_HAS_DEBT_CHARACTERISTIC = "has_debt_characteristic"; public static final String PARAM_TAGS = "tags"; public static final String PARAM_TYPES = "types"; public static final String PARAM_INHERITANCE = "inheritance"; @@ -58,12 +56,6 @@ public class RulesWsParameters { public static final String FIELD_NOTE_LOGIN = "noteLogin"; public static final String FIELD_MARKDOWN_NOTE = "mdNote"; public static final String FIELD_HTML_NOTE = "htmlNote"; - public static final String FIELD_DEFAULT_DEBT_CHAR = "defaultDebtChar"; - public static final String FIELD_DEFAULT_DEBT_SUB_CHAR = "defaultDebtSubChar"; - public static final String FIELD_DEBT_CHAR = "debtChar"; - public static final String FIELD_DEBT_SUB_CHAR = "debtSubChar"; - public static final String FIELD_DEBT_CHAR_NAME = "debtCharName"; - public static final String FIELD_DEBT_SUB_CHAR_NAME = "debtSubCharName"; public static final String FIELD_DEFAULT_DEBT_REM_FUNCTION = "defaultDebtRemFn"; public static final String FIELD_EFFORT_TO_FIX_DESCRIPTION = "effortToFixDescription"; public static final String FIELD_DEBT_OVERLOADED = "debtOverloaded"; @@ -73,8 +65,8 @@ public class RulesWsParameters { public static final Set OPTIONAL_FIELDS = ImmutableSet.of(FIELD_REPO, FIELD_NAME, FIELD_CREATED_AT, FIELD_SEVERITY, FIELD_STATUS, FIELD_INTERNAL_KEY, FIELD_IS_TEMPLATE, FIELD_TEMPLATE_KEY, FIELD_TAGS, FIELD_SYSTEM_TAGS, FIELD_LANGUAGE, FIELD_LANGUAGE_NAME, FIELD_HTML_DESCRIPTION, FIELD_MARKDOWN_DESCRIPTION, FIELD_NOTE_LOGIN, - FIELD_MARKDOWN_NOTE, FIELD_HTML_NOTE, FIELD_DEFAULT_DEBT_CHAR, FIELD_DEFAULT_DEBT_SUB_CHAR, FIELD_DEBT_CHAR, FIELD_DEBT_SUB_CHAR, FIELD_DEBT_CHAR_NAME, - FIELD_DEBT_SUB_CHAR_NAME, FIELD_DEFAULT_DEBT_REM_FUNCTION, FIELD_EFFORT_TO_FIX_DESCRIPTION, FIELD_DEBT_OVERLOADED, FIELD_DEBT_REM_FUNCTION, FIELD_PARAMS, FIELD_ACTIVES); + FIELD_MARKDOWN_NOTE, FIELD_HTML_NOTE, FIELD_DEFAULT_DEBT_REM_FUNCTION, FIELD_EFFORT_TO_FIX_DESCRIPTION, FIELD_DEBT_OVERLOADED, FIELD_DEBT_REM_FUNCTION, FIELD_PARAMS, + FIELD_ACTIVES); private RulesWsParameters() { // prevent instantiation -- 2.39.5