Adapt to changes in Gerrit core
The definition of the regular expression for a user name was moved from
the Account class into the ExternalId class.
Change-Id: Ib97e2f4201f7c021f935cf098fd4c03cfa5138b3
Signed-off-by: Edwin Kempin <ekempin@google.com>
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 23e0242..e31c3d0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java
@@ -34,6 +34,7 @@
import com.google.gerrit.server.account.GroupBackend;
import com.google.gerrit.server.account.GroupMembership;
import com.google.gerrit.server.account.ListGroupMembership;
+import com.google.gerrit.server.account.externalids.ExternalId;
import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.query.account.AccountPredicates;
import com.google.gerrit.server.query.account.AccountQueryBuilder;
@@ -107,7 +108,7 @@
Optional<AccountState> state;
if (ident.matches(ACCOUNT_ID_PATTERN)) {
state = accountCache.get(new Account.Id(Integer.parseInt(ident)));
- } else if (ident.matches(Account.USER_NAME_PATTERN)) {
+ } else if (ident.matches(ExternalId.USER_NAME_PATTERN_REGEX)) {
state = accountCache.getByUsername(ident);
} else {
return null;