SONAR-5341 Update Issues WS Java client due to removal of issue.componentId and issue.effortToFix

4 files changed, 12 insertions, 16 deletions

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java
index 7949a54b6bc..6a9d8477490 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java
@@ -37,8 +37,6 @@ public interface Issue {
 
   String componentKey();
 
-  Long componentId();
-
   String projectKey();
 
   String ruleKey();
@@ -52,9 +50,6 @@ public interface Issue {
   Integer line();
 
   @CheckForNull
-  Double effortToFix();
-
-  @CheckForNull
   String debt();
 
   String status();
diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java
index 0b7de948226..702b83760ae 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java
@@ -54,6 +54,9 @@ public interface Issues {
   @CheckForNull
   Component componentById(long id);
 
+  @CheckForNull
+  Component componentByKey(String key);
+
   Collection<Component> projects();
 
   @CheckForNull
diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssue.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssue.java
index f55ff479e49..eadf2b9f1ee 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssue.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssue.java
@@ -49,10 +49,6 @@ public class DefaultIssue implements Issue {
     return JsonUtils.getString(json, "component");
   }
 
-  public Long componentId() {
-    return JsonUtils.getLong(json, "componentId");
-  }
-
   public String projectKey() {
     return JsonUtils.getString(json, "project");
   }
@@ -76,11 +72,6 @@ public class DefaultIssue implements Issue {
   }
 
   @CheckForNull
-  public Double effortToFix() {
-    return JsonUtils.getDouble(json, "effortToFix");
-  }
-
-  @CheckForNull
   public String debt() {
     return JsonUtils.getString(json, "debt");
   }
diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssues.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssues.java
index 2b76fa74634..39e5ecbfffb 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssues.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssues.java
@@ -41,6 +41,7 @@ public class DefaultIssues implements Issues {
   private final Map<String, Rule> rulesByKey = new HashMap<String, Rule>();
   private final Map<String, User> usersByKey = new HashMap<String, User>();
   private final Map<Long, Component> componentsById = new HashMap<Long, Component>();
+  private final Map<String, Component> componentsByKey = new HashMap<String, Component>();
   private final Map<String, Component> projectsByKey = new HashMap<String, Component>();
   private final Map<String, ActionPlan> actionPlansByKey = new HashMap<String, ActionPlan>();
   private Paging paging;
@@ -72,12 +73,12 @@ public class DefaultIssues implements Issues {
   }
 
   public Collection<Component> components() {
-    return componentsById.values();
+    return componentsByKey.values();
   }
 
   @CheckForNull
   public Component component(Issue issue) {
-    return componentsById.get(issue.componentId());
+    return componentsByKey.get(issue.componentKey());
   }
 
   @CheckForNull
@@ -85,6 +86,11 @@ public class DefaultIssues implements Issues {
     return componentsById.get(id);
   }
 
+  @CheckForNull
+  public Component componentByKey(String key) {
+    return componentsByKey.get(key);
+  }
+
   public Collection<Component> projects() {
     return projectsByKey.values();
   }
@@ -134,6 +140,7 @@ public class DefaultIssues implements Issues {
 
   DefaultIssues addComponent(Component c) {
     componentsById.put(c.id(), c);
+    componentsByKey.put(c.key(), c);
     return this;
   }