SONAR-19084 Compute the diffs between GitHub users and DB users

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
index e61938ac2a92320ea73e0594dd067a265c437fdd..84ab150041739581bd31af7c8261b8a11c227354 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
@@ -108,7 +108,7 @@ public class UserDao implements Dao {
     return selectUsers(dbSession, userQuery, pagination);
   }
 
-  private List<UserDto> selectUsers(DbSession dbSession, UserQuery userQuery, Pagination pagination) {
+  private static List<UserDto> selectUsers(DbSession dbSession, UserQuery userQuery, Pagination pagination) {
     if (userQuery.getUserUuids() != null) {
       return executeLargeInputs(
         userQuery.getUserUuids(),

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserQuery.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserQuery.java
index 003083807a85bbc9f966bd94d06b94fa516e3791..f9794b03508ec92223391df79fcaf4c6085c5838 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserQuery.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserQuery.java
@@ -38,10 +38,6 @@ public class UserQuery {
   private final Long sonarLintLastConnectionDateTo;
   private final Set<String> userUuids;
 
-  public static UserQuery copyWithNewRangeOfUserUuids(UserQuery userQuery, Collection<String> userUuids) {
-    return new UserQuery(userQuery, userUuids);
-  }
-
   private UserQuery(UserQuery userQuery, Collection<String> userUuids) {
     this.searchText = userQuery.getSearchText();
     this.isActive = userQuery.isActive();
@@ -66,6 +62,10 @@ public class UserQuery {
     this.userUuids = userUuids;
   }
 
+  public static UserQuery copyWithNewRangeOfUserUuids(UserQuery userQuery, Collection<String> userUuids) {
+    return new UserQuery(userQuery, userUuids);
+  }
+
   private static Long formatDateToInput(@Nullable OffsetDateTime dateTo) {
     if (dateTo == null) {
       return null;