summaryrefslogtreecommitdiffstats
path: root/java/com/google/gerrit/server/query/account/InternalAccountQuery.java
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2019-03-14 09:01:59 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2019-03-14 09:08:30 +0900
commit7a519876e5eaec14a86d091962a767054530709e (patch)
treefe099a465a92f6ae30156703d13cfa9c564c454f /java/com/google/gerrit/server/query/account/InternalAccountQuery.java
parentfed5a852ffc4e21df6673715ac8febb52dd578d8 (diff)
parent70c569da872934815f43cb16db8286d14b6b2dfa (diff)
Merge branch 'stable-2.15' into stable-2.16
* stable-2.15: Upgrade google-java-format to 1.7 Change-Id: Ia7383822ef59fb60bb5559956a065ae46b2e4f4a
Diffstat (limited to 'java/com/google/gerrit/server/query/account/InternalAccountQuery.java')
-rw-r--r--java/com/google/gerrit/server/query/account/InternalAccountQuery.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/java/com/google/gerrit/server/query/account/InternalAccountQuery.java b/java/com/google/gerrit/server/query/account/InternalAccountQuery.java
index d0840d605b..e8e72a83b0 100644
--- a/java/com/google/gerrit/server/query/account/InternalAccountQuery.java
+++ b/java/com/google/gerrit/server/query/account/InternalAccountQuery.java
@@ -108,8 +108,7 @@ public class InternalAccountQuery extends InternalQuery<AccountState> {
return ImmutableList.of();
}
- return query(AccountPredicates.preferredEmail(email))
- .stream()
+ return query(AccountPredicates.preferredEmail(email)).stream()
.filter(a -> a.getAccount().getPreferredEmail().equals(email))
.collect(toList());
}
@@ -145,8 +144,7 @@ public class InternalAccountQuery extends InternalQuery<AccountState> {
for (int i = 0; i < emailList.size(); i++) {
String email = emailList.get(i);
Set<AccountState> matchingAccounts =
- r.get(i)
- .stream()
+ r.get(i).stream()
.filter(a -> a.getAccount().getPreferredEmail().equals(email))
.collect(toSet());
accountsByEmail.putAll(email, matchingAccounts);