SONAR-6476 SONAR-6477 Revert to id instead of groupId for consistency with other user groups WS

server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java

@@ -37,8 +37,8 @@ import static org.sonar.core.persistence.MyBatis.closeQuietly;
 
 public class AddUserAction implements UserGroupsWsAction {
 
-  private static final String PARAM_ID = "groupId";
-  private static final String PARAM_LOGIN = "userLogin";
+  private static final String PARAM_ID = "id";
+  private static final String PARAM_LOGIN = "login";
 
   private final DbClient dbClient;
   private final UserSession userSession;

server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java

@@ -36,8 +36,8 @@ import static org.sonar.core.persistence.MyBatis.closeQuietly;
 
 public class RemoveUserAction implements UserGroupsWsAction {
 
-  private static final String PARAM_ID = "groupId";
-  private static final String PARAM_LOGIN = "userLogin";
+  private static final String PARAM_ID = "id";
+  private static final String PARAM_LOGIN = "login";
 
   private final DbClient dbClient;
   private final UserSession userSession;

server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java

@@ -97,8 +97,8 @@ public class AddUserActionTest {
 
     userSession.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
     tester.newPostRequest("api/usergroups", "add_user")
-      .setParam("groupId", group.getId().toString())
-      .setParam("userLogin", user.getLogin())
+      .setParam("id", group.getId().toString())
+      .setParam("login", user.getLogin())
       .execute()
       .assertNoContent();
 
@@ -116,8 +116,8 @@ public class AddUserActionTest {
 
     userSession.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
     tester.newPostRequest("api/usergroups", "add_user")
-      .setParam("groupId", admins.getId().toString())
-      .setParam("userLogin", user.getLogin())
+      .setParam("id", admins.getId().toString())
+      .setParam("login", user.getLogin())
       .execute()
       .assertNoContent();
 
@@ -134,8 +134,8 @@ public class AddUserActionTest {
 
     userSession.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
     tester.newPostRequest("api/usergroups", "add_user")
-      .setParam("groupId", users.getId().toString())
-      .setParam("userLogin", user.getLogin())
+      .setParam("id", users.getId().toString())
+      .setParam("login", user.getLogin())
       .execute()
       .assertNoContent();
 
@@ -153,8 +153,8 @@ public class AddUserActionTest {
 
     userSession.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
     tester.newPostRequest("api/usergroups", "add_user")
-      .setParam("groupId", users.getId().toString())
-      .setParam("userLogin", user2.getLogin())
+      .setParam("id", users.getId().toString())
+      .setParam("login", user2.getLogin())
       .execute()
       .assertNoContent();
 
@@ -172,8 +172,8 @@ public class AddUserActionTest {
 
     userSession.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
     tester.newPostRequest("api/usergroups", "add_user")
-      .setParam("groupId", "42")
-      .setParam("userLogin", user.getLogin())
+      .setParam("id", "42")
+      .setParam("login", user.getLogin())
       .execute();
   }
 
@@ -186,8 +186,8 @@ public class AddUserActionTest {
 
     userSession.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
     tester.newPostRequest("api/usergroups", "add_user")
-      .setParam("groupId", group.getId().toString())
-      .setParam("userLogin", "my-admin")
+      .setParam("id", group.getId().toString())
+      .setParam("login", "my-admin")
       .execute();
   }
 

server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java

@@ -96,8 +96,8 @@ public class RemoveUserActionTest {
 
     userSession.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
     tester.newPostRequest("api/usergroups", "remove_user")
-      .setParam("groupId", group.getId().toString())
-      .setParam("userLogin", user.getLogin())
+      .setParam("id", group.getId().toString())
+      .setParam("login", user.getLogin())
       .execute()
       .assertNoContent();
 
@@ -114,8 +114,8 @@ public class RemoveUserActionTest {
 
     userSession.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
     tester.newPostRequest("api/usergroups", "remove_user")
-      .setParam("groupId", users.getId().toString())
-      .setParam("userLogin", user.getLogin())
+      .setParam("id", users.getId().toString())
+      .setParam("login", user.getLogin())
       .execute()
       .assertNoContent();
 
@@ -134,8 +134,8 @@ public class RemoveUserActionTest {
 
     userSession.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
     tester.newPostRequest("api/usergroups", "remove_user")
-      .setParam("groupId", admins.getId().toString())
-      .setParam("userLogin", user.getLogin())
+      .setParam("id", admins.getId().toString())
+      .setParam("login", user.getLogin())
       .execute()
       .assertNoContent();
 
@@ -152,8 +152,8 @@ public class RemoveUserActionTest {
 
     userSession.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
     tester.newPostRequest("api/usergroups", "remove_user")
-      .setParam("groupId", "42")
-      .setParam("userLogin", user.getLogin())
+      .setParam("id", "42")
+      .setParam("login", user.getLogin())
       .execute();
   }
 
@@ -166,8 +166,8 @@ public class RemoveUserActionTest {
 
     userSession.login("admin").setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);
     tester.newPostRequest("api/usergroups", "remove_user")
-      .setParam("groupId", group.getId().toString())
-      .setParam("userLogin", "my-admin")
+      .setParam("id", group.getId().toString())
+      .setParam("login", "my-admin")
       .execute();
   }
 

server/sonar-web/src/main/js/apps/groups/users-view.js

@@ -22,9 +22,9 @@ define([
         selectUrl: baseUrl + '/api/usergroups/add_user',
         deselectUrl: baseUrl + '/api/usergroups/remove_user',
         extra: {
-          groupId: this.model.id
+          id: this.model.id
         },
-        selectParameter: 'userLogin',
+        selectParameter: 'login',
         selectParameterValue: 'login',
         parse: function (r) {
           this.more = false;

server/sonar-web/src/main/js/apps/users/groups-view.js

@@ -23,9 +23,9 @@ define([
         selectUrl: baseUrl + '/api/usergroups/add_user',
         deselectUrl: baseUrl + '/api/usergroups/remove_user',
         extra: {
-          userLogin: this.model.id
+          login: this.model.id
         },
-        selectParameter: 'groupId',
+        selectParameter: 'id',
         selectParameterValue: 'id',
         parse: function (r) {
           this.more = false;