opendev/gerrit
Code Issues Proposed changes

Merge "Use AccountCache#maybeGet instead of AccountCache#get when firing events"

Browse Source
This commit is contained in:
Edwin Kempin
2018-01-26 17:22:48 +00:00
committed by Gerrit Code Review
parent 19a1a0985a a09712aab6
commit 0671cc65cb
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java
View File

@@ -556,7 +556,7 @@ abstract class SubmitStrategyOp implements BatchUpdateOp {
args.changeMerged.fire( args.changeMerged.fire(
updatedChange, updatedChange,
mergedPatchSet, mergedPatchSet,
args.accountCache.get(submitter.getAccountId()), args.accountCache.maybeGet(submitter.getAccountId()).orElse(null),
args.mergeTip.getCurrentTip().name(), args.mergeTip.getCurrentTip().name(),
ctx.getWhen()); ctx.getWhen());
} }

7
java/com/google/gerrit/server/restapi/change/PostReviewersOp.java
View File

@@ -23,6 +23,7 @@ import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ListMultimap; import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Streams;
import com.google.gerrit.common.Nullable; import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.api.changes.RecipientType; import com.google.gerrit.extensions.api.changes.RecipientType;
@@ -204,7 +205,11 @@ public class PostReviewersOp implements BatchUpdateOp {
accountsToNotify); accountsToNotify);
if (!addedReviewers.isEmpty()) { if (!addedReviewers.isEmpty()) {
List<AccountState> reviewers = List<AccountState> reviewers =
addedReviewers.stream().map(r -> accountCache.get(r.getAccountId())).collect(toList()); addedReviewers
.stream()
.map(r -> accountCache.maybeGet(r.getAccountId()))
.flatMap(Streams::stream)
.collect(toList());
reviewerAdded.fire(rsrc.getChange(), patchSet, reviewers, ctx.getAccount(), ctx.getWhen()); reviewerAdded.fire(rsrc.getChange(), patchSet, reviewers, ctx.getAccount(), ctx.getWhen());
} }
} }