commit 54030a46ed17e097f09fdc586ebe1859569e1383
author Edwin Kempin <ekempin@google.com> Mon Jul 17 13:58:32 2017 +0200
committer Edwin Kempin <ekempin@google.com> Mon Jul 17 14:05:09 2017 +0200
tree 7ec534741cce58128ac3a26a0734300da078df25
parent a4c9e7eb2e3165c981f518457e323d1154d6efc4

Adapt to change in core that includes inactive accounts in query results

By default account queries now return also inactive accounts. To keep
the old behaviour of suggesting only active accounts we must now add a
predicate for "is:active" explicitly.

Change-Id: I021294187d17ca94f08267c56c579bdd6ab4ac59
Signed-off-by: Edwin Kempin <ekempin@google.com>

src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java b/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java
index 1104af5..3f90049 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java
@@ -35,6 +35,7 @@
 import com.google.gerrit.server.account.ListGroupMembership;
 import com.google.gerrit.server.project.ProjectControl;
 import com.google.gerrit.server.query.QueryParseException;
+import com.google.gerrit.server.query.account.AccountPredicates;
 import com.google.gerrit.server.query.account.AccountQueryBuilder;
 import com.google.gerrit.server.query.account.AccountQueryProcessor;
 import com.google.gwtorm.server.OrmException;
@@ -143,7 +144,10 @@
   public Collection<GroupReference> suggest(String name, @Nullable ProjectControl project) {
     try {
       return Lists.transform(
-          queryProcessor.setLimit(MAX).query(queryBuilder.defaultQuery(name)).entities(),
+          queryProcessor
+              .setLimit(MAX)
+              .query(AccountPredicates.andActive(queryBuilder.defaultQuery(name)))
+              .entities(),
           new Function<AccountState, GroupReference>() {
             @Override
             public GroupReference apply(AccountState state) {