diff options
author | David Pursehouse <dpursehouse@collab.net> | 2019-03-13 17:04:24 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2019-03-13 17:06:45 +0900 |
commit | 68925785119f47d9695df4231c5cc82dc440abb4 (patch) | |
tree | 2d648e043f4abe875b2db7cf72979816a0a7d478 | |
parent | a4b8fa769a072b005fba07520215a3565b1a07ec (diff) | |
parent | 3efa1058b214469c3c612cd38909d453aa7e8af9 (diff) |
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Upgrade google-java-format to 1.7
Change-Id: I08bad33a69e8425b699608a06b71ed767f061afd
86 files changed, 122 insertions, 327 deletions
diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt index 351e009abb..e6d54d8e10 100644 --- a/Documentation/dev-contributing.txt +++ b/Documentation/dev-contributing.txt @@ -164,7 +164,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 6e3950283d..6205858abd 100644 --- a/Documentation/dev-eclipse.txt +++ b/Documentation/dev-eclipse.txt @@ -55,7 +55,7 @@ and run `tools/eclipse/project.py`. 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-framework/src/test/java/com/google/gerrit/acceptance/AbstractNotificationTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractNotificationTest.java index af82910975..8aa7766fbe 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractNotificationTest.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractNotificationTest.java @@ -119,9 +119,7 @@ public abstract class AbstractNotificationTest extends AbstractDaemonTest { recipients.put(CC, parseAddresses(message, "CC")); recipients.put( BCC, - message - .rcpt() - .stream() + message.rcpt().stream() .map(Address::getEmail) .filter(e -> !recipients.get(TO).contains(e) && !recipients.get(CC).contains(e)) .collect(toList())); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java index 47ed515e38..e66257e33b 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -1946,9 +1946,7 @@ public class AccountIT extends AbstractDaemonTest { Iterable<String> expectedFps = expected.transform(k -> BaseEncoding.base16().encode(k.getPublicKey().getFingerprint())); Iterable<String> actualFps = - externalIds - .byAccount(currAccountId, SCHEME_GPGKEY) - .stream() + externalIds.byAccount(currAccountId, SCHEME_GPGKEY).stream() .map(e -> e.key().id()) .collect(toSet()); assertThat(actualFps).named("external IDs in database").containsExactlyElementsIn(expectedFps); 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 1ee3582b7c..ce79a7c259 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 @@ -3643,9 +3643,7 @@ public class ChangeIT extends AbstractDaemonTest { throws Exception { ChangeInfo c = gApi.changes().id(changeId).get(DETAILED_LABELS); Set<ReviewerState> 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 41f6a671f1..99f4fef2b0 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 @@ -218,11 +218,7 @@ public class RevisionIT extends AbstractDaemonTest { setApiUser(admin); gApi.changes().id(changeId).reviewer(user.username).deleteVote("Code-Review"); Optional<ApprovalInfo> 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(); @@ -237,13 +233,7 @@ public class RevisionIT extends AbstractDaemonTest { revision(r).review(in); ApprovalInfo cr = - gApi.changes() - .id(changeId) - .get(DETAILED_LABELS) - .labels - .get("Code-Review") - .all - .stream() + gApi.changes().id(changeId).get(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/api/revision/RobotCommentsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java index c440d9099c..27f8a2fac5 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java @@ -1140,8 +1140,7 @@ public class RobotCommentsIT extends AbstractDaemonTest { private static List<String> getFixIds(List<RobotCommentInfo> robotComments) { assertThatList(robotComments).isNotNull(); - return robotComments - .stream() + return robotComments.stream() .map(robotCommentInfo -> robotCommentInfo.fixSuggestions) .filter(Objects::nonNull) .flatMap(List::stream) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java index 02d3802d84..420fc044a4 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java @@ -1756,9 +1756,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { assertThat(getLastMessage(r.getChangeId())).isEqualTo("Uploaded patch set 3.\n\n(3 comments)"); List<String> messages = - sender - .getMessages() - .stream() + sender.getMessages().stream() .map(m -> m.body()) .sorted(Comparator.comparingInt(m -> m.contains("reexamine") ? 0 : 1)) .collect(toList()); @@ -1979,11 +1977,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { } private Collection<CommentInfo> getPublishedComments(String changeId) throws Exception { - return gApi.changes() - .id(changeId) - .comments() - .values() - .stream() + return gApi.changes().id(changeId).comments().values().stream() .flatMap(cs -> cs.stream()) .collect(toList()); } 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 6dad2c6da1..e5496c0a6d 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 @@ -71,11 +71,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()); @@ -166,10 +162,7 @@ public abstract class AbstractReindexTests extends StandaloneSiteTest { private void assertWriteVersions(ServerContext ctx, Integer... expected) { assertThat( - ctx.getInjector() - .getInstance(ChangeIndexCollection.class) - .getWriteIndexes() - .stream() + ctx.getInjector().getInstance(ChangeIndexCollection.class).getWriteIndexes().stream() .map(i -> i.getSchema().getVersion())) .named("write versions") .containsExactlyElementsIn(ImmutableSet.copyOf(expected)); 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 cb0d768ef2..c5c864db82 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 @@ -464,8 +464,7 @@ public class SuggestReviewersIT extends AbstractDaemonTest { List<TestAccount> expectedUsers, List<InternalGroup> expectedGroups) { List<Integer> 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 7cd9584a5a..86f375e119 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 @@ -36,8 +36,7 @@ public class KillTaskIT extends AbstractDaemonTest { r.consume(); Optional<String> 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/change/CommentsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java index 6fc9929ee1..620b448daa 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java @@ -959,9 +959,7 @@ public class CommentsIT extends AbstractDaemonTest { } private List<CommentInfo> getRevisionComments(String changeId, String revId) throws Exception { - return getPublishedComments(changeId, revId) - .values() - .stream() + return getPublishedComments(changeId, revId).values().stream() .flatMap(List::stream) .collect(toList()); } diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java index 79536a7633..6eaa16d288 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java @@ -1416,11 +1416,7 @@ public class ChangeRebuilderIT extends AbstractDaemonTest { CommentInfo draftInfo = putDraft(user, id, 1, "draft comment", null, Side.PARENT); putComment(user, id, 1, "published comment", null, Side.PARENT); CommentInfo commentInfo = - gApi.changes() - .id(id.get()) - .comments() - .values() - .stream() + gApi.changes().id(id.get()).comments().values().stream() .flatMap(List::stream) .findFirst() .get(); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java index f7204f3db8..6291447068 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java @@ -295,11 +295,7 @@ public class NoteDbOnlyIT extends AbstractDaemonTest { } private List<String> getMessages(Change.Id id) throws Exception { - return gApi.changes() - .id(id.get()) - .get(MESSAGES) - .messages - .stream() + return gApi.changes().id(id.get()).get(MESSAGES).messages.stream() .map(m -> m.message) .collect(toList()); } 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 d81bf6b87c..01f3d19cc8 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<Throwable> oe = - Throwables.getCausalChain(e) - .stream() + Throwables.getCausalChain(e).stream() .filter(x -> x instanceof OrmRuntimeException) .findFirst(); assertThat(oe).named("OrmRuntimeException in causal chain of " + e).isPresent(); @@ -523,12 +522,7 @@ public class NoteDbPrimaryIT extends AbstractDaemonTest { } private List<Account.Id> 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-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java index de549a0efe..a4419010be 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java @@ -220,10 +220,7 @@ class BecomeAnyAccountLoginServlet extends HttpServlet { private AuthResult byPreferredEmail(String email) { try (ReviewDb db = schema.open()) { Optional<Account> match = - queryProvider - .get() - .byPreferredEmail(email) - .stream() + queryProvider.get().byPreferredEmail(email).stream() .map(AccountState::getAccount) .findFirst(); return match.isPresent() ? auth(match.get()) : null; 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 2912733d48..6190864610 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 @@ -615,8 +615,7 @@ public class LuceneChangeIndex implements ChangeIndex { } private static List<byte[]> copyAsBytes(Collection<IndexableField> 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/CommentsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java index 56b1724ca5..1e6f30162a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java @@ -229,8 +229,7 @@ public class CommentsUtil { } return c; } - return draftByChangeAuthor(db, notes, user.getAccountId()) - .stream() + return draftByChangeAuthor(db, notes, user.getAccountId()).stream() .filter(c -> key.equals(c.key)) .findFirst(); } 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<Boolean, List<Module>> 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 5b3f093848..e9e68b6683 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 @@ -184,9 +184,7 @@ public class ReviewerRecommender { // Sort results Stream<Entry<Account.Id, MutableDouble>> sorted = - reviewerScores - .entrySet() - .stream() + reviewerScores.entrySet().stream() .sorted(Collections.reverseOrder(Map.Entry.comparingByValue())); List<Account.Id> 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 ee25d54790..dadef31f3e 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 @@ -225,8 +225,7 @@ public class ReviewersUtil { throws OrmException { try (Timer0.Context ctx = metrics.loadAccountsLatency.start()) { List<SuggestedReviewerInfo> 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 a999b953a1..d4fa3a8fa6 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 @@ -418,8 +418,7 @@ public class StarredChangesUtil { } public static Set<Integer> getStarredPatchSets(Set<String> labels, String label) { - return labels - .stream() + return labels.stream() .filter(l -> l.startsWith(label)) .filter(l -> Ints.tryParse(l.substring(label.length() + 1)) != null) .map(l -> Integer.valueOf(l.substring(label.length() + 1))) 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 6f25703b58..70b2967159 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 @@ -215,9 +215,7 @@ public class AccountControl { } private Set<AccountGroup.UUID> 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 889f3ed0ef..0f3b48110c 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 @@ -443,8 +443,7 @@ public class AccountManager { 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 5eee8d152d..5344d4625e 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 @@ -177,10 +177,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/Accounts.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/Accounts.java index 939eaf2eed..c384e49131 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/Accounts.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/Accounts.java @@ -141,10 +141,7 @@ public class Accounts { } public static Stream<Account.Id> readUserRefs(Repository repo) throws IOException { - return repo.getRefDatabase() - .getRefs(RefNames.REFS_USERS) - .values() - .stream() + return repo.getRefDatabase().getRefs(RefNames.REFS_USERS).values().stream() .map(r -> Account.Id.fromRef(r.getName())) .filter(Objects::nonNull); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java index 0085303f4e..b53a926907 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java @@ -39,9 +39,7 @@ public class AccountsConsistencyChecker { for (Account account : accounts.all()) { if (account.getPreferredEmail() != null) { - if (!externalIds - .byAccount(account.getId()) - .stream() + if (!externalIds.byAccount(account.getId()).stream() .anyMatch(e -> account.getPreferredEmail().equals(e.email()))) { addError( String.format( 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 dd58d59243..bd7017e4ab 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 @@ -82,9 +82,7 @@ public class DeleteEmail implements RestModifyView<AccountResource.Email, Input> } Set<ExternalId> extIds = - externalIds - .byAccount(user.getAccountId()) - .stream() + externalIds.byAccount(user.getAccountId()).stream() .filter(e -> email.equals(e.email())) .collect(toSet()); if (extIds.isEmpty()) { 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 1dc2615f5f..2c59156176 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 @@ -72,9 +72,7 @@ public class DeleteExternalIds implements RestModifyView<AccountResource, List<S } Map<ExternalId.Key, ExternalId> externalIdMap = - externalIds - .byAccount(resource.getUser().getAccountId()) - .stream() + externalIds.byAccount(resource.getUser().getAccountId()).stream() .collect(toMap(i -> i.key(), i -> i)); List<ExternalId> toDelete = new ArrayList<>(); 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 d57934f0b3..6af38334e2 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 @@ -71,8 +71,7 @@ public class DeleteWatchedProjects Account.Id accountId = rsrc.getUser().getAccountId(); watchConfig.deleteProjectWatches( accountId, - input - .stream() + input.stream() .filter(Objects::nonNull) .map(w -> ProjectWatchKey.create(new Project.NameKey(w.project), w.filter)) .collect(toList())); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/Emails.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/Emails.java index 3e97265755..f18f7695e2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/Emails.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/Emails.java @@ -74,16 +74,9 @@ public class Emails { public ImmutableSetMultimap<String, Account.Id> getAccountsFor(String... emails) throws IOException, OrmException { ImmutableSetMultimap.Builder<String, Account.Id> builder = ImmutableSetMultimap.builder(); - externalIds - .byEmails(emails) - .entries() - .stream() + externalIds.byEmails(emails).entries().stream() .forEach(e -> builder.put(e.getKey(), e.getValue().accountId())); - queryProvider - .get() - .byPreferredEmail(emails) - .entries() - .stream() + queryProvider.get().byPreferredEmail(emails).entries().stream() .forEach(e -> builder.put(e.getKey(), e.getValue().getAccount().getId())); return builder.build(); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java index 5d8c04a576..3bc663a703 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java @@ -196,10 +196,7 @@ public class GroupIncludeCacheImpl implements GroupIncludeCache { throws OrmException, NoSuchGroupException { GroupIndex groupIndex = groupIndexProvider.get(); if (groupIndex != null && groupIndex.getSchema().hasField(GroupField.MEMBER)) { - return groupQueryProvider - .get() - .byMember(memberId) - .stream() + return groupQueryProvider.get().byMember(memberId).stream() .map(InternalGroup::getGroupUUID) .collect(toImmutableSet()); } @@ -256,10 +253,7 @@ public class GroupIncludeCacheImpl implements GroupIncludeCache { public ImmutableList<AccountGroup.UUID> load(AccountGroup.UUID key) throws OrmException { GroupIndex groupIndex = groupIndexProvider.get(); if (groupIndex != null && groupIndex.getSchema().hasField(GroupField.SUBGROUP)) { - return groupQueryProvider - .get() - .bySubgroup(key) - .stream() + return groupQueryProvider.get().bySubgroup(key).stream() .map(InternalGroup::getGroupUUID) .collect(toImmutableList()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java index 4dc960d323..78e75afdf3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java @@ -107,9 +107,7 @@ public class GroupMembers { GroupControl groupControl = groupControlFactory.controlFor(new InternalGroupDescription(group)); Set<Account> directMembers = - group - .getMembers() - .stream() + group.getMembers().stream() .filter(groupControl::canSeeMember) .map(accountCache::get) .map(AccountState::getAccount) 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 fc9b58a3b4..0a5885848a 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/account/externalids/ExternalIdCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdCacheImpl.java index 311e70f88d..4b4d060365 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdCacheImpl.java @@ -248,9 +248,7 @@ class ExternalIdCacheImpl implements ExternalIdCache { abstract static class AllExternalIds { static AllExternalIds create(Multimap<Account.Id, ExternalId> byAccount) { ImmutableSetMultimap<String, ExternalId> byEmail = - byAccount - .values() - .stream() + byAccount.values().stream() .filter(e -> !Strings.isNullOrEmpty(e.email())) .collect(toImmutableSetMultimap(ExternalId::email, e -> e)); return new AutoValue_ExternalIdCacheImpl_AllExternalIds( diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java index 5dbde8e270..3f9c4d50bc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java @@ -96,10 +96,7 @@ public class ExternalIdsConsistencyChecker { } } - emails - .asMap() - .entrySet() - .stream() + emails.asMap().entrySet().stream() .filter(e -> e.getValue().size() > 1) .forEach( e -> @@ -107,8 +104,7 @@ public class ExternalIdsConsistencyChecker { String.format( "Email '%s' is not unique, it's used by the following external IDs: %s", e.getKey(), - e.getValue() - .stream() + e.getValue().stream() .map(k -> "'" + k.get() + "'") .sorted() .collect(joining(", "))), 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 17a28cd026..4cae87f6d5 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 @@ -460,8 +460,7 @@ public class ChangeInserter implements InsertChangeOp { private Set<Account.Id> filterOnChangeVisibility( final ReviewDb db, ChangeNotes notes, Set<Account.Id> 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 142e35ea62..09091f4a4e 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 @@ -619,8 +619,7 @@ public class ChangeJson { if (has(TRACKING_IDS)) { ListMultimap<String, String> set = trackingFooters.extract(cd.commitFooters()); out.trackingIds = - set.entries() - .stream() + set.entries().stream() .map(e -> new TrackingIdInfo(e.getKey(), e.getValue())) .collect(toList()); } @@ -844,9 +843,7 @@ public class ChangeJson { Maps.newHashMapWithExpectedSize(permittedLabels.size()); for (String label : permittedLabels.keySet()) { List<Integer> permittedVotingRange = - permittedLabels - .get(label) - .stream() + permittedLabels.get(label).stream() .map(this::parseRangeValue) .filter(java.util.Objects::nonNull) .sorted() @@ -934,9 +931,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())); } @@ -1189,16 +1184,14 @@ public class ChangeJson { } private Collection<AccountInfo> toAccountInfo(Collection<Account.Id> accounts) { - return accounts - .stream() + return accounts.stream() .map(accountLoader::get) .sorted(AccountInfoComparator.ORDER_NULLS_FIRST) .collect(toList()); } private Collection<AccountInfo> toAccountInfoByEmail(Collection<Address> addresses) { - return addresses - .stream() + return addresses.stream() .map(a -> new AccountInfo(a.getName(), a.getEmail())) .sorted(AccountInfoComparator.ORDER_NULLS_FIRST) .collect(toList()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java index 90f81624c9..8c70ad8015 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java @@ -153,9 +153,7 @@ public class ChangeResource implements RestResource, HasETag { accounts.add(getChange().getAssignee()); } try { - patchSetUtil - .byChange(db.get(), notes) - .stream() + patchSetUtil.byChange(db.get(), notes).stream() .map(ps -> ps.getUploader()) .forEach(accounts::add); 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 8c32039dd4..c5e72e595e 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 @@ -777,8 +777,7 @@ public class PostReview private static void ensureRangesDoNotOverlap( String commentPath, List<FixReplacementInfo> fixReplacementInfos) throws BadRequestException { List<Range> sortedRanges = - fixReplacementInfos - .stream() + fixReplacementInfos.stream() .map(fixReplacementInfo -> fixReplacementInfo.range) .sorted() .collect(toList()); @@ -1054,17 +1053,13 @@ public class PostReview } private Set<CommentSetEntry> 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<CommentSetEntry> readExistingRobotComments(ChangeContext ctx) throws OrmException { - return commentsUtil - .robotCommentsByChange(ctx.getNotes()) - .stream() + return commentsUtil.robotCommentsByChange(ctx.getNotes()).stream() .map(CommentSetEntry::create) .collect(toSet()); } @@ -1283,8 +1278,7 @@ public class PostReview 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/change/PostReviewersOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewersOp.java index 1309194772..0034598b0e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewersOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewersOp.java @@ -200,8 +200,7 @@ public class PostReviewersOp implements BatchUpdateOp { accountsToNotify); if (!addedReviewers.isEmpty()) { List<Account> reviewers = - addedReviewers - .stream() + addedReviewers.stream() .map(r -> accountCache.get(r.getAccountId()).getAccount()) .collect(toList()); reviewerAdded.fire(change, patchSet, reviewers, ctx.getAccount(), ctx.getWhen()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LockFailureException.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/LockFailureException.java index 02a30e098b..503c0d9008 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/LockFailureException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/LockFailureException.java @@ -36,9 +36,7 @@ public class LockFailureException extends IOException { public LockFailureException(String message, BatchRefUpdate batchRefUpdate) { super(message); refs = - batchRefUpdate - .getCommands() - .stream() + batchRefUpdate.getCommands().stream() .filter(c -> c.getResult() == ReceiveCommand.Result.LOCK_FAILURE) .map(ReceiveCommand::getRefName) .collect(toImmutableList()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index 80e0da8a43..364f9fba7b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -619,9 +619,7 @@ class ReceiveCommits { } List<ReplaceRequest> 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/git/validators/CommitValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java index 9395ffb959..923adada6b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java @@ -671,8 +671,7 @@ public class CommitValidators { List<ConsistencyProblemInfo> problems = externalIdsConsistencyChecker.check(receiveEvent.commit); List<CommitValidationMessage> msgs = - problems - .stream() + problems.stream() .map( p -> new CommitValidationMessage( @@ -730,8 +729,7 @@ public class CommitValidators { if (!errorMessages.isEmpty()) { throw new CommitValidationException( "invalid account configuration", - errorMessages - .stream() + errorMessages.stream() .map(m -> new CommitValidationMessage(m, true)) .collect(toList())); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupsUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupsUpdate.java index f31e383fe0..ad475b32d3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupsUpdate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupsUpdate.java @@ -269,8 +269,7 @@ public class GroupsUpdate { private void addNewGroupMembers(ReviewDb db, AccountGroup group, Set<Account.Id> newMemberIds) throws OrmException, IOException { Set<AccountGroupMember> newMembers = - newMemberIds - .stream() + newMemberIds.stream() .map(accountId -> new AccountGroupMember.Key(accountId, group.getId())) .map(AccountGroupMember::new) .collect(toImmutableSet()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java index 480139deab..e94289481e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java @@ -285,8 +285,7 @@ public class ListGroups implements RestReadView<TopLevelResource> { private Stream<GroupDescription.Internal> getAllExistingGroups() throws OrmException { if (!projects.isEmpty()) { - return projects - .stream() + return projects.stream() .map(ProjectControl::getProjectState) .map(ProjectState::getAllGroups) .flatMap(Collection::stream) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java index 5e12c120da..a5655c46c0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java @@ -139,8 +139,7 @@ public class AccountField { storedOnly("external_id_state") .buildRepeatable( a -> - a.getExternalIds() - .stream() + a.getExternalIds().stream() .filter(e -> e.blobId() != null) .map(e -> e.toByteArray()) .collect(toSet())); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java index 54bf0dc16a..56d5ba5082 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java @@ -136,10 +136,7 @@ public class AllChangesIndexer extends SiteIndexer<Change.Id, ChangeData, Change // Estimate size based on IDs that show up in ref names. This is not perfect, since patch set // refs may exist for changes whose metadata was never successfully stored. But that's ok, as // the estimate is just used as a heuristic for sorting projects. - return repo.getRefDatabase() - .getRefs(RefNames.REFS_CHANGES) - .values() - .stream() + return repo.getRefDatabase().getRefs(RefNames.REFS_CHANGES).values().stream() .map(r -> Change.Id.fromRef(r.getName())) .filter(Objects::nonNull) .distinct() 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 1f8b5404e0..9ad8a25408 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 @@ -650,8 +650,7 @@ public class ChangeField { @VisibleForTesting static List<SubmitRecord> parseSubmitRecords(Collection<String> 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 808aaf0cf7..ff09f53c8b 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 @@ -199,8 +199,7 @@ public class MailProcessor { // comments from the outbound email. // TODO(hiesel) Also filter by original comment author. Collection<Comment> comments = - cd.publishedComments() - .stream() + cd.publishedComments().stream() .filter(c -> (c.writtenOn.getTime() / 1000) == (metadata.timestamp.getTime() / 1000)) .sorted(CommentsUtil.COMMENT_ORDER) .collect(toList()); @@ -385,8 +384,7 @@ public class MailProcessor { private Set<String> existingMessageIds(ChangeData cd) throws OrmException { Set<String> existingMessageIds = new HashSet<>(); - cd.messages() - .stream() + cd.messages().stream() .forEach( m -> { String messageId = CommentsUtil.extractMessageId(m.getTag()); @@ -394,8 +392,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 d2f91edb03..2c5449d95d 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 @@ -85,10 +85,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 4adca1b4d4..b9fc5da917 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 @@ -547,8 +547,7 @@ public class CommentSender extends ReplyToChangeSender { } private List<Map<String, Object>> commentBlocksToSoyData(List<CommentFormatter.Block> blocks) { - return blocks - .stream() + return blocks.stream() .map( b -> { Map<String, Object> 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 a2e0997aa8..b9348ebc7a 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 @@ -733,9 +733,7 @@ public class ChangeBundle { private static boolean createdOnIsMonotonic( Map<?, PatchSet> patchSets, Set<PatchSet.Id> limitToIds) { List<PatchSet> 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/ChangeNotes.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java index e652a35eb6..65e1f5d51e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java @@ -337,8 +337,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> { ScanResult sr = scanChangeIds(repo); PrimaryStorage defaultStorage = args.migration.changePrimaryStorage(); - return sr.all() - .stream() + return sr.all().stream() .map(id -> scanOneNoteDbChange(db, project, sr, defaultStorage, id)) .filter(Objects::nonNull); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java index db7b86a022..7a3d441a8f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java @@ -134,10 +134,8 @@ public class DeleteCommentRewriter implements NoteDbRewriter { public static Map<String, Comment> getPublishedComments( ChangeNoteUtil noteUtil, Change.Id changeId, ObjectReader reader, NoteMap noteMap) throws IOException, ConfigInvalidException { - return RevisionNoteMap.parse(noteUtil, changeId, reader, noteMap, PUBLISHED) - .revisionNotes - .values() - .stream() + return RevisionNoteMap.parse(noteUtil, changeId, reader, noteMap, PUBLISHED).revisionNotes + .values().stream() .flatMap(n -> n.getComments().stream()) .collect(toMap(c -> c.key.uuid, c -> c)); } @@ -173,9 +171,7 @@ public class DeleteCommentRewriter implements NoteDbRewriter { */ private List<Comment> getDeletedComments( Map<String, Comment> parMap, Map<String, Comment> curMap) { - return parMap - .entrySet() - .stream() + return parMap.entrySet().stream() .filter(c -> !curMap.containsKey(c.getKey())) .map(c -> c.getValue()) .collect(toList()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java index b9f5fe6be8..cb7232006c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java @@ -696,9 +696,7 @@ public class NoteDbUpdateManager implements AutoCloseable { } if (!rewriters.isEmpty()) { Optional<String> conflictKey = - rewriters - .keySet() - .stream() + rewriters.keySet().stream() .filter(k -> (draftUpdates.containsKey(k) || robotCommentUpdates.containsKey(k))) .findAny(); if (conflictKey.isPresent()) { 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 8d5af698bc..cabe18f998 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 @@ -427,9 +427,7 @@ public class ChangeRebuilderImpl extends ChangeRebuilder { private static List<Comment> 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/notedb/rebuild/NoteDbMigrator.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java index 3ea3e2b15a..efff3388af 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java @@ -448,8 +448,7 @@ public class NoteDbMigrator implements AutoCloseable { int sequenceGap, boolean autoMigrate) throws MigrationException { - if (ImmutableList.of(!changes.isEmpty(), !projects.isEmpty(), !skipProjects.isEmpty()) - .stream() + if (ImmutableList.of(!changes.isEmpty(), !projects.isEmpty(), !skipProjects.isEmpty()).stream() .filter(e -> e) .count() > 1) { @@ -629,8 +628,7 @@ public class NoteDbMigrator implements AutoCloseable { try (ContextHelper contextHelper = new ContextHelper()) { List<ListenableFuture<Boolean>> futures = - allChanges - .stream() + allChanges.stream() .map( id -> executor.submit( diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/EditTransformer.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/EditTransformer.java index 9083ede9c4..90f442eca3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/EditTransformer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/EditTransformer.java @@ -89,8 +89,7 @@ class EditTransformer { * @return the transformed edits per file path */ public Multimap<String, ContextAwareEdit> getEditsPerFilePath() { - return edits - .stream() + return edits.stream() .collect( toMultimap( ContextAwareEdit::getNewFilePath, Function.identity(), ArrayListMultimap::create)); @@ -112,9 +111,7 @@ class EditTransformer { transformingEntries.stream().collect(groupingBy(EditTransformer::getOldFilePath)); edits = - editsPerFilePath - .entrySet() - .stream() + editsPerFilePath.entrySet().stream() .flatMap( pathAndEdits -> { List<PatchListEntry> transEntries = @@ -137,12 +134,11 @@ class EditTransformer { } // TODO(aliceks): Find a way to prevent an explosion of the number of entries. - return transformingEntries - .stream() + return transformingEntries.stream() .flatMap( transEntry -> transformEdits( - sideStrategy, originalEdits, transEntry.getEdits(), transEntry.getNewName()) + sideStrategy, originalEdits, transEntry.getEdits(), transEntry.getNewName()) .stream()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java index 9ffd985ff5..563020ee35 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java @@ -288,8 +288,7 @@ public class PatchListLoader implements Callable<PatchList> { } List<DiffEntry> relevantDiffEntries = - diffEntries - .stream() + diffEntries.stream() .filter(diffEntry -> isTouched(touchedFilePaths, diffEntry)) .collect(toImmutableList()); @@ -398,8 +397,7 @@ public class PatchListLoader implements Callable<PatchList> { } private static Set<Edit> getContentEdits(Set<ContextAwareEdit> editsDueToRebase) { - return editsDueToRebase - .stream() + return editsDueToRebase.stream() .map(ContextAwareEdit::toEdit) .filter(Optional::isPresent) .map(Optional::get) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/PermissionBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/permissions/PermissionBackend.java index ffd6094395..0561e4042d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/PermissionBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/permissions/PermissionBackend.java @@ -431,9 +431,7 @@ public abstract class PermissionBackend { } private static Set<LabelPermission.WithValue> valuesOf(LabelType label) { - return label - .getValues() - .stream() + return label.getValues().stream() .map((v) -> new LabelPermission.WithValue(label, v)) .collect(toSet()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DefaultPermissionBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/DefaultPermissionBackend.java index 3f4cbb9030..decb328509 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/DefaultPermissionBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/DefaultPermissionBackend.java @@ -175,8 +175,7 @@ public class DefaultPermissionBackend extends PermissionBackend { private boolean allow(Collection<PermissionRule> rules) { return user.getEffectiveGroups() .containsAnyOf( - rules - .stream() + rules.stream() .filter(r -> r.getAction() == Action.ALLOW) .map(r -> r.getGroup().getUUID()) .collect(toSet())); @@ -184,8 +183,7 @@ public class DefaultPermissionBackend extends PermissionBackend { private boolean notDenied(Collection<PermissionRule> rules) { Set<AccountGroup.UUID> denied = - rules - .stream() + rules.stream() .filter(r -> r.getAction() != Action.ALLOW) .map(r -> r.getGroup().getUUID()) .collect(toSet()); 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 57b44c9526..9f05b97bf8 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 @@ -194,8 +194,7 @@ public class DeleteRef { List<String> refs = prefix == null ? refsToDelete - : refsToDelete - .stream() + : refsToDelete.stream() .map(ref -> ref.startsWith(R_REFS) ? ref : prefix + ref) .collect(toList()); for (String ref : refs) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java index caa76066cf..9fbb3551db 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java @@ -253,9 +253,7 @@ public class GetAccess implements RestReadView<ProjectResource> { info.configVisible = checkReadConfig || pc.isOwner(); info.groups = - visibleGroups - .entrySet() - .stream() + visibleGroups.entrySet().stream() .filter(e -> e.getValue() != INVISIBLE_SENTINEL) .collect(toMap(e -> e.getKey().get(), e -> e.getValue())); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java index e5fe37d999..5a6aa11b25 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java @@ -80,10 +80,7 @@ public class ListChildProjects implements RestReadView<ProjectResource> { children.put(c.getNameKey(), c.getProject()); } } - return permissionBackend - .user(user) - .filter(ProjectPermission.ACCESS, children.keySet()) - .stream() + return permissionBackend.user(user).filter(ProjectPermission.ACCESS, children.keySet()).stream() .sorted() .map((p) -> json.format(children.get(p))) .collect(toList()); @@ -131,8 +128,7 @@ public class ListChildProjects implements RestReadView<ProjectResource> { Project.NameKey parent) throws PermissionBackendException { List<Project.NameKey> canSee = - perm.filter(ProjectPermission.ACCESS, children.get(parent)) - .stream() + perm.filter(ProjectPermission.ACCESS, children.get(parent)).stream() .sorted() .collect(toList()); children.removeAll(parent); // removing all entries prevents cycles. 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 fff19ff5c8..c8106d0979 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 @@ -227,8 +227,7 @@ public class ProjectCacheImpl implements ProjectCache { @Override public Set<AccountGroup.UUID> 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/project/SuggestParentCandidates.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SuggestParentCandidates.java index 7c7f8a5df5..ef539beacc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SuggestParentCandidates.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SuggestParentCandidates.java @@ -49,10 +49,7 @@ public class SuggestParentCandidates { } public List<Project.NameKey> getNameKeys() throws PermissionBackendException { - return permissionBackend - .user(user) - .filter(ProjectPermission.ACCESS, parents()) - .stream() + return permissionBackend.user(user).filter(ProjectPermission.ACCESS, parents()).stream() .sorted() .collect(toList()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/InternalAccountQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/InternalAccountQuery.java index f42c09998e..1eec8d9ba6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/InternalAccountQuery.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/account/InternalAccountQuery.java @@ -135,8 +135,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()); } @@ -155,8 +154,7 @@ public class InternalAccountQuery extends InternalQuery<AccountState> { if (hasPreferredEmailExact()) { List<List<AccountState>> r = query( - emailList - .stream() + emailList.stream() .map(e -> AccountPredicates.preferredEmailExact(e)) .collect(toList())); Multimap<String, AccountState> accountsByEmail = ArrayListMultimap.create(); @@ -176,8 +174,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); 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 7f4b9061b9..5aca6b4238 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 @@ -1238,11 +1238,7 @@ public class ChangeQueryBuilder extends QueryBuilder<ChangeData> { private Set<Account.Id> getMembers(AccountGroup.UUID g) throws OrmException { Set<Account.Id> accounts; Set<Account.Id> 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(); @@ -1317,8 +1313,7 @@ public class ChangeQueryBuilder extends QueryBuilder<ChangeData> { if (!forDefaultField || accounts.size() <= MAX_ACCOUNTS_PER_DEFAULT_FIELD) { reviewerPredicate = Predicate.or( - accounts - .stream() + accounts.stream() .map(id -> ReviewerPredicate.forState(id, state)) .collect(toList())); } 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 17034dfff4..6a81ff60df 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 @@ public 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 df78315bd5..8a2c8896b9 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 @@ public 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<GroupReference> 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/main/java/com/google/gerrit/server/schema/Schema_147.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_147.java index 29ae7d5a19..cac3e95ae4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_147.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_147.java @@ -60,10 +60,7 @@ public class Schema_147 extends SchemaVersion { try (Repository repo = repoManager.openRepository(allUsersName)) { Set<Account.Id> accountIdsFromReviewDb = scanAccounts(db); Set<Account.Id> accountIdsFromUserBranches = - repo.getRefDatabase() - .getRefs(RefNames.REFS_USERS) - .values() - .stream() + repo.getRefDatabase().getRefs(RefNames.REFS_USERS).values().stream() .map(r -> Account.Id.fromRef(r.getName())) .filter(Objects::nonNull) .collect(toSet()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_154.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_154.java index 596999d941..d4f8230852 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_154.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_154.java @@ -125,9 +125,7 @@ public class Schema_154 extends SchemaVersion { JdbcSchema schema = (JdbcSchema) db; Connection connection = schema.getConnection(); Set<String> columns = schema.getDialect().listColumns(connection, TABLE); - return ACCOUNT_FIELDS_MAP - .entrySet() - .stream() + return ACCOUNT_FIELDS_MAP.entrySet().stream() .filter(e -> columns.contains(e.getKey())) .collect(toMap(Map.Entry::getKey, Map.Entry::getValue)); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_161.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_161.java index febe80e8a1..3de9855023 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_161.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_161.java @@ -77,9 +77,7 @@ public class Schema_161 extends SchemaVersion { starRef.labels(), StarredChangesUtil.UNREVIEWED_LABEL); List<String> newLabels = - starRef - .labels() - .stream() + starRef.labels().stream() .map( l -> { if (l.startsWith(MUTE_LABEL)) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/NoteDbBatchUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/update/NoteDbBatchUpdate.java index ceef352dc6..a5fee41e55 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/update/NoteDbBatchUpdate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/update/NoteDbBatchUpdate.java @@ -143,8 +143,7 @@ class NoteDbBatchUpdate extends BatchUpdate { // Fire ref update events only after all mutations are finished, since callers may assume a // patch set ref being created means the change was created, or a branch advancing meaning // some changes were closed. - updates - .stream() + updates.stream() .filter(u -> u.batchRefUpdate != null) .forEach( u -> u.gitRefUpdated.fire(u.project, u.batchRefUpdate, u.getAccount().orElse(null))); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java index 6835cb4017..0cc994e477 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java @@ -289,8 +289,7 @@ class ReviewDbBatchUpdate extends BatchUpdate { // Fire ref update events only after all mutations are finished, since callers may assume a // patch set ref being created means the change was created, or a branch advancing meaning // some changes were closed. - updates - .stream() + updates.stream() .filter(u -> u.batchRefUpdate != null) .forEach( u -> u.gitRefUpdated.fire(u.project, u.batchRefUpdate, u.getAccount().orElse(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<SubmitRecord> recordList = ImmutableList.copyOf(records); List<String> 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 36a869fd7a..215089af64 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 @@ -550,8 +550,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { // Convert AccountInfos to strings, either account ID or email. List<String> reviewerIds = - reviewers - .stream() + reviewers.stream() .map( ai -> { if (ai._accountId != null) { @@ -2013,10 +2012,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { gApi.groups().id(group).addMembers(user2.toString(), user3.toString()); List<String> 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()); @@ -2426,8 +2422,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/server/schema/Schema_159_to_160_Test.java b/gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java index 8bb68b4fa8..14d8b360d4 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java @@ -191,8 +191,7 @@ public class Schema_159_to_160_Test { VersionedAccountPreferences prefs = prefsSupplier.get(); prefs.load(repo); Config cfg = prefs.getConfig(); - return cfg.getSubsections(MY) - .stream() + return cfg.getSubsections(MY).stream() .collect(toImmutableMap(i -> i, i -> cfg.getString(MY, i, KEY_URL))); } } 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 c70d24181b..427e3ef643 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 @@ -150,8 +150,7 @@ public class FakeEmailSender implements EmailSender { public List<Message> 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-server/src/test/java/com/google/gerrit/testutil/IndexVersions.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/IndexVersions.java index c2ba740a96..a8569ed737 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/IndexVersions.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/IndexVersions.java @@ -131,8 +131,7 @@ public class IndexVersions { List<Integer> schemaVersions, String testSuiteNamePrefix, Config baseConfig) { - return schemaVersions - .stream() + return schemaVersions.stream() .collect( toMap( i -> testSuiteNamePrefix + i, 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 84a9f84e31..982c4959ef 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 @@ -130,8 +130,7 @@ public class SetMembersCommand extends SshCommand { String action, GroupResource group, List<Account.Id> accountIdList) throws UnsupportedEncodingException, IOException { String names = - accountIdList - .stream() + accountIdList.stream() .map( accountId -> MoreObjects.firstNonNull( @@ -145,8 +144,7 @@ public class SetMembersCommand extends SshCommand { String action, GroupResource group, List<AccountGroup.UUID> groupUuidList) throws UnsupportedEncodingException, IOException { String names = - groupUuidList - .stream() + groupUuidList.stream() .map(uuid -> groupCache.get(uuid).map(InternalGroup::getName)) .flatMap(Streams::stream) .collect(joining(", ")); diff --git a/plugins/download-commands b/plugins/download-commands -Subproject 7bd2008be31497696e4818f4a4d91b317251c9a +Subproject bcfb05cbd1200422b81e9ac2ce824868ff74f25 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) |