From 3efa1058b214469c3c612cd38909d453aa7e8af9 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Mon, 28 Jan 2019 07:21:29 -0800 Subject: Upgrade google-java-format to 1.7 This new version has the nice feature of putting multiple chained method calls before a .stream() on a single line. The diff is a bit large but it's removing a lot of newlines which is nice. Change-Id: I260b620aa6a1bc77b06be9672a1f281ab0d0d0f8 --- Documentation/dev-contributing.txt | 2 +- Documentation/dev-eclipse.txt | 2 +- .../com/google/gerrit/acceptance/api/change/ChangeIT.java | 4 +--- .../google/gerrit/acceptance/api/revision/RevisionIT.java | 15 +++------------ .../gerrit/acceptance/pgm/AbstractReindexTests.java | 6 +----- .../gerrit/acceptance/rest/change/DraftChangeIT.java | 3 +-- .../gerrit/acceptance/rest/change/SuggestReviewersIT.java | 3 +-- .../google/gerrit/acceptance/rest/config/KillTaskIT.java | 3 +-- .../gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java | 10 ++-------- .../elasticsearch/ElasticIndexVersionDiscovery.java | 9 +++------ .../java/com/google/gerrit/lucene/LuceneChangeIndex.java | 3 +-- .../java/com/google/gerrit/server/ModuleOverloader.java | 9 +++------ .../com/google/gerrit/server/ReviewerRecommender.java | 4 +--- .../main/java/com/google/gerrit/server/ReviewersUtil.java | 3 +-- .../java/com/google/gerrit/server/StarredChangesUtil.java | 6 ++---- .../gerrit/server/account/AccountByEmailCacheImpl.java | 4 +--- .../com/google/gerrit/server/account/AccountControl.java | 4 +--- .../com/google/gerrit/server/account/AccountManager.java | 6 ++---- .../com/google/gerrit/server/account/AccountResolver.java | 5 +---- .../com/google/gerrit/server/account/ChangeUserName.java | 3 +-- .../com/google/gerrit/server/account/DeleteEmail.java | 7 +------ .../google/gerrit/server/account/DeleteExternalIds.java | 6 +----- .../gerrit/server/account/DeleteWatchedProjects.java | 3 +-- .../gerrit/server/account/InternalGroupBackend.java | 4 +--- .../gerrit/server/account/UniversalGroupBackend.java | 3 +-- .../com/google/gerrit/server/change/ChangeInserter.java | 3 +-- .../java/com/google/gerrit/server/change/ChangeJson.java | 11 +++-------- .../java/com/google/gerrit/server/change/PostReview.java | 11 +++-------- .../java/com/google/gerrit/server/git/ReceiveCommits.java | 4 +--- .../google/gerrit/server/index/change/ChangeField.java | 3 +-- .../google/gerrit/server/mail/receive/MailProcessor.java | 9 +++------ .../google/gerrit/server/mail/receive/RawMailParser.java | 5 +---- .../com/google/gerrit/server/mail/send/CommentSender.java | 3 +-- .../com/google/gerrit/server/notedb/ChangeBundle.java | 4 +--- .../gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java | 4 +--- .../java/com/google/gerrit/server/project/DeleteRef.java | 3 +-- .../google/gerrit/server/project/ProjectCacheImpl.java | 3 +-- .../gerrit/server/query/change/ChangeQueryBuilder.java | 9 ++------- .../gerrit/server/query/change/SubmitRecordPredicate.java | 3 +-- .../gerrit/server/query/change/SubmittablePredicate.java | 3 +-- .../java/com/google/gerrit/server/schema/Schema_135.java | 7 ++----- .../gerrit/server/index/change/ChangeFieldTest.java | 3 +-- .../server/query/change/AbstractQueryChangesTest.java | 8 ++------ .../java/com/google/gerrit/testutil/FakeEmailSender.java | 3 +-- .../java/com/google/gerrit/sshd/ChangeArgumentParser.java | 4 +--- .../google/gerrit/sshd/commands/SetMembersCommand.java | 3 +-- tools/setup_gjf.sh | 2 +- 47 files changed, 65 insertions(+), 170 deletions(-) diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt index db68d9d4b1..6b51cbe56e 100644 --- a/Documentation/dev-contributing.txt +++ b/Documentation/dev-contributing.txt @@ -153,7 +153,7 @@ Guide]. To format Java source code, Gerrit uses the link:https://github.com/google/google-java-format[`google-java-format`] -tool (version 1.6), and to format Bazel BUILD, WORKSPACE and .bzl files the +tool (version 1.7), and to format Bazel BUILD, WORKSPACE and .bzl files the link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`] tool (version 0.20.0). These tools automatically apply format according to the style guides; this diff --git a/Documentation/dev-eclipse.txt b/Documentation/dev-eclipse.txt index 39fa333aa6..810a0ba3fa 100644 --- a/Documentation/dev-eclipse.txt +++ b/Documentation/dev-eclipse.txt @@ -47,7 +47,7 @@ Filters on a folder, they will be overwritten the next time you run To format source code, Gerrit uses the link:https://github.com/google/google-java-format[`google-java-format`] -tool (version 1.3), which automatically formats code to follow the +tool (version 1.7), which automatically formats code to follow the style guide. See link:dev-contributing.html#style[Code Style] for the instruction how to set up command line tool that uses this formatter. The Eclipse plugin is provided that allows to format with the same diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java index 56c85d170f..e2d77153b5 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -2663,9 +2663,7 @@ public class ChangeIT extends AbstractDaemonTest { throws Exception { ChangeInfo c = gApi.changes().id(changeId).get(EnumSet.of(ListChangesOption.DETAILED_LABELS)); Set states = - c.reviewers - .entrySet() - .stream() + c.reviewers.entrySet().stream() .filter(e -> e.getValue().stream().anyMatch(a -> a._accountId == accountId.get())) .map(e -> e.getKey()) .collect(toSet()); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java index 6447044f56..3f7a7e5854 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java @@ -206,11 +206,7 @@ public class RevisionIT extends AbstractDaemonTest { setApiUser(admin); gApi.changes().id(changeId).reviewer(user.username).deleteVote("Code-Review"); Optional crUser = - get(changeId, DETAILED_LABELS) - .labels - .get("Code-Review") - .all - .stream() + get(changeId, DETAILED_LABELS).labels.get("Code-Review").all.stream() .filter(a -> a._accountId == user.id.get()) .findFirst(); assertThat(crUser.isPresent()).isTrue(); @@ -225,13 +221,8 @@ public class RevisionIT extends AbstractDaemonTest { revision(r).review(in); ApprovalInfo cr = - gApi.changes() - .id(changeId) - .get(EnumSet.of(ListChangesOption.DETAILED_LABELS)) - .labels - .get("Code-Review") - .all - .stream() + gApi.changes().id(changeId).get(EnumSet.of(ListChangesOption.DETAILED_LABELS)).labels + .get("Code-Review").all.stream() .filter(a -> a._accountId == user.getId().get()) .findFirst() .get(); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java index 6e54ae1ae9..cca66b38ce 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java @@ -66,11 +66,7 @@ public abstract class AbstractReindexTests extends StandaloneSiteTest { .containsExactly(adminId.get()); // Query group index assertThat( - gApi.groups() - .query("Group") - .withOption(MEMBERS) - .get() - .stream() + gApi.groups().query("Group").withOption(MEMBERS).get().stream() .flatMap(g -> g.members.stream()) .map(a -> a._accountId)) .containsExactly(adminId.get()); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/DraftChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/DraftChangeIT.java index da7d7b556f..3008f396e9 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/DraftChangeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/DraftChangeIT.java @@ -310,8 +310,7 @@ public class DraftChangeIT extends AbstractDaemonTest { // Change status in NoteDb. PatchSetState patchSetState = draftStatus ? PatchSetState.DRAFT : PatchSetState.PUBLISHED; - patchSets - .stream() + patchSets.stream() .map(PatchSet::getId) .map(ctx::getUpdate) .forEach(changeUpdate -> changeUpdate.setPatchSetState(patchSetState)); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java index b4fef08b7b..653481048a 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java @@ -451,8 +451,7 @@ public class SuggestReviewersIT extends AbstractDaemonTest { List expectedUsers, List expectedGroups) { List actualAccountIds = - actual - .stream() + actual.stream() .filter(i -> i.account != null) .map(i -> i.account._accountId) .collect(toList()); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/KillTaskIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/KillTaskIT.java index f05ecce860..2c907e5fef 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/KillTaskIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/KillTaskIT.java @@ -35,8 +35,7 @@ public class KillTaskIT extends AbstractDaemonTest { r.consume(); Optional id = - result - .stream() + result.stream() .filter(t -> "Log File Compressor".equals(t.command)) .map(t -> t.id) .findFirst(); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java index 1d2f0e04c6..183ef8f6d8 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java @@ -270,8 +270,7 @@ public class NoteDbPrimaryIT extends AbstractDaemonTest { assert_().fail("expected read-only exception"); } catch (RestApiException e) { Optional oe = - Throwables.getCausalChain(e) - .stream() + Throwables.getCausalChain(e).stream() .filter(x -> x instanceof OrmRuntimeException) .findFirst(); assertThat(oe.isPresent()).named("OrmRuntimeException in causal chain of " + e).isTrue(); @@ -523,12 +522,7 @@ public class NoteDbPrimaryIT extends AbstractDaemonTest { } private List getReviewers(Change.Id id) throws Exception { - return gApi.changes() - .id(id.get()) - .get() - .reviewers - .values() - .stream() + return gApi.changes().id(id.get()).get().reviewers.values().stream() .flatMap(Collection::stream) .map(a -> new Account.Id(a._accountId)) .collect(toList()); diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java index 249e93cbad..8b343c2459 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java @@ -55,11 +55,8 @@ class ElasticIndexVersionDiscovery { } return new JsonParser() - .parse(AbstractElasticIndex.getContent(response)) - .getAsJsonObject() - .entrySet() - .stream() - .map(e -> e.getKey().replace(name, "")) - .collect(toList()); + .parse(AbstractElasticIndex.getContent(response)).getAsJsonObject().entrySet().stream() + .map(e -> e.getKey().replace(name, "")) + .collect(toList()); } } diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java index 4adc3e6afd..ce5ab71bec 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java @@ -589,8 +589,7 @@ public class LuceneChangeIndex implements ChangeIndex { } private static List copyAsBytes(Collection fields) { - return fields - .stream() + return fields.stream() .map( f -> { BytesRef ref = f.binaryValue(); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ModuleOverloader.java b/gerrit-server/src/main/java/com/google/gerrit/server/ModuleOverloader.java index 7083e6d743..9a8fe845d2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ModuleOverloader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ModuleOverloader.java @@ -27,8 +27,7 @@ public class ModuleOverloader { // group candidates by annotation existence Map> grouped = - overrideCandidates - .stream() + overrideCandidates.stream() .collect( Collectors.groupingBy(m -> m.getClass().getAnnotation(ModuleImpl.class) != null)); @@ -44,16 +43,14 @@ public class ModuleOverloader { } // swipe cache implementation with alternative provided in lib - return modules - .stream() + return modules.stream() .map( m -> { ModuleImpl a = m.getClass().getAnnotation(ModuleImpl.class); if (a == null) { return m; } - return overrides - .stream() + return overrides.stream() .filter( o -> o.getClass() diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java b/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java index 27af787020..1d28e05916 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java @@ -182,9 +182,7 @@ public class ReviewerRecommender { // Sort results Stream> sorted = - reviewerScores - .entrySet() - .stream() + reviewerScores.entrySet().stream() .sorted(Collections.reverseOrder(Map.Entry.comparingByValue())); List sortedSuggestions = sorted.map(Map.Entry::getKey).collect(toList()); return sortedSuggestions; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewersUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ReviewersUtil.java index 410dc5cd12..251390a63f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewersUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ReviewersUtil.java @@ -223,8 +223,7 @@ public class ReviewersUtil { throws OrmException { try (Timer0.Context ctx = metrics.loadAccountsLatency.start()) { List reviewer = - accountIds - .stream() + accountIds.stream() .map(accountLoader::get) .filter(Objects::nonNull) .map( diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java index d5f5deed3a..ae7488c254 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java @@ -269,8 +269,7 @@ public class StarredChangesUtil { public Set byChange(final Change.Id changeId, final String label) throws OrmException { try (Repository repo = repoManager.openRepository(allUsers)) { - return getRefNames(repo, RefNames.refsStarredChangesPrefix(changeId)) - .stream() + return getRefNames(repo, RefNames.refsStarredChangesPrefix(changeId)).stream() .map(Account.Id::parse) .filter(accountId -> hasStar(repo, changeId, accountId, label)) .collect(toSet()); @@ -285,8 +284,7 @@ public class StarredChangesUtil { public Set byAccount(final Account.Id accountId, final String label) throws OrmException { try (Repository repo = repoManager.openRepository(allUsers)) { - return getRefNames(repo, RefNames.REFS_STARRED_CHANGES) - .stream() + return getRefNames(repo, RefNames.REFS_STARRED_CHANGES).stream() .filter(refPart -> refPart.endsWith("/" + accountId.get())) .map(Change.Id::fromRefPart) .filter(changeId -> hasStar(repo, changeId, accountId, label)) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java index d45ecd89db..0a9d32d109 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java @@ -94,9 +94,7 @@ public class AccountByEmailCacheImpl implements AccountByEmailCache { r.add(a.getId()); } for (AccountState accountState : accountQueryProvider.get().byEmailPrefix(email)) { - if (accountState - .getExternalIds() - .stream() + if (accountState.getExternalIds().stream() .filter(e -> email.equals(e.email())) .findAny() .isPresent()) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java index 88a241158c..d6829092cf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java @@ -185,9 +185,7 @@ public class AccountControl { } private Set groupsOf(IdentifiedUser user) { - return user.getEffectiveGroups() - .getKnownGroups() - .stream() + return user.getEffectiveGroups().getKnownGroups().stream() .filter(a -> !SystemGroupBackend.isSystemGroup(a)) .collect(toSet()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java index ee337981db..21fb2800c8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java @@ -395,15 +395,13 @@ public class AccountManager { throws OrmException, AccountException, IOException { try (ReviewDb db = schema.open()) { Collection filteredExtIdsByScheme = - ExternalId.from(db.accountExternalIds().byAccount(to).toList()) - .stream() + ExternalId.from(db.accountExternalIds().byAccount(to).toList()).stream() .filter(e -> e.isScheme(who.getExternalIdKey().scheme())) .collect(toSet()); if (!filteredExtIdsByScheme.isEmpty() && (filteredExtIdsByScheme.size() > 1 - || !filteredExtIdsByScheme - .stream() + || !filteredExtIdsByScheme.stream() .filter(e -> e.key().equals(who.getExternalIdKey())) .findAny() .isPresent())) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java index 7e1157ccfa..8691f86d6e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java @@ -178,10 +178,7 @@ public class AccountResolver { // At this point we have no clue. Just perform a whole bunch of suggestions // and pray we come up with a reasonable result list. - return accountQueryProvider - .get() - .byDefault(nameOrEmail) - .stream() + return accountQueryProvider.get().byDefault(nameOrEmail).stream() .map(a -> a.getAccount().getId()) .collect(toSet()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java index b58edfb4c6..9b076f8fc3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java @@ -74,8 +74,7 @@ public class ChangeUserName implements Callable { throws OrmException, NameAlreadyUsedException, InvalidUserNameException, IOException, ConfigInvalidException { Collection old = - ExternalId.from(db.accountExternalIds().byAccount(user.getAccountId()).toList()) - .stream() + ExternalId.from(db.accountExternalIds().byAccount(user.getAccountId()).toList()).stream() .filter(e -> e.isScheme(SCHEME_USERNAME)) .collect(toSet()); if (!old.isEmpty()) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteEmail.java index 79edaa786a..ecddc8c679 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteEmail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteEmail.java @@ -75,12 +75,7 @@ public class DeleteEmail implements RestModifyView } Set extIds = - dbProvider - .get() - .accountExternalIds() - .byAccount(user.getAccountId()) - .toList() - .stream() + dbProvider.get().accountExternalIds().byAccount(user.getAccountId()).toList().stream() .map(ExternalId::from) .filter(e -> email.equals(e.email())) .collect(toSet()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteExternalIds.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteExternalIds.java index 7ab8aaf197..a0e084ccf1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteExternalIds.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteExternalIds.java @@ -70,11 +70,7 @@ public class DeleteExternalIds implements RestModifyView externalIdMap = - dbProvider - .get() - .accountExternalIds() - .byAccount(resource.getUser().getAccountId()) - .toList() + dbProvider.get().accountExternalIds().byAccount(resource.getUser().getAccountId()).toList() .stream() .map(ExternalId::from) .collect(toMap(i -> i.key(), i -> i)); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java index 8cd979f6e4..95ef384368 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java @@ -63,8 +63,7 @@ public class DeleteWatchedProjects Account.Id accountId = rsrc.getUser().getAccountId(); watchConfig.deleteProjectWatches( accountId, - input - .stream() + input.stream() .map(w -> ProjectWatchKey.create(new Project.NameKey(w.project), w.filter)) .collect(toList())); accountCache.evict(accountId); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java index b0ada0df44..38efbbf1a6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java @@ -65,9 +65,7 @@ public class InternalGroupBackend implements GroupBackend { @Override public Collection suggest(final String name, final ProjectControl project) { - return groupCache - .all() - .stream() + return groupCache.all().stream() .filter( group -> // startsWithIgnoreCase && isVisible diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/UniversalGroupBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/UniversalGroupBackend.java index a3223d9bef..4c66e1b3db 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/UniversalGroupBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/UniversalGroupBackend.java @@ -222,8 +222,7 @@ public class UniversalGroupBackend implements GroupBackend { @Override public void check() throws StartupException { String invalid = - cfg.getSubsections("groups") - .stream() + cfg.getSubsections("groups").stream() .filter( sub -> { AccountGroup.UUID uuid = new AccountGroup.UUID(sub); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java index ad49701d86..19085838f9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java @@ -412,8 +412,7 @@ public class ChangeInserter implements InsertChangeOp { private Set filterOnChangeVisibility( final ReviewDb db, final ChangeNotes notes, Set accounts) { - return accounts - .stream() + return accounts.stream() .filter( accountId -> { try { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java index 41d101b253..d0d56e1086 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java @@ -771,9 +771,7 @@ public class ChangeJson { Maps.newHashMapWithExpectedSize(permittedLabels.size()); for (String label : permittedLabels.keySet()) { List permittedVotingRange = - permittedLabels - .get(label) - .stream() + permittedLabels.get(label).stream() .map(this::parseRangeValue) .filter(java.util.Objects::nonNull) .sorted() @@ -867,9 +865,7 @@ public class ChangeJson { } if (detailed) { - labels - .entrySet() - .stream() + labels.entrySet().stream() .filter(e -> labelTypes.byLabel(e.getKey()) != null) .forEach(e -> setLabelValues(labelTypes.byLabel(e.getKey()), e.getValue())); } @@ -1090,8 +1086,7 @@ public class ChangeJson { } private Collection toAccountInfo(Collection accounts) { - return accounts - .stream() + return accounts.stream() .map(accountLoader::get) .sorted(AccountInfoComparator.ORDER_NULLS_FIRST) .collect(toList()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java index 0d83020d76..2fa5642540 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java @@ -897,17 +897,13 @@ public class PostReview implements RestModifyView } private Set readExistingComments(ChangeContext ctx) throws OrmException { - return commentsUtil - .publishedByChange(ctx.getDb(), ctx.getNotes()) - .stream() + return commentsUtil.publishedByChange(ctx.getDb(), ctx.getNotes()).stream() .map(CommentSetEntry::create) .collect(toSet()); } private Set readExistingRobotComments(ChangeContext ctx) throws OrmException { - return commentsUtil - .robotCommentsByChange(ctx.getNotes()) - .stream() + return commentsUtil.robotCommentsByChange(ctx.getNotes()).stream() .map(CommentSetEntry::create) .collect(toSet()); } @@ -1166,8 +1162,7 @@ public class PostReview implements RestModifyView if (!reduced.isEmpty()) { throw new ResourceConflictException( "Cannot reduce vote on labels for closed change: " - + reduced - .stream() + + reduced.stream() .map(p -> p.getLabel()) .distinct() .sorted() diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 4bd51cfe5e..ae94021dda 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -695,9 +695,7 @@ public class ReceiveCommits { } List updated = - replaceByChange - .values() - .stream() + replaceByChange.values().stream() .filter(r -> !r.skip && r.inputCommand.getResult() == OK) .sorted(comparingInt(r -> r.notes.getChangeId().get())) .collect(toList()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java index b8acadc6e9..7a2fb05bc3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java @@ -563,8 +563,7 @@ public class ChangeField { @VisibleForTesting static List parseSubmitRecords(Collection values) { - return values - .stream() + return values.stream() .map(v -> GSON.fromJson(v, StoredSubmitRecord.class).toSubmitRecord()) .collect(toList()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailProcessor.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailProcessor.java index 07cbc20719..020c74b7c6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailProcessor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailProcessor.java @@ -181,8 +181,7 @@ public class MailProcessor { // comments from the outbound email. // TODO(hiesel) Also filter by original comment author. Collection comments = - cd.publishedComments() - .stream() + cd.publishedComments().stream() .filter(c -> (c.writtenOn.getTime() / 1000) == (metadata.timestamp.getTime() / 1000)) .sorted(CommentsUtil.COMMENT_ORDER) .collect(toList()); @@ -349,8 +348,7 @@ public class MailProcessor { private Set existingMessageIds(ChangeData cd) throws OrmException { Set existingMessageIds = new HashSet<>(); - cd.messages() - .stream() + cd.messages().stream() .forEach( m -> { String messageId = CommentsUtil.extractMessageId(m.getTag()); @@ -358,8 +356,7 @@ public class MailProcessor { existingMessageIds.add(messageId); } }); - cd.publishedComments() - .stream() + cd.publishedComments().stream() .forEach( c -> { String messageId = CommentsUtil.extractMessageId(c.tag); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java index 3ba9de762c..2ee1ea789b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java @@ -86,10 +86,7 @@ public class RawMailParser { } // Add additional headers - mimeMessage - .getHeader() - .getFields() - .stream() + mimeMessage.getHeader().getFields().stream() .filter(f -> !MAIN_HEADERS.contains(f.getName().toLowerCase())) .forEach(f -> messageBuilder.addAdditionalHeader(f.getName() + ": " + f.getBody())); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentSender.java index d3c456c340..d827503b1f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentSender.java @@ -522,8 +522,7 @@ public class CommentSender extends ReplyToChangeSender { } private List> commentBlocksToSoyData(List blocks) { - return blocks - .stream() + return blocks.stream() .map( b -> { Map map = new HashMap<>(); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java index acfbbacf4b..9eb4532f3c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java @@ -705,9 +705,7 @@ public class ChangeBundle { private static boolean createdOnIsMonotonic( Map patchSets, Set limitToIds) { List orderedById = - patchSets - .values() - .stream() + patchSets.values().stream() .filter(ps -> limitToIds.contains(ps.getId())) .sorted(ChangeUtil.PS_ID_ORDER) .collect(toList()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java index c970cb0adf..8370df1ce2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java @@ -409,9 +409,7 @@ public class ChangeRebuilderImpl extends ChangeRebuilder { private static List getComments( ChangeBundle bundle, String serverId, PatchLineComment.Status status, PatchSet ps) { - return bundle - .getPatchLineComments() - .stream() + return bundle.getPatchLineComments().stream() .filter(c -> c.getPatchSetId().equals(ps.getId()) && c.getStatus() == status) .map(plc -> plc.asComment(serverId)) .sorted(CommentsUtil.COMMENT_ORDER) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java index e950cc86cf..a0b297a88d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java @@ -180,8 +180,7 @@ public class DeleteRef { List refs = prefix == null ? refsToDelete - : refsToDelete - .stream() + : refsToDelete.stream() .map(ref -> ref.startsWith(prefix) ? ref : prefix + ref) .collect(toList()); for (String ref : refs) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java index e124a7425c..c747a14fd3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java @@ -216,8 +216,7 @@ public class ProjectCacheImpl implements ProjectCache { @Override public Set guessRelevantGroupUUIDs() { - return all() - .stream() + return all().stream() .map(n -> byName.getIfPresent(n.get())) .filter(Objects::nonNull) .flatMap(p -> p.getConfig().getAllGroupUUIDs().stream()) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index 63ec45c174..de677c61e3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -937,8 +937,7 @@ public class ChangeQueryBuilder extends QueryBuilder { @Operator public Predicate reviewer(String who) throws QueryParseException, OrmException { return Predicate.or( - parseAccount(who) - .stream() + parseAccount(who).stream() .map(id -> ReviewerPredicate.reviewer(args, id)) .collect(toList())); } @@ -1135,11 +1134,7 @@ public class ChangeQueryBuilder extends QueryBuilder { private Set getMembers(AccountGroup.UUID g) throws OrmException { Set accounts; Set allMembers = - args.listMembers - .get() - .setRecursive(true) - .apply(g) - .stream() + args.listMembers.get().setRecursive(true).apply(g).stream() .map(a -> new Account.Id(a._accountId)) .collect(toSet()); int maxTerms = args.indexConfig.maxTerms(); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java index 5b01ea2a05..451230f7b7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java @@ -31,8 +31,7 @@ class SubmitRecordPredicate extends ChangeIndexPredicate { return new SubmitRecordPredicate(status.name() + ',' + lowerLabel); } return Predicate.or( - accounts - .stream() + accounts.stream() .map(a -> new SubmitRecordPredicate(status.name() + ',' + lowerLabel + ',' + a.get())) .collect(toList())); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmittablePredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmittablePredicate.java index 0812c6a39b..8782cfdeef 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmittablePredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmittablePredicate.java @@ -28,8 +28,7 @@ class SubmittablePredicate extends ChangeIndexPredicate { @Override public boolean match(ChangeData cd) throws OrmException { - return cd.submitRecords(ChangeField.SUBMIT_RULE_OPTIONS_STRICT) - .stream() + return cd.submitRecords(ChangeField.SUBMIT_RULE_OPTIONS_STRICT).stream() .anyMatch(r -> r.status == status); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_135.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_135.java index 8e4d2e4398..f15e4c66d9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_135.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_135.java @@ -76,11 +76,8 @@ public class Schema_135 extends SchemaVersion { Set groups = Stream.concat( - config - .getAccessSection(AccessSection.GLOBAL_CAPABILITIES, true) - .getPermission(GlobalCapability.ADMINISTRATE_SERVER, true) - .getRules() - .stream() + config.getAccessSection(AccessSection.GLOBAL_CAPABILITIES, true) + .getPermission(GlobalCapability.ADMINISTRATE_SERVER, true).getRules().stream() .map(PermissionRule::getGroup), Stream.of(systemGroupBackend.getGroup(PROJECT_OWNERS))) .filter(g -> createRefsMetaConfigPermission.getRule(g) == null) diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeFieldTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeFieldTest.java index 3a4db30eeb..7ae39441a8 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeFieldTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeFieldTest.java @@ -109,8 +109,7 @@ public class ChangeFieldTest extends GerritBaseTests { private static void assertStoredRecordRoundTrip(SubmitRecord... records) { List recordList = ImmutableList.copyOf(records); List stored = - ChangeField.storedSubmitRecords(recordList) - .stream() + ChangeField.storedSubmitRecords(recordList).stream() .map(s -> new String(s, UTF_8)) .collect(toList()); assertThat(ChangeField.parseSubmitRecords(stored)) diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 0e0387113e..90261527b3 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -1772,10 +1772,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { gApi.groups().id(group).addMembers(user2.toString(), user3.toString()); List members = - gApi.groups() - .id(group) - .members() - .stream() + gApi.groups().id(group).members().stream() .map(a -> a._accountId.toString()) .collect(toList()); assertThat(members).contains(user2.toString()); @@ -2075,8 +2072,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { expectedStates.add("All-Users:refs/draft-comments/" + cs + "/" + u); } assertThat( - cd.getRefStates() - .stream() + cd.getRefStates().stream() .map(String::new) // Omit SHA-1, we're just concerned with the project/ref names. .map(s -> s.substring(0, s.lastIndexOf(':'))) diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/FakeEmailSender.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/FakeEmailSender.java index ed3e41fedf..c9281ef857 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/FakeEmailSender.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/FakeEmailSender.java @@ -134,8 +134,7 @@ public class FakeEmailSender implements EmailSender { public List getMessages(String changeId, String type) { final String idFooter = "\nGerrit-Change-Id: " + changeId + "\n"; final String typeFooter = "\nGerrit-MessageType: " + type + "\n"; - return getMessages() - .stream() + return getMessages().stream() .filter(in -> in.body().contains(idFooter) && in.body().contains(typeFooter)) .collect(toList()); } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java index 4488c711c2..51370c8376 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java @@ -102,9 +102,7 @@ public class ChangeArgumentParser { private List changeFromNotesFactory(String id, CurrentUser currentUser) throws OrmException, UnloggedFailure { - return changeNotesFactory - .create(db, parseId(id)) - .stream() + return changeNotesFactory.create(db, parseId(id)).stream() .map(changeNote -> controlForChange(changeNote, currentUser)) .filter(changeControl -> changeControl.isPresent()) .map(changeControl -> changeControl.get()) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java index 7d9cf31a81..071f2ef703 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java @@ -128,8 +128,7 @@ public class SetMembersCommand extends SshCommand { String action, GroupResource group, List accountIdList) throws UnsupportedEncodingException, IOException { String names = - accountIdList - .stream() + accountIdList.stream() .map( accountId -> MoreObjects.firstNonNull( diff --git a/tools/setup_gjf.sh b/tools/setup_gjf.sh index c450811f62..119f9af3d7 100755 --- a/tools/setup_gjf.sh +++ b/tools/setup_gjf.sh @@ -17,7 +17,7 @@ set -eu # Keep this version in sync with dev-contributing.txt. -VERSION=${1:-1.6} +VERSION=${1:-1.7} case "$VERSION" in 1.3) -- cgit v1.2.3