opendev/gerrit
Code Issues Proposed changes

Merge "RelatedChangesSorter#sort: Improve error message"

Browse Source
This commit is contained in:
Edwin Kempin
2019-11-27 12:52:32 +00:00
committed by Gerrit Code Review
parent 00a77ac45e 192d05a071
commit 49b4f7903d
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/com/google/gerrit/server/restapi/change/RelatedChangesSorter.java
View File

@@ -16,6 +16,7 @@ package com.google.gerrit.server.restapi.change;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toMap;
import com.google.auto.value.AutoValue; import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
@@ -76,7 +77,15 @@ class RelatedChangesSorter {
// Map of all patch sets, keyed by commit SHA-1. // Map of all patch sets, keyed by commit SHA-1.
Map<ObjectId, PatchSetData> byId = collectById(in); Map<ObjectId, PatchSetData> byId = collectById(in);
PatchSetData start = byId.get(startPs.commitId()); PatchSetData start = byId.get(startPs.commitId());
checkArgument(start != null, "%s not found in %s", startPs, in); requireNonNull(
start,
() ->
String.format(
"commit %s of patch set %s not found in %s",
startPs.commitId().name(),
startPs.id(),
byId.entrySet().stream()
.collect(toMap(e -> e.getKey().name(), e -> e.getValue().patchSet().id()))));
// Map of patch set -> immediate parent. // Map of patch set -> immediate parent.
ListMultimap<PatchSetData, PatchSetData> parents = ListMultimap<PatchSetData, PatchSetData> parents =