diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2019-03-14 09:01:59 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2019-03-14 09:08:30 +0900 |
| commit | 7a519876e5eaec14a86d091962a767054530709e (patch) | |
| tree | fe099a465a92f6ae30156703d13cfa9c564c454f /java/com/google/gerrit/server/restapi/account/PutPreferred.java | |
| parent | fed5a852ffc4e21df6673715ac8febb52dd578d8 (diff) | |
| parent | 70c569da872934815f43cb16db8286d14b6b2dfa (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/restapi/account/PutPreferred.java')
| -rw-r--r-- | java/com/google/gerrit/server/restapi/account/PutPreferred.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/com/google/gerrit/server/restapi/account/PutPreferred.java b/java/com/google/gerrit/server/restapi/account/PutPreferred.java index a8289878f4..265bf530ec 100644 --- a/java/com/google/gerrit/server/restapi/account/PutPreferred.java +++ b/java/com/google/gerrit/server/restapi/account/PutPreferred.java @@ -93,8 +93,7 @@ public class PutPreferred implements RestModifyView<AccountResource.Email, Input // check if the user has a matching email String matchingEmail = null; for (String email : - a.getExternalIds() - .stream() + a.getExternalIds().stream() .map(ExternalId::email) .filter(Objects::nonNull) .collect(toSet())) { @@ -121,8 +120,7 @@ public class PutPreferred implements RestModifyView<AccountResource.Email, Input + " by the following account(s): %s", preferredEmail, user.getAccountId(), - existingExtIdsWithThisEmail - .stream() + existingExtIdsWithThisEmail.stream() .map(ExternalId::accountId) .collect(toList())); exception.set( |