Merge branch 'stable-2.16'
* stable-2.16:
Format Java files with google-java-format 1.7
Upgrade bazlets to latest stable-2.16
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Update bazlets to fix build with bazel 0.23
Update bazlets to fix build with bazel 0.23
Change-Id: Ia374dd4b76a6213871a2b4b397ef51a4b7b8fbdd
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/Reviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/Reviewers.java
index a3441c0..9a3c0ec 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/Reviewers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/Reviewers.java
@@ -109,9 +109,7 @@
try {
Set<String> reviewers = findReviewers(changeId.get(), sections);
if (!reviewers.isEmpty()) {
- return resolver
- .resolve(reviewers, projectName, changeId.get(), null)
- .stream()
+ return resolver.resolve(reviewers, projectName, changeId.get(), null).stream()
.map(a -> suggestedReviewer(a))
.collect(toSet());
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java
index f715da2..2f40504 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java
@@ -114,8 +114,7 @@
String group) {
try {
Set<Account.Id> accounts =
- groupMembers
- .listAccounts(groupResolver.get().parse(group).getGroupUUID(), project)
+ groupMembers.listAccounts(groupResolver.get().parse(group).getGroupUUID(), project)
.stream()
.filter(Account::isActive)
.map(Account::getId)