SONAR-13936 Remove organization parameter from Users

* SONAR-13936 Remove organization parameter from api/users/groups
* SONAR-13936 Remove organization_uuid column from users table

3 files changed, 2 insertions, 31 deletions

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/GroupsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/GroupsAction.java
index 80a9c7cb7d9..dbcbbb058ad 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/GroupsAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/GroupsAction.java
@@ -52,7 +52,6 @@ import static org.sonar.api.utils.Paging.forPageIndex;
 import static org.sonar.server.exceptions.NotFoundException.checkFound;
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
 import static org.sonarqube.ws.client.user.UsersWsParameters.PARAM_LOGIN;
-import static org.sonarqube.ws.client.user.UsersWsParameters.PARAM_ORGANIZATION;
 
 public class GroupsAction implements UsersWsAction {
 
@@ -62,7 +61,7 @@ public class GroupsAction implements UsersWsAction {
   private final UserSession userSession;
   private final DefaultGroupFinder defaultGroupFinder;
 
-  public GroupsAction(DbClient dbClient, UserSession userSession,  DefaultGroupFinder defaultGroupFinder) {
+  public GroupsAction(DbClient dbClient, UserSession userSession, DefaultGroupFinder defaultGroupFinder) {
     this.dbClient = dbClient;
     this.userSession = userSession;
     this.defaultGroupFinder = defaultGroupFinder;
@@ -86,12 +85,6 @@ public class GroupsAction implements UsersWsAction {
       .setDescription("A user login")
       .setExampleValue("admin")
       .setRequired(true);
-
-    action.createParam(PARAM_ORGANIZATION)
-      .setDescription("Organization key")
-      .setExampleValue("my-org")
-      .setInternal(true)
-      .setSince("6.4");
   }
 
   @Override
@@ -125,7 +118,6 @@ public class GroupsAction implements UsersWsAction {
     checkArgument(pageSize <= MAX_PAGE_SIZE, "The '%s' parameter must be less than %s", PAGE_SIZE, MAX_PAGE_SIZE);
     return GroupsRequest.builder()
       .setLogin(request.mandatoryParam(PARAM_LOGIN))
-      .setOrganization(request.param(PARAM_ORGANIZATION))
       .setSelected(request.mandatoryParam(SELECTED))
       .setQuery(request.param(TEXT_QUERY))
       .setPage(request.mandatoryParamAsInt(PAGE))
@@ -168,7 +160,6 @@ public class GroupsAction implements UsersWsAction {
   private static class GroupsRequest {
 
     private final String login;
-    private final String organization;
     private final String query;
     private final String selected;
     private final Integer page;
@@ -176,7 +167,6 @@ public class GroupsAction implements UsersWsAction {
 
     private GroupsRequest(Builder builder) {
       this.login = builder.login;
-      this.organization = builder.organization;
       this.query = builder.query;
       this.selected = builder.selected;
       this.page = builder.page;
@@ -188,11 +178,6 @@ public class GroupsAction implements UsersWsAction {
     }
 
     @CheckForNull
-    public String getOrganization() {
-      return organization;
-    }
-
-    @CheckForNull
     public String getQuery() {
       return query;
     }
@@ -219,7 +204,6 @@ public class GroupsAction implements UsersWsAction {
 
   private static class Builder {
     private String login;
-    private String organization;
     private String query;
     private String selected;
     private Integer page;
@@ -234,11 +218,6 @@ public class GroupsAction implements UsersWsAction {
       return this;
     }
 
-    public Builder setOrganization(@Nullable String organization) {
-      this.organization = organization;
-      return this;
-    }
-
     public Builder setQuery(@Nullable String query) {
       this.query = query;
       return this;
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java
index 053f1d520d1..d3b7903c044 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/user/ws/SetHomepageAction.java
@@ -45,7 +45,6 @@ public class SetHomepageAction implements UsersWsAction {
   private static final String ACTION = "set_homepage";
 
   public static final String PARAM_TYPE = "type";
-  public static final String PARAM_ORGANIZATION = "organization";
   public static final String PARAM_COMPONENT = "component";
   public static final String PARAM_BRANCH = "branch";
   private static final String PARAMETER_REQUIRED = "Type %s requires a parameter '%s'";
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java
index a4edd459512..b28a25c45b2 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java
@@ -298,17 +298,10 @@ public class GroupsActionTest {
     assertThat(action.isInternal()).isFalse();
     assertThat(action.responseExampleAsString()).isNotEmpty();
 
-    assertThat(action.params()).extracting(Param::key).containsOnly("p", "q", "ps", "login", "selected", "organization");
+    assertThat(action.params()).extracting(Param::key).containsOnly("p", "q", "ps", "login", "selected");
 
     WebService.Param qualifiers = action.param("login");
     assertThat(qualifiers.isRequired()).isTrue();
-
-    WebService.Param organization = action.param("organization");
-    assertThat(organization.isRequired()).isFalse();
-    assertThat(organization.description()).isEqualTo("Organization key");
-    assertThat(organization.isInternal()).isTrue();
-    assertThat(organization.exampleValue()).isEqualTo("my-org");
-    assertThat(organization.since()).isEqualTo("6.4");
   }
 
   private GroupDto insertGroup(String name, String description) {