From c37acf929325885ac696865bc5669bda50fcca0b Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Tue, 13 Jun 2017 13:52:14 +0200
Subject: [PATCH] Add missing UserGroupsService in WsClient

---
 .../java/org/sonarqube/ws/client/DefaultWsClient.java     | 8 ++++++++
 .../src/main/java/org/sonarqube/ws/client/WsClient.java   | 3 +++
 .../sonarqube/ws/client/usergroup/AddUserWsRequest.java   | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java
index 6f80e6b66e5..7633c5cf7fc 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java
@@ -36,6 +36,7 @@ import org.sonarqube.ws.client.rule.RulesService;
 import org.sonarqube.ws.client.setting.SettingsService;
 import org.sonarqube.ws.client.system.SystemService;
 import org.sonarqube.ws.client.user.UsersService;
+import org.sonarqube.ws.client.usergroup.UserGroupsService;
 import org.sonarqube.ws.client.usertoken.UserTokensService;
 import org.sonarqube.ws.client.webhook.WebhooksService;
 
@@ -55,6 +56,7 @@ class DefaultWsClient implements WsClient {
   private final QualityProfilesService qualityProfilesService;
   private final IssuesService issuesService;
   private final UsersService usersService;
+  private final UserGroupsService userGroupsService;
   private final UserTokensService userTokensService;
   private final QualityGatesService qualityGatesService;
   private final MeasuresService measuresService;
@@ -77,6 +79,7 @@ class DefaultWsClient implements WsClient {
     this.qualityProfilesService = new QualityProfilesService(wsConnector);
     this.issuesService = new IssuesService(wsConnector);
     this.usersService = new UsersService(wsConnector);
+    this.userGroupsService = new UserGroupsService(wsConnector);
     this.userTokensService = new UserTokensService(wsConnector);
     this.qualityGatesService = new QualityGatesService(wsConnector);
     this.measuresService = new MeasuresService(wsConnector);
@@ -131,6 +134,11 @@ class DefaultWsClient implements WsClient {
     return usersService;
   }
 
+  @Override
+  public UserGroupsService userGroups() {
+    return userGroupsService;
+  }
+
   @Override
   public UserTokensService userTokens() {
     return userTokensService;
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java
index 9220614689f..93062a58e4a 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java
@@ -36,6 +36,7 @@ import org.sonarqube.ws.client.rule.RulesService;
 import org.sonarqube.ws.client.setting.SettingsService;
 import org.sonarqube.ws.client.system.SystemService;
 import org.sonarqube.ws.client.user.UsersService;
+import org.sonarqube.ws.client.usergroup.UserGroupsService;
 import org.sonarqube.ws.client.usertoken.UserTokensService;
 import org.sonarqube.ws.client.webhook.WebhooksService;
 
@@ -72,6 +73,8 @@ public interface WsClient {
 
   UsersService users();
 
+  UserGroupsService userGroups();
+
   UserTokensService userTokens();
 
   QualityGatesService qualityGates();
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroup/AddUserWsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroup/AddUserWsRequest.java
index 63cb948ef9b..b48108ca3f1 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroup/AddUserWsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/usergroup/AddUserWsRequest.java
@@ -63,7 +63,7 @@ public class AddUserWsRequest {
   }
 
   public static class Builder {
-    private long id;
+    private Long id;
     private String name;
     private String login;
     private String organization;
-- 
2.39.5