SONAR-13903 Remove use of organizations in Quality Profiles and Active Rules

22 files changed, 1 insertions, 300 deletions

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofile/QualityProfileWsParameters.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofile/QualityProfileWsParameters.java
index f05b091f2e2..4fb221aeb74 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofile/QualityProfileWsParameters.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofile/QualityProfileWsParameters.java
@@ -51,7 +51,6 @@ public class QualityProfileWsParameters {
   public static final String PARAM_DEFAULTS = "defaults";
   public static final String PARAM_FROM_KEY = "fromKey";
   public static final String PARAM_GROUP = "group";
-  public static final String PARAM_ORGANIZATION = "organization";
   public static final String PARAM_LANGUAGE = "language";
   public static final String PARAM_LOGIN = "login";
   public static final String PARAM_NAME = "name";
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ActivateRulesRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ActivateRulesRequest.java
index 796a7d3e9d4..9a8d5a29b2d 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ActivateRulesRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ActivateRulesRequest.java
@@ -40,7 +40,6 @@ public class ActivateRulesRequest {
   private List<String> inheritance;
   private String isTemplate;
   private List<String> languages;
-  private String organization;
   private List<String> owaspTop10;
   private String q;
   private String qprofile;
@@ -199,19 +198,6 @@ public class ActivateRulesRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public ActivateRulesRequest 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/qualityprofiles/AddGroupRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/AddGroupRequest.java
index 1ede6644899..3d5ef361083 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/AddGroupRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/AddGroupRequest.java
@@ -32,7 +32,6 @@ public class AddGroupRequest {
 
   private String group;
   private String language;
-  private String organization;
   private String qualityProfile;
 
   /**
@@ -61,19 +60,6 @@ public class AddGroupRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public AddGroupRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "Recommended quality profile"
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/AddProjectRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/AddProjectRequest.java
index e6e3407e662..87d2d7e038e 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/AddProjectRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/AddProjectRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class AddProjectRequest {
 
   private String language;
-  private String organization;
   private String project;
   private String qualityProfile;
 
@@ -48,19 +47,6 @@ public class AddProjectRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public AddProjectRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "my_project"
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/AddUserRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/AddUserRequest.java
index 3b01345e563..a9b521a5645 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/AddUserRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/AddUserRequest.java
@@ -32,7 +32,6 @@ public class AddUserRequest {
 
   private String language;
   private String login;
-  private String organization;
   private String qualityProfile;
 
   /**
@@ -61,19 +60,6 @@ public class AddUserRequest {
   }
 
   /**
-   * 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;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "Recommended quality profile"
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/BackupRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/BackupRequest.java
index 4cd3227770b..8ce280421db 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/BackupRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/BackupRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class BackupRequest {
 
   private String language;
-  private String organization;
   private String qualityProfile;
 
   /**
@@ -47,19 +46,6 @@ public class BackupRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public BackupRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "Sonar way"
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ChangeParentRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ChangeParentRequest.java
index 360b4df967a..16322ccdced 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ChangeParentRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ChangeParentRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class ChangeParentRequest {
 
   private String language;
-  private String organization;
   private String parentQualityProfile;
   private String qualityProfile;
 
@@ -48,19 +47,6 @@ public class ChangeParentRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public ChangeParentRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "Sonar way"
    */
   public ChangeParentRequest setParentQualityProfile(String parentQualityProfile) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ChangelogRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ChangelogRequest.java
index 9f1b1f0b9e5..0c67bf5949d 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ChangelogRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ChangelogRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class ChangelogRequest {
 
   private String language;
-  private String organization;
   private String p;
   private String ps;
   private String qualityProfile;
@@ -51,19 +50,6 @@ public class ChangelogRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public ChangelogRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public ChangelogRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/CreateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/CreateRequest.java
index 0558d4bd0e7..8bb4041b961 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/CreateRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/CreateRequest.java
@@ -32,7 +32,6 @@ public class CreateRequest {
 
   private String language;
   private String name;
-  private String organization;
 
   /**
    * This is a mandatory parameter.
@@ -60,16 +59,4 @@ public class CreateRequest {
     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/qualityprofiles/DeactivateRulesRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/DeactivateRulesRequest.java
index 9debd5f2e63..d828e6849c6 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/DeactivateRulesRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/DeactivateRulesRequest.java
@@ -40,7 +40,6 @@ public class DeactivateRulesRequest {
   private List<String> inheritance;
   private String isTemplate;
   private List<String> languages;
-  private String organization;
   private List<String> owaspTop10;
   private String q;
   private String qprofile;
@@ -198,19 +197,6 @@ public class DeactivateRulesRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public DeactivateRulesRequest 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/qualityprofiles/DeleteRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/DeleteRequest.java
index 7a2d0c22c14..3e9638007ea 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/DeleteRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/DeleteRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class DeleteRequest {
 
   private String language;
-  private String organization;
   private String qualityProfile;
 
   /**
@@ -47,19 +46,6 @@ public class DeleteRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public DeleteRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "Sonar way"
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ExportRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ExportRequest.java
index 7ccc3d79b89..99479d04b36 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ExportRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/ExportRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class ExportRequest {
 
   private String language;
-  private String organization;
   private String qualityProfile;
 
   /**
@@ -48,19 +47,6 @@ public class ExportRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public ExportRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "My Sonar way"
    */
   public ExportRequest setQualityProfile(String qualityProfile) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/InheritanceRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/InheritanceRequest.java
index 9b29d2e7bca..f89ad67b47e 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/InheritanceRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/InheritanceRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class InheritanceRequest {
 
   private String language;
-  private String organization;
   private String qualityProfile;
 
   /**
@@ -47,19 +46,6 @@ public class InheritanceRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public InheritanceRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "Sonar way"
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/QualityprofilesService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/QualityprofilesService.java
index eaad9b8e20d..2dd6158e0ef 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/QualityprofilesService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/QualityprofilesService.java
@@ -82,7 +82,6 @@ public class QualityprofilesService extends BaseService {
         .setParam("inheritance", request.getInheritance() == null ? null : request.getInheritance().stream().collect(Collectors.joining(",")))
         .setParam("is_template", request.getIsTemplate())
         .setParam("languages", request.getLanguages() == null ? null : request.getLanguages().stream().collect(Collectors.joining(",")))
-        .setParam("organization", request.getOrganization())
         .setParam("owaspTop10", request.getOwaspTop10() == null ? null : request.getOwaspTop10().stream().collect(Collectors.joining(",")))
         .setParam("q", request.getQ())
         .setParam("qprofile", request.getQprofile())
@@ -114,7 +113,6 @@ public class QualityprofilesService extends BaseService {
       new PostRequest(path("add_group"))
         .setParam("group", request.getGroup())
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("qualityProfile", request.getQualityProfile())
         .setMediaType(MediaTypes.JSON)
     ).content();
@@ -131,7 +129,6 @@ public class QualityprofilesService extends BaseService {
     call(
       new PostRequest(path("add_project"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("project", request.getProject())
         .setParam("qualityProfile", request.getQualityProfile())
         .setMediaType(MediaTypes.JSON)
@@ -150,7 +147,6 @@ public class QualityprofilesService extends BaseService {
       new PostRequest(path("add_user"))
         .setParam("language", request.getLanguage())
         .setParam("login", request.getLogin())
-        .setParam("organization", request.getOrganization())
         .setParam("qualityProfile", request.getQualityProfile())
         .setMediaType(MediaTypes.JSON)
     ).content();
@@ -167,7 +163,6 @@ public class QualityprofilesService extends BaseService {
     return call(
       new GetRequest(path("backup"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("qualityProfile", request.getQualityProfile())
         .setMediaType(MediaTypes.JSON)
     ).content();
@@ -184,7 +179,6 @@ public class QualityprofilesService extends BaseService {
     call(
       new PostRequest(path("change_parent"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("parentQualityProfile", request.getParentQualityProfile())
         .setParam("qualityProfile", request.getQualityProfile())
         .setMediaType(MediaTypes.JSON)
@@ -202,7 +196,6 @@ public class QualityprofilesService extends BaseService {
     return call(
       new GetRequest(path("changelog"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("ps", request.getPs())
         .setParam("qualityProfile", request.getQualityProfile())
@@ -254,8 +247,7 @@ public class QualityprofilesService extends BaseService {
     return call(
       new PostRequest(path("create"))
         .setParam("language", request.getLanguage())
-        .setParam("name", request.getName())
-        .setParam("organization", request.getOrganization()),
+        .setParam("name", request.getName()),
       CreateWsResponse.parser());
   }
 
@@ -294,7 +286,6 @@ public class QualityprofilesService extends BaseService {
         .setParam("inheritance", request.getInheritance() == null ? null : request.getInheritance().stream().collect(Collectors.joining(",")))
         .setParam("is_template", request.getIsTemplate())
         .setParam("languages", request.getLanguages() == null ? null : request.getLanguages().stream().collect(Collectors.joining(",")))
-        .setParam("organization", request.getOrganization())
         .setParam("owaspTop10", request.getOwaspTop10() == null ? null : request.getOwaspTop10().stream().collect(Collectors.joining(",")))
         .setParam("q", request.getQ())
         .setParam("qprofile", request.getQprofile())
@@ -324,7 +315,6 @@ public class QualityprofilesService extends BaseService {
     call(
       new PostRequest(path("delete"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("qualityProfile", request.getQualityProfile())
         .setMediaType(MediaTypes.JSON)
     ).content();
@@ -341,7 +331,6 @@ public class QualityprofilesService extends BaseService {
     return call(
       new GetRequest(path("export"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("qualityProfile", request.getQualityProfile())
         .setMediaType(MediaTypes.JSON)
     ).content();
@@ -386,7 +375,6 @@ public class QualityprofilesService extends BaseService {
     return call(
       new GetRequest(path("inheritance"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("qualityProfile", request.getQualityProfile()),
       Qualityprofiles.InheritanceWsResponse.parser());
   }
@@ -422,7 +410,6 @@ public class QualityprofilesService extends BaseService {
       new PostRequest(path("remove_group"))
         .setParam("group", request.getGroup())
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("qualityProfile", request.getQualityProfile())
         .setMediaType(MediaTypes.JSON)
     ).content();
@@ -439,7 +426,6 @@ public class QualityprofilesService extends BaseService {
     call(
       new PostRequest(path("remove_project"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("project", request.getProject())
         .setParam("qualityProfile", request.getQualityProfile())
         .setMediaType(MediaTypes.JSON)
@@ -458,7 +444,6 @@ public class QualityprofilesService extends BaseService {
       new PostRequest(path("remove_user"))
         .setParam("language", request.getLanguage())
         .setParam("login", request.getLogin())
-        .setParam("organization", request.getOrganization())
         .setParam("qualityProfile", request.getQualityProfile())
         .setMediaType(MediaTypes.JSON)
     ).content();
@@ -491,7 +476,6 @@ public class QualityprofilesService extends BaseService {
     call(
       new PostRequest(path("restore"))
         .setParam("backup", request.getBackup())
-        .setParam("organization", request.getOrganization())
         .setMediaType(MediaTypes.JSON)
     ).content();
   }
@@ -508,7 +492,6 @@ public class QualityprofilesService extends BaseService {
       new GetRequest(path("search"))
         .setParam("defaults", request.getDefaults())
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("project", request.getProject())
         .setParam("qualityProfile", request.getQualityProfile()),
       SearchWsResponse.parser());
@@ -525,7 +508,6 @@ public class QualityprofilesService extends BaseService {
     return call(
       new GetRequest(path("search_groups"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("ps", request.getPs())
         .setParam("q", request.getQ())
@@ -545,7 +527,6 @@ public class QualityprofilesService extends BaseService {
     return call(
       new GetRequest(path("search_users"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("p", request.getP())
         .setParam("ps", request.getPs())
         .setParam("q", request.getQ())
@@ -565,7 +546,6 @@ public class QualityprofilesService extends BaseService {
     call(
       new PostRequest(path("set_default"))
         .setParam("language", request.getLanguage())
-        .setParam("organization", request.getOrganization())
         .setParam("qualityProfile", request.getQualityProfile())
         .setMediaType(MediaTypes.JSON)
     ).content();
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveGroupRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveGroupRequest.java
index c7e2cbb46c2..d0dce1024f9 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveGroupRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveGroupRequest.java
@@ -32,7 +32,6 @@ public class RemoveGroupRequest {
 
   private String group;
   private String language;
-  private String organization;
   private String qualityProfile;
 
   /**
@@ -61,19 +60,6 @@ public class RemoveGroupRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public RemoveGroupRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "Recommended quality profile"
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveProjectRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveProjectRequest.java
index 1d3edb8f6e1..acb329a1329 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveProjectRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveProjectRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class RemoveProjectRequest {
 
   private String language;
-  private String organization;
   private String project;
   private String qualityProfile;
 
@@ -48,19 +47,6 @@ public class RemoveProjectRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public RemoveProjectRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "my_project"
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveUserRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveUserRequest.java
index 3318a036403..41a06d3718e 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveUserRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RemoveUserRequest.java
@@ -32,7 +32,6 @@ public class RemoveUserRequest {
 
   private String language;
   private String login;
-  private String organization;
   private String qualityProfile;
 
   /**
@@ -61,19 +60,6 @@ public class RemoveUserRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public RemoveUserRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "Recommended quality profile"
    */
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RestoreRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RestoreRequest.java
index d4d7f0317c5..84af739c0e6 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RestoreRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/RestoreRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class RestoreRequest {
 
   private String backup;
-  private String organization;
 
   /**
    * This is a mandatory parameter.
@@ -45,16 +44,4 @@ public class RestoreRequest {
     return backup;
   }
 
-  /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public RestoreRequest 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/qualityprofiles/SearchGroupsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SearchGroupsRequest.java
index c0282ee67ce..146c9717c14 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SearchGroupsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SearchGroupsRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class SearchGroupsRequest {
 
   private String language;
-  private String organization;
   private String p;
   private String ps;
   private String q;
@@ -51,19 +50,6 @@ public class SearchGroupsRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public SearchGroupsRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public SearchGroupsRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SearchRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SearchRequest.java
index 99472222efe..708b831cf06 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SearchRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SearchRequest.java
@@ -32,7 +32,6 @@ public class SearchRequest {
 
   private String defaults;
   private String language;
-  private String organization;
   private String project;
   private String qualityProfile;
 
@@ -66,19 +65,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: "my_project"
    */
   public SearchRequest setProject(String project) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SearchUsersRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SearchUsersRequest.java
index 97f5c1e0ccf..3af4b71f966 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SearchUsersRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SearchUsersRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class SearchUsersRequest {
 
   private String language;
-  private String organization;
   private String p;
   private String ps;
   private String q;
@@ -51,19 +50,6 @@ public class SearchUsersRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public SearchUsersRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * Example value: "42"
    */
   public SearchUsersRequest setP(String p) {
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SetDefaultRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SetDefaultRequest.java
index 1cf06b01d80..c519a836ed8 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SetDefaultRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualityprofiles/SetDefaultRequest.java
@@ -31,7 +31,6 @@ import javax.annotation.Generated;
 public class SetDefaultRequest {
 
   private String language;
-  private String organization;
   private String qualityProfile;
 
   /**
@@ -47,19 +46,6 @@ public class SetDefaultRequest {
   }
 
   /**
-   * This is part of the internal API.
-   * Example value: "my-org"
-   */
-  public SetDefaultRequest setOrganization(String organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  /**
    * This is a mandatory parameter.
    * Example value: "Sonar way"
    */