Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Adapt to changes in Gerrit core
Adapt to changes in Gerrit core
Change-Id: I5e1cbf15f66668b6992dcda18e961f2988a90bef
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 6138171..bfe18c1 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;
@@ -106,7 +107,7 @@
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 (ExternalId.isValidUsername(ident)) {
state = accountCache.getByUsername(ident);
} else {
return null;