SONAR-17705 Remove deprecated WS componentId from ce/activity and ce/activity_status

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ActivityRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ActivityRequest.java
index 43314d4c835634da4e2bc32367e9c17ddb5ac00d..9df8b9e65ebfae3b1ea4528b01a27f47a38967a8 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ActivityRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ActivityRequest.java
@@ -32,7 +32,6 @@ import javax.annotation.Generated;
 public class ActivityRequest {
 
   private String component;
-  private String componentId;
   private String maxExecutedAt;
   private String minSubmittedAt;
   private String onlyCurrents;
@@ -42,18 +41,6 @@ public class ActivityRequest {
   private List<String> status;
   private String type;
 
-  /**
-   * Example value: "AU-TpxcA-iU5OvuD2FL0"
-   */
-  public ActivityRequest setComponentId(String componentId) {
-    this.componentId = componentId;
-    return this;
-  }
-
-  public String getComponentId() {
-    return componentId;
-  }
-
   /**
    * Example value: "sample:src/main/xoo/sample/Sample2.xoo"
    */

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ActivityStatusRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ActivityStatusRequest.java
index 4d8972767bab5f0902f2743b4a9aa058a928d37d..15df89f92c2979f1a70a9986cfc435f4967f981a 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ActivityStatusRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ActivityStatusRequest.java
@@ -30,30 +30,17 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class ActivityStatusRequest {
 
-  private String componentId;
-  private String componentKey;
-
-  /**
-   * Example value: "AU-TpxcA-iU5OvuD2FL0"
-   */
-  public ActivityStatusRequest setComponentId(String componentId) {
-    this.componentId = componentId;
-    return this;
-  }
-
-  public String getComponentId() {
-    return componentId;
-  }
+  private String component;
 
   /**
    * Example value: "my_project"
    */
-  public ActivityStatusRequest setComponentKey(String componentKey) {
-    this.componentKey = componentKey;
+  public ActivityStatusRequest setComponent(String component) {
+    this.component = component;
     return this;
   }
 
-  public String getComponentKey() {
-    return componentKey;
+  public String getComponent() {
+    return component;
   }
 }

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/CeService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/CeService.java
index 8a60cc4c0169d6850002de09b3486a08e751cd4f..aa43a754b521ecc3430f374d4a480ddae203e474 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/CeService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/CeService.java
@@ -56,7 +56,6 @@ public class CeService extends BaseService {
   public ActivityResponse activity(ActivityRequest request) {
     return call(
       new GetRequest(path("activity"))
-        .setParam("componentId", request.getComponentId())
         .setParam("component", request.getComponent())
         .setParam("maxExecutedAt", request.getMaxExecutedAt())
         .setParam("minSubmittedAt", request.getMinSubmittedAt())
@@ -79,8 +78,7 @@ public class CeService extends BaseService {
   public ActivityStatusWsResponse activityStatus(ActivityStatusRequest request) {
     return call(
       new GetRequest(path("activity_status"))
-        .setParam("componentId", request.getComponentId())
-        .setParam("componentKey", request.getComponentKey()),
+        .setParam("component", request.getComponent()),
       ActivityStatusWsResponse.parser());
   }