Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Format Java files with google-java-format 1.7
Change-Id: I24e978747ac5c1b592dc723c5efd28ec5747995a
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/Reviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/Reviewers.java
index faa5088..d21c538 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/Reviewers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/Reviewers.java
@@ -110,9 +110,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/server/ReviewersResolver.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/ReviewersResolver.java
index 6f5c202..f7fe4f3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/ReviewersResolver.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/ReviewersResolver.java
@@ -145,8 +145,7 @@
String group) {
try {
Set<Account.Id> accounts =
- groupMembers
- .listAccounts(groupsCollection.get().parse(group).getGroupUUID(), project)
+ groupMembers.listAccounts(groupsCollection.get().parse(group).getGroupUUID(), project)
.stream()
.filter(Account::isActive)
.map(Account::getId)
