commit | 5c3b6a0302a5a082c762555ad94ea0ec6cc154c7 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Mon Apr 15 02:13:30 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Apr 15 02:13:30 2019 +0000 |
tree | c58fe696719d927b21be39dd35fa724bd23e4f75 | |
parent | dd8553ded7bddb79852f32b1f64b4c3ee321956a [diff] | |
parent | 25c4d9bdcbd855b553980f8135ad5b38dfe9e4ed [diff] |
Merge "Adapt to new TestAccount methods"
diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java index d2b29c9..1d49922 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java +++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
@@ -216,10 +216,7 @@ for (Map.Entry<String, LabelInfo> labelEntry : labels.entrySet()) { if (labelEntry.getValue().all.size() > 0) { OptionalInt maxVote = - labelEntry - .getValue() - .all - .stream() + labelEntry.getValue().all.stream() .filter(o -> o.value != null) .mapToInt(i -> i.value) .max();
diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java index c5071b7..5ad129f 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
@@ -1114,8 +1114,7 @@ } private ImmutableList<ChangeInfo> sortedChanges(List<ChangeInfo> changes) { - return changes - .stream() + return changes.stream() .sorted(comparing((ChangeInfo c) -> c.branch).thenComparing(c -> c._number)) .collect(toImmutableList()); }