SONAR-3755 support the parameter "rules" in /api/issues/search

2 files changed, 16 insertions, 40 deletions

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/IssueQuery.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/IssueQuery.java
index e64c38df6f8..e4d9fc44b59 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/IssueQuery.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/IssueQuery.java
@@ -30,13 +30,11 @@ public final class IssueQuery extends Query<Issue> {
 
   private String[] keys;
   private String[] severities;
-  private String minSeverity;
   private String[] status;
   private String[] resolutions;
   private String[] components;
   private String[] componentRoots;
-  private String ruleRepository;
-  private String rule;
+  private String[] rules;
   private String[] userLogins;
   private String[] assigneeLogins;
   private Date createdAfter;
@@ -73,15 +71,6 @@ public final class IssueQuery extends Query<Issue> {
     return this;
   }
 
-  public String getMinSeverity() {
-    return minSeverity;
-  }
-
-  public IssueQuery setMinSeverity(String minSeverity) {
-    this.minSeverity = minSeverity;
-    return this;
-  }
-
   public String[] getStatus() {
     return status;
   }
@@ -118,21 +107,12 @@ public final class IssueQuery extends Query<Issue> {
     return this;
   }
 
-  public String getRuleRepository() {
-    return ruleRepository;
-  }
-
-  public IssueQuery setRuleRepository(String ruleRepository) {
-    this.ruleRepository = ruleRepository;
-    return this;
-  }
-
-  public String getRule() {
-    return rule;
+  public String[] getRules() {
+    return rules;
   }
 
-  public IssueQuery setRule(String rule) {
-    this.rule = rule;
+  public IssueQuery setRules(String... s) {
+    this.rules = s;
     return this;
   }
 
@@ -196,13 +176,11 @@ public final class IssueQuery extends Query<Issue> {
     url.append('?');
     appendUrlParameter(url, "keys", keys);
     appendUrlParameter(url, "severities", severities);
-    appendUrlParameter(url, "minSeverity", minSeverity);
-    appendUrlParameter(url, "status", status);
+    appendUrlParameter(url, "statuses", status);
     appendUrlParameter(url, "resolutions", resolutions);
     appendUrlParameter(url, "components", components);
     appendUrlParameter(url, "componentRoots", componentRoots);
-    appendUrlParameter(url, "ruleRepository", ruleRepository);
-    appendUrlParameter(url, "rule", rule);
+    appendUrlParameter(url, "rules", rules);
     appendUrlParameter(url, "userLogins", userLogins);
     appendUrlParameter(url, "assigneeLogins", assigneeLogins);
     appendUrlParameter(url, "createdAfter", createdAfter);
diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/services/IssueQueryTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/services/IssueQueryTest.java
index f0a89b5ff17..3489cbf1baf 100644
--- a/sonar-ws-client/src/test/java/org/sonar/wsclient/services/IssueQueryTest.java
+++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/services/IssueQueryTest.java
@@ -37,22 +37,20 @@ public class IssueQueryTest extends QueryTestCase {
   @Test
   public void get_all_issues_by_parameter() {
     IssueQuery query = IssueQuery.create()
-        .setKeys("key1", "key2")
-        .setAssigneeLogins("assigneeLogin1", "assigneeLogin2")
+        .setKeys("ABCDE", "FGHIJ")
+        .setAssigneeLogins("arthur", "perceval")
         .setComponents("component1", "component2")
         .setComponentRoots("componentRoot1", "componentRoot2")
         .setLimit(1)
-        .setMinSeverity("minSev")
-        .setResolutions("resoltion1", "resolution2")
-        .setRuleRepository("ruleRepo")
-        .setRule("rule")
-        .setStatus("status1", "status2")
-        .setSeverities("sev1", "sev2")
+        .setResolutions("resolution1", "resolution2")
+        .setRules("squid:AvoidCycle")
+        .setStatus("OPEN", "CLOSED")
+        .setSeverities("BLOCKER", "INFO")
         .setUserLogins("userLogin1", "userLogin2")
         ;
-    assertThat(query.getUrl()).isEqualTo("/api/issues/search?keys=key1,key2&severities=sev1,sev2&minSeverity=minSev&status=status1,status2&" +
-        "resolutions=resoltion1,resolution2&components=component1,component2&componentRoots=componentRoot1,componentRoot2&ruleRepository=ruleRepo&rule=rule&" +
-        "userLogins=userLogin1,userLogin2&assigneeLogins=assigneeLogin1,assigneeLogin2&limit=1&");
+    assertThat(query.getUrl()).isEqualTo("/api/issues/search?keys=ABCDE,FGHIJ&severities=BLOCKER,INFO&statuses=OPEN,CLOSED&" +
+        "resolutions=resolution1,resolution2&components=component1,component2&componentRoots=componentRoot1,componentRoot2&rules=squid%3AAvoidCycle&" +
+        "userLogins=userLogin1,userLogin2&assigneeLogins=arthur,perceval&limit=1&");
   }
 
   @Test