diff options
author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2016-03-18 16:21:56 +0100 |
---|---|---|
committer | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2016-03-18 18:09:35 +0100 |
commit | 31be229d3a4cce43aeee5e2c7561fcfb6d10a2be (patch) | |
tree | fe49da69b3f45c8f86b760ce64ff0351ff360429 /server | |
parent | 7e6a5ce62b86627c20e040cd358cb75a9d35d2da (diff) | |
download | sonarqube-31be229d3a4cce43aeee5e2c7561fcfb6d10a2be.tar.gz sonarqube-31be229d3a4cce43aeee5e2c7561fcfb6d10a2be.zip |
SONAR-7375 WS api/rules/search rename PARAM_KEY to PARAM_RULE_KEY
Diffstat (limited to 'server')
-rw-r--r-- | server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java | 6 | ||||
-rw-r--r-- | server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java | 6 |
2 files changed, 6 insertions, 6 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 59fa1927687..de8b5c54def 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 @@ -79,7 +79,7 @@ import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_ACTIVE_SEVERI import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_AVAILABLE_SINCE; 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; +import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_RULE_KEY; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_LANGUAGES; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_QPROFILE; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_REPOSITORIES; @@ -212,7 +212,7 @@ public class SearchAction implements RulesWsAction { .setExampleValue("xpath"); action - .createParam(PARAM_KEY) + .createParam(PARAM_RULE_KEY) .setDescription("Key of rule to search for") .setExampleValue("squid:S001"); @@ -321,7 +321,7 @@ public class SearchAction implements RulesWsAction { query.setIsTemplate(request.paramAsBoolean(PARAM_IS_TEMPLATE)); query.setTemplateKey(request.param(PARAM_TEMPLATE_KEY)); query.setTypes(request.paramAsEnums(PARAM_TYPES, RuleType.class)); - query.setKey(request.param(PARAM_KEY)); + query.setKey(request.param(PARAM_RULE_KEY)); String sortParam = request.param(Param.SORT); if (sortParam != null) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java index 76d558ff0fb..52075e11499 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java @@ -58,7 +58,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_ACTIVATION; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_AVAILABLE_SINCE; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_IS_TEMPLATE; -import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_KEY; +import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_RULE_KEY; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_QPROFILE; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_STATUSES; import static org.sonarqube.ws.client.rule.RulesWsParameters.PARAM_TAGS; @@ -116,13 +116,13 @@ public class SearchActionMediumTest { ruleIndexer.index(); WsTester.TestRequest request = tester.wsTester().newGetRequest(API_ENDPOINT, API_SEARCH_METHOD); - request.setParam(PARAM_KEY, RuleTesting.XOO_X1.toString()); + request.setParam(PARAM_RULE_KEY, RuleTesting.XOO_X1.toString()); request.setParam(WebService.Param.FIELDS, "actives"); WsTester.Result result = request.execute(); result.assertJson("{\"total\":1,\"p\":1,\"ps\":100,\"rules\":[{\"key\":\"xoo:x1\"}]}"); request = tester.wsTester().newGetRequest(API_ENDPOINT, API_SEARCH_METHOD); - request.setParam(PARAM_KEY, RuleKey.of("xoo", "unknown").toString()); + request.setParam(PARAM_RULE_KEY, RuleKey.of("xoo", "unknown").toString()); request.setParam(WebService.Param.FIELDS, "actives"); result = request.execute(); result.assertJson("{\"total\":0,\"p\":1,\"ps\":100,\"rules\":[],\"actives\":{}}"); |