diff options
author | Patrick Hiesel <hiesel@google.com> | 2019-07-31 13:57:27 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-31 13:57:27 +0000 |
commit | efaa682c3ac8298d61f06ca408d23a1b314ccd08 (patch) | |
tree | ad15dd1ac01520a5f1ddd29d5a7fcf66fa3c0e2d | |
parent | 42b47b11c4b0dc79cb895cebeb241fcdf279b918 (diff) | |
parent | 23569f73f64d799fadc50a4f1cc59abe6d320b1f (diff) |
Merge "Inline AccountState#getExternalIds(Schema) into only caller"
-rw-r--r-- | java/com/google/gerrit/server/account/AccountManager.java | 7 | ||||
-rw-r--r-- | java/com/google/gerrit/server/account/AccountState.java | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/java/com/google/gerrit/server/account/AccountManager.java b/java/com/google/gerrit/server/account/AccountManager.java index 7fb9997dd9..09757ebdbf 100644 --- a/java/com/google/gerrit/server/account/AccountManager.java +++ b/java/com/google/gerrit/server/account/AccountManager.java @@ -15,6 +15,7 @@ package com.google.gerrit.server.account; import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.gerrit.server.account.externalids.ExternalId.SCHEME_USERNAME; import com.google.common.base.Strings; @@ -448,8 +449,10 @@ public class AccountManager { "Delete External IDs on Update Link", to, (a, u) -> { - Collection<ExternalId> filteredExtIdsByScheme = - a.getExternalIds(who.getExternalIdKey().scheme()); + Set<ExternalId> filteredExtIdsByScheme = + a.getExternalIds().stream() + .filter(e -> e.key().isScheme(who.getExternalIdKey().scheme())) + .collect(toImmutableSet()); if (filteredExtIdsByScheme.isEmpty()) { return; } diff --git a/java/com/google/gerrit/server/account/AccountState.java b/java/com/google/gerrit/server/account/AccountState.java index 4a04f01024..debb2beaf1 100644 --- a/java/com/google/gerrit/server/account/AccountState.java +++ b/java/com/google/gerrit/server/account/AccountState.java @@ -14,7 +14,6 @@ package com.google.gerrit.server.account; -import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.gerrit.server.account.externalids.ExternalId.SCHEME_USERNAME; import com.google.common.base.MoreObjects; @@ -209,11 +208,6 @@ public class AccountState { return externalIds; } - /** The external identities that identify the account holder that match the given scheme. */ - public ImmutableSet<ExternalId> getExternalIds(String scheme) { - return externalIds.stream().filter(e -> e.key().isScheme(scheme)).collect(toImmutableSet()); - } - /** The project watches of the account. */ public ImmutableMap<ProjectWatchKey, ImmutableSet<NotifyType>> getProjectWatches() { return projectWatches; |