opendev/gerrit
Code Issues Proposed changes

Merge "Inline AccountState#getExternalIds(Schema) into only caller"

Browse Source
This commit is contained in:
Patrick Hiesel
2019-07-31 13:57:27 +00:00
committed by Gerrit Code Review
parent 42b47b11c4 23569f73f6
commit efaa682c3a
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/com/google/gerrit/server/account/AccountManager.java
View File

@@ -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;
}

6
java/com/google/gerrit/server/account/AccountState.java
View File

@@ -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;