SONAR-8100 remove return of id and id parameter in organizations WSs

3 files changed, 6 insertions, 21 deletions

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/organization/OrganizationService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/organization/OrganizationService.java
index 9077250a242..df2e355e65b 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/organization/OrganizationService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/organization/OrganizationService.java
@@ -56,7 +56,6 @@ public class OrganizationService extends BaseService {
 
   public UpdateWsResponse update(UpdateWsRequest request) {
     PostRequest post = new PostRequest(path("update"))
-      .setParam("id", request.getId())
       .setParam("key", request.getKey())
       .setParam("name", request.getName())
       .setParam("description", request.getDescription())
@@ -66,9 +65,8 @@ public class OrganizationService extends BaseService {
     return call(post, UpdateWsResponse.parser());
   }
 
-  public void delete(@Nullable String id, @Nullable String key) {
+  public void delete(@Nullable String key) {
     PostRequest post = new PostRequest(path("delete"))
-      .setParam("id", id)
       .setParam("key", key);
 
     call(post);
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/organization/UpdateWsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/organization/UpdateWsRequest.java
index 2c131aa4d24..8167282d509 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/organization/UpdateWsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/organization/UpdateWsRequest.java
@@ -20,7 +20,6 @@
 package org.sonarqube.ws.client.organization;
 
 public class UpdateWsRequest {
-  private final String id;
   private final String key;
   private final String name;
   private final String description;
@@ -28,7 +27,6 @@ public class UpdateWsRequest {
   private final String avatar;
 
   public UpdateWsRequest(Builder builder) {
-    this.id = builder.id;
     this.name = builder.name;
     this.key = builder.key;
     this.description = builder.description;
@@ -36,10 +34,6 @@ public class UpdateWsRequest {
     this.avatar = builder.avatar;
   }
 
-  public String getId() {
-    return id;
-  }
-
   public String getName() {
     return name;
   }
@@ -61,18 +55,12 @@ public class UpdateWsRequest {
   }
 
   public static class Builder {
-    private String id;
     private String key;
     private String name;
     private String description;
     private String url;
     private String avatar;
 
-    public Builder setId(String id) {
-      this.id = id;
-      return this;
-    }
-
     public Builder setKey(String key) {
       this.key = key;
       return this;
diff --git a/sonar-ws/src/main/protobuf/ws-organizations.proto b/sonar-ws/src/main/protobuf/ws-organizations.proto
index 87754dd2142..4029ca50a75 100644
--- a/sonar-ws/src/main/protobuf/ws-organizations.proto
+++ b/sonar-ws/src/main/protobuf/ws-organizations.proto
@@ -40,10 +40,9 @@ message SearchWsResponse {
 }
 
 message Organization {
-  optional string id = 1;
-  optional string key = 2;
-  optional string name = 3;
-  optional string description = 4;
-  optional string url = 5;
-  optional string avatar = 6;
+  optional string key = 1;
+  optional string name = 2;
+  optional string description = 3;
+  optional string url = 4;
+  optional string avatar = 5;
 }