From 9144ea8667c63d60d67bd3c3f0c403135071b087 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@gmail.com>
Date: Fri, 12 Apr 2013 16:59:22 +0200
Subject: [PATCH] SONAR-3755 Update java web service client to use latest ruby
 API

---
 .../WEB-INF/app/views/issues/_list.html.erb   |  4 ++--
 .../sonar/wsclient/services/IssueQuery.java   | 20 +------------------
 .../wsclient/services/IssueQueryTest.java     | 11 ++--------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb
index a4d40056d61..de2809a8f0e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb
@@ -87,13 +87,13 @@
           <%= h(issue.message) %>
         </td>
         <td>
-          <span class="nowrap"><%= h issue.component_key -%></span>
+          <%= h issue.component_key -%>
         </td>
         <td>
           <%= issue.rule_repository_key + ":" + issue.rule_key %>
         </td>
         <td>
-          <%= issue.cost -%>
+          <%= issue.line -%>
         </td>
         <td>
           <%= issue.cost -%>
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 faee242c8fa..988df66f723 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
@@ -24,9 +24,8 @@ package org.sonar.wsclient.services;
  */
 public final class IssueQuery extends Query<Issue> {
 
-  public static final String BASE_URL = "/api/issues";
+  public static final String BASE_URL = "/api/issues/search";
 
-  private String key;
   private String[] keys;
   private String[] severities;
   private String minSeverity;
@@ -49,19 +48,6 @@ public final class IssueQuery extends Query<Issue> {
     return new IssueQuery();
   }
 
-  public static IssueQuery byKey(String key) {
-    return new IssueQuery().setKey(key);
-  }
-
-  public String getKey() {
-    return key;
-  }
-
-  public IssueQuery setKey(String key) {
-    this.key = key;
-    return this;
-  }
-
   public String[] getKeys() {
     return keys;
   }
@@ -155,10 +141,6 @@ public final class IssueQuery extends Query<Issue> {
   @Override
   public String getUrl() {
     StringBuilder url = new StringBuilder(BASE_URL);
-    if (key != null && !"".equals(key)) {
-      url.append("/");
-      url.append(encode(key));
-    }
     url.append('?');
     appendUrlParameter(url, "keys", keys);
     appendUrlParameter(url, "severities", severities);
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 180af81f149..1d620e483e2 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
@@ -29,7 +29,7 @@ public class IssueQueryTest extends QueryTestCase {
   @Test
   public void get_all_issues() {
     IssueQuery query = IssueQuery.create();
-    assertThat(query.getUrl()).isEqualTo("/api/issues?");
+    assertThat(query.getUrl()).isEqualTo("/api/issues/search?");
   }
 
   @Test
@@ -45,16 +45,9 @@ public class IssueQueryTest extends QueryTestCase {
         .setStatus("status1", "status2")
         .setSeverities("sev1", "sev2")
         .setUserLogins("userLogin1", "userLogin2");
-    assertThat(query.getUrl()).isEqualTo("/api/issues?keys=key1,key2&severities=sev1,sev2&minSeverity=minSev&status=status1,status2&" +
+    assertThat(query.getUrl()).isEqualTo("/api/issues/search?keys=key1,key2&severities=sev1,sev2&minSeverity=minSev&status=status1,status2&" +
         "resolutions=resoltion1,resolution2&components=component1,component2&rules=rule1,rule2&userLogins=userLogin1,userLogin2&" +
         "assigneeLogins=assigneeLogin1,assigneeLogin2&limit=1&");
   }
 
-  @Test
-  public void get_issue_by_key() {
-    IssueQuery query = IssueQuery.byKey("issue_key");
-    assertThat(query.getUrl()).isEqualTo("/api/issues/issue_key?");
-    assertThat(query.getKey()).isEqualTo("issue_key");
-  }
-
 }
-- 
2.39.5