SONAR-13999 remove all organization WS

14 files changed, 16 insertions, 195 deletions

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/AuthorsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/AuthorsRequest.java
index ad853a0f317..cc64aa28006 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/AuthorsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/AuthorsRequest.java
@@ -30,25 +30,11 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class AuthorsRequest {
 
-  private String organization;
   private String project;
   private String ps;
   private String q;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public AuthorsRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "my_project"
    */
   public AuthorsRequest setProject(String project) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/IssuesService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/IssuesService.java
index 527d872d60c..cea5bfd5d6b 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/IssuesService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/IssuesService.java
@@ -89,7 +89,6 @@ public class IssuesService extends BaseService {
   public AuthorsResponse authors(AuthorsRequest request) {
     return call(
       new GetRequest(path("authors"))
-        .setParam("organization", request.getOrganization())
         .setParam("project", request.getProject())
         .setParam("ps", request.getPs())
         .setParam("q", request.getQ()),
@@ -145,8 +144,7 @@ public class IssuesService extends BaseService {
         .setParam("componentUuid", request.getComponentUuid())
         .setParam("createdAfter", request.getCreatedAfter())
         .setParam("ps", request.getPs())
-        .setMediaType(MediaTypes.JSON)
-      ).content();
+        .setMediaType(MediaTypes.JSON)).content();
   }
 
   /**
@@ -190,8 +188,7 @@ public class IssuesService extends BaseService {
       new PostRequest(path("edit_comment"))
         .setParam("comment", request.getComment())
         .setParam("text", request.getText())
-        .setMediaType(MediaTypes.JSON)
-      ).content();
+        .setMediaType(MediaTypes.JSON)).content();
   }
 
   /**
@@ -226,7 +223,6 @@ public class IssuesService extends BaseService {
         .setParam("languages", request.getLanguages() == null ? null : request.getLanguages().stream().collect(Collectors.joining(",")))
         .setParam("moduleUuids", request.getModuleUuids() == null ? null : request.getModuleUuids().stream().collect(Collectors.joining(",")))
         .setParam("onComponentOnly", request.getOnComponentOnly())
-        .setParam("organization", request.getOrganization())
         .setParam("owaspTop10", request.getOwaspTop10() == null ? null : request.getOwaspTop10().stream().collect(Collectors.joining(",")))
         .setParam("p", request.getP())
         .setParam("projects", request.getProjects() == null ? null : request.getProjects().stream().collect(Collectors.joining(",")))
@@ -301,7 +297,6 @@ public class IssuesService extends BaseService {
   public TagsResponse tags(TagsRequest request) {
     return call(
       new GetRequest(path("tags"))
-        .setParam("organization", request.getOrganization())
         .setParam("project", request.getProject())
         .setParam("ps", request.getPs())
         .setParam("q", request.getQ()),
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java
index 5e13b280fe4..c9e6dc2ca3d 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java
@@ -53,7 +53,6 @@ public class SearchRequest {
   private List<String> languages;
   private List<String> moduleUuids;
   private String onComponentOnly;
-  private String organization;
   private List<String> owaspTop10;
   private String p;
   private List<String> projects;
@@ -402,19 +401,6 @@ public class SearchRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public SearchRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Possible values:
    * <ul>
    *   <li>"a1"</li>
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/TagsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/TagsRequest.java
index 2a55e5dd7ac..421763a6ec1 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/TagsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/TagsRequest.java
@@ -30,25 +30,11 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class TagsRequest {
 
-  private String organization;
   private String project;
   private String ps;
   private String q;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public TagsRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "my_project"
    */
   public TagsRequest setProject(String project) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/AppRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/AppRequest.java
index 0aa9215dfca..3396f468f25 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/AppRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/AppRequest.java
@@ -29,19 +29,4 @@ import javax.annotation.Generated;
  */
 @Generated("sonar-ws-generator")
 public class AppRequest {
-
-  private String organization;
-
-  /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public AppRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/RulesService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/RulesService.java
index bedee53da45..5770d22d26f 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/RulesService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/RulesService.java
@@ -52,9 +52,7 @@ public class RulesService extends BaseService {
   public String app(AppRequest request) {
     return call(
       new GetRequest(path("app"))
-        .setParam("organization", request.getOrganization())
-        .setMediaType(MediaTypes.JSON)
-      ).content();
+        .setMediaType(MediaTypes.JSON)).content();
   }
 
   /**
@@ -90,8 +88,7 @@ public class RulesService extends BaseService {
     call(
       new PostRequest(path("delete"))
         .setParam("key", request.getKey())
-        .setMediaType(MediaTypes.JSON)
-      ).content();
+        .setMediaType(MediaTypes.JSON)).content();
   }
 
   /**
@@ -119,8 +116,7 @@ public class RulesService extends BaseService {
       new GetRequest(path("repositories"))
         .setParam("language", request.getLanguage())
         .setParam("q", request.getQ())
-        .setMediaType(MediaTypes.JSON)
-      ).content();
+        .setMediaType(MediaTypes.JSON)).content();
   }
 
   /**
@@ -144,7 +140,6 @@ public class RulesService extends BaseService {
         .setParam("is_template", request.getIsTemplate())
         .setParam("include_external", request.getIncludeExternal())
         .setParam("languages", request.getLanguages() == null ? null : request.getLanguages().stream().collect(Collectors.joining(",")))
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("ps", request.getPs())
         .setParam("q", request.getQ())
@@ -175,8 +170,7 @@ public class RulesService extends BaseService {
     return call(
       new GetRequest(path("show"))
         .setParam("actives", request.getActives())
-        .setParam("key", request.getKey())
-        .setParam("organization", request.getOrganization()),
+        .setParam("key", request.getKey()),
       ShowResponse.parser());
   }
 
@@ -190,11 +184,9 @@ public class RulesService extends BaseService {
   public String tags(TagsRequest request) {
     return call(
       new GetRequest(path("tags"))
-        .setParam("organization", request.getOrganization())
         .setParam("ps", request.getPs())
         .setParam("q", request.getQ())
-        .setMediaType(MediaTypes.JSON)
-      ).content();
+        .setMediaType(MediaTypes.JSON)).content();
   }
 
   /**
@@ -211,7 +203,6 @@ public class RulesService extends BaseService {
         .setParam("markdown_description", request.getMarkdownDescription())
         .setParam("markdown_note", request.getMarkdownNote())
         .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization())
         .setParam("params", request.getParams() == null ? null : request.getParams().stream().collect(Collectors.joining(",")))
         .setParam("remediation_fn_base_effort", request.getRemediationFnBaseEffort())
         .setParam("remediation_fn_type", request.getRemediationFnType())
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/SearchRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/SearchRequest.java
index d69336aed30..6c4c5747b65 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/SearchRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/SearchRequest.java
@@ -43,7 +43,6 @@ public class SearchRequest {
   private List<String> inheritance;
   private String isTemplate;
   private List<String> languages;
-  private String organization;
   private List<String> owaspTop10;
   private String p;
   private String ps;
@@ -260,7 +259,7 @@ public class SearchRequest {
   public String getIsTemplate() {
     return isTemplate;
   }
-  
+
   /**
    * Possible values:
    * <ul>
@@ -292,19 +291,6 @@ public class SearchRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public SearchRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Possible values:
    * <ul>
    *   <li>"a1"</li>
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/ShowRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/ShowRequest.java
index dfbcd336f50..c2d0a3798d6 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/ShowRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/ShowRequest.java
@@ -32,7 +32,6 @@ public class ShowRequest {
 
   private String actives;
   private String key;
-  private String organization;
 
   /**
    * Possible values:
@@ -64,17 +63,4 @@ public class ShowRequest {
   public String getKey() {
     return key;
   }
-
-  /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public ShowRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/TagsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/TagsRequest.java
index 4529f3caef1..0f9b976baef 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/TagsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/TagsRequest.java
@@ -30,24 +30,10 @@ import javax.annotation.Generated;
 @Generated("sonar-ws-generator")
 public class TagsRequest {
 
-  private String organization;
   private String ps;
   private String q;
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public TagsRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "20"
    */
   public TagsRequest setPs(String ps) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/UpdateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/UpdateRequest.java
index ae6c294b704..c2673e75111 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/UpdateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/rules/UpdateRequest.java
@@ -35,7 +35,6 @@ public class UpdateRequest {
   private String markdownDescription;
   private String markdownNote;
   private String name;
-  private String organization;
   private List<String> params;
   private String remediationFnBaseEffort;
   private String remediationFnType;
@@ -94,19 +93,6 @@ public class UpdateRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public UpdateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    */
   public UpdateRequest setParams(List<String> params) {
     this.params = params;
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/AddUserRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/AddUserRequest.java
index 910f77ffae0..b642a0c492e 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/AddUserRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/AddUserRequest.java
@@ -33,7 +33,6 @@ public class AddUserRequest {
   private String id;
   private String login;
   private String name;
-  private String organization;
 
   /**
    * Example value: "42"
@@ -70,17 +69,4 @@ public class AddUserRequest {
   public String getName() {
     return name;
   }
-
-  /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public AddUserRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/CreateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/CreateRequest.java
index a43d93cb41c..f48071c3538 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/CreateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/CreateRequest.java
@@ -32,7 +32,6 @@ public class CreateRequest {
 
   private String description;
   private String name;
-  private String organization;
 
   /**
    * Example value: "Default group for new users"
@@ -58,17 +57,4 @@ public class CreateRequest {
   public String getName() {
     return name;
   }
-
-  /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public CreateRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/SearchRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/SearchRequest.java
index ee8431fc16c..e0789185b82 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/SearchRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/SearchRequest.java
@@ -32,7 +32,6 @@ import javax.annotation.Generated;
 public class SearchRequest {
 
   private List<String> f;
-  private String organization;
   private String p;
   private String ps;
   private String q;
@@ -55,19 +54,6 @@ public class SearchRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public SearchRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public SearchRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/UserGroupsService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/UserGroupsService.java
index 2ce6885ced5..ae871792edf 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/UserGroupsService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroups/UserGroupsService.java
@@ -22,13 +22,13 @@ package org.sonarqube.ws.client.usergroups;
 import java.util.stream.Collectors;
 import javax.annotation.Generated;
 import org.sonarqube.ws.MediaTypes;
+import org.sonarqube.ws.UserGroups.CreateWsResponse;
+import org.sonarqube.ws.UserGroups.SearchWsResponse;
+import org.sonarqube.ws.UserGroups.UpdateWsResponse;
 import org.sonarqube.ws.client.BaseService;
 import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsConnector;
-import org.sonarqube.ws.UserGroups.CreateWsResponse;
-import org.sonarqube.ws.UserGroups.SearchWsResponse;
-import org.sonarqube.ws.UserGroups.UpdateWsResponse;
 
 /**
  * @see <a href="https://next.sonarqube.com/sonarqube/web_api/api/user_groups">Further information about this web service online</a>
@@ -53,9 +53,7 @@ public class UserGroupsService extends BaseService {
         .setParam("id", request.getId())
         .setParam("login", request.getLogin())
         .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization())
-        .setMediaType(MediaTypes.JSON)
-      ).content();
+        .setMediaType(MediaTypes.JSON)).content();
   }
 
   /**
@@ -69,8 +67,7 @@ public class UserGroupsService extends BaseService {
     return call(
       new PostRequest(path("create"))
         .setParam("description", request.getDescription())
-        .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization()),
+        .setParam("name", request.getName()),
       CreateWsResponse.parser());
   }
 
@@ -86,9 +83,7 @@ public class UserGroupsService extends BaseService {
       new PostRequest(path("delete"))
         .setParam("id", request.getId())
         .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization())
-        .setMediaType(MediaTypes.JSON)
-      ).content();
+        .setMediaType(MediaTypes.JSON)).content();
   }
 
   /**
@@ -104,9 +99,7 @@ public class UserGroupsService extends BaseService {
         .setParam("id", request.getId())
         .setParam("login", request.getLogin())
         .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization())
-        .setMediaType(MediaTypes.JSON)
-      ).content();
+        .setMediaType(MediaTypes.JSON)).content();
   }
 
   /**
@@ -120,7 +113,6 @@ public class UserGroupsService extends BaseService {
     return call(
       new GetRequest(path("search"))
         .setParam("f", request.getF() == null ? null : request.getF().stream().collect(Collectors.joining(",")))
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("ps", request.getPs())
         .setParam("q", request.getQ()),
@@ -155,12 +147,10 @@ public class UserGroupsService extends BaseService {
       new GetRequest(path("users"))
         .setParam("id", request.getId())
         .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("ps", request.getPs())
         .setParam("q", request.getQ())
         .setParam("selected", request.getSelected())
-        .setMediaType(MediaTypes.JSON)
-      ).content();
+        .setMediaType(MediaTypes.JSON)).content();
   }
 }