Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade google-java-format to 1.7

Change-Id: Ia7383822ef59fb60bb5559956a065ae46b2e4f4a

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

Documentation/dev-eclipse.txt

@@ -68,7 +68,7 @@ Java 8 is still the default:
 
 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

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java

@@ -140,8 +140,7 @@ class Labels extends Grid {
 
   void set(ChangeInfo info) {
     List<String> names =
-        info.labels()
+        info.labels().stream()
-            .stream()
             .sorted()
             .collect(collectingAndThen(toList(), Collections::unmodifiableList));
     Set<Integer> removable = info.removableReviewerIds();

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java

@@ -126,9 +126,7 @@ public class ReplyBox extends Composite {
     initWidget(uiBinder.createAndBindUi(this));
 
     List<String> names =
-        permitted
+        permitted.keySet().stream()
-            .keySet()
-            .stream()
             .sorted()
             .collect(collectingAndThen(toList(), Collections::unmodifiableList));
     if (names.isEmpty()) {
@@ -446,8 +444,7 @@ public class ReplyBox extends Composite {
     }
 
     List<String> paths =
-        m.keySet()
+        m.keySet().stream()
-            .stream()
             .sorted()
             .collect(collectingAndThen(toList(), Collections::unmodifiableList));
 

java/com/google/gerrit/acceptance/AbstractNotificationTest.java

@@ -116,9 +116,7 @@ public abstract class AbstractNotificationTest extends AbstractDaemonTest {
       recipients.put(CC, parseAddresses(message, "Cc"));
       recipients.put(
           BCC,
-          message
+          message.rcpt().stream()
-              .rcpt()
-              .stream()
               .map(Address::getEmail)
               .filter(e -> !recipients.get(TO).contains(e) && !recipients.get(CC).contains(e))
               .collect(toList()));

java/com/google/gerrit/acceptance/HttpResponse.java

@@ -65,8 +65,7 @@ public class HttpResponse {
   }
 
   public ImmutableList<String> getHeaders(String name) {
-    return Arrays.asList(response.getHeaders(name))
+    return Arrays.asList(response.getHeaders(name)).stream()
-        .stream()
         .map(Header::getValue)
         .collect(toImmutableList());
   }

java/com/google/gerrit/acceptance/ProjectResetter.java

@@ -260,9 +260,7 @@ public class ProjectResetter implements AutoCloseable {
         refsPatternByProject.asMap().entrySet()) {
       try (Repository repo = repoManager.openRepository(e.getKey())) {
         Collection<Ref> nonRestoredRefs =
-            repo.getRefDatabase()
+            repo.getRefDatabase().getRefs().stream()
-                .getRefs()
-                .stream()
                 .filter(
                     r ->
                         !keptRefsByProject.containsEntry(e.getKey(), r.getName())
@@ -315,9 +313,7 @@ public class ProjectResetter implements AutoCloseable {
 
   private Set<Project.NameKey> projectsWithConfigChanges(
       Multimap<Project.NameKey, String> projects) {
-    return projects
+    return projects.entries().stream()
-        .entries()
-        .stream()
         .filter(e -> e.getValue().equals(RefNames.REFS_CONFIG))
         .map(Map.Entry::getKey)
         .collect(toSet());

java/com/google/gerrit/acceptance/ReindexProjectsAtStartup.java

@@ -42,9 +42,7 @@ public class ReindexProjectsAtStartup implements LifecycleListener {
 
   @Override
   public void start() {
-    repoMgr
+    repoMgr.list().stream()
-        .list()
-        .stream()
         .forEach(
             projectName -> {
               try {

java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java

@@ -54,11 +54,8 @@ class ElasticIndexVersionDiscovery {
     }
 
     return new JsonParser()
-        .parse(AbstractElasticIndex.getContent(response))
+        .parse(AbstractElasticIndex.getContent(response)).getAsJsonObject().entrySet().stream()
-        .getAsJsonObject()
+            .map(e -> e.getKey().replace(name, ""))
-        .entrySet()
+            .collect(toList());
-        .stream()
-        .map(e -> e.getKey().replace(name, ""))
-        .collect(toList());
   }
 }

java/com/google/gerrit/extensions/registration/DynamicSet.java

@@ -226,8 +226,7 @@ public class DynamicSet<T> implements Iterable<T> {
    * @return sorted set of active plugins that supply at least one item.
    */
   public ImmutableSortedSet<String> plugins() {
-    return items
+    return items.stream()
-        .stream()
         .map(i -> i.get().getPluginName())
         .collect(toImmutableSortedSet(naturalOrder()));
   }
@@ -239,8 +238,7 @@ public class DynamicSet<T> implements Iterable<T> {
    * @return items exported by a plugin.
    */
   public ImmutableSet<Provider<T>> byPlugin(String pluginName) {
-    return items
+    return items.stream()
-        .stream()
         .filter(i -> i.get().getPluginName().equals(pluginName))
         .map(i -> i.get().getProvider())
         .collect(toImmutableSet());

java/com/google/gerrit/index/project/ProjectField.java

@@ -61,9 +61,7 @@ public class ProjectField {
       storedOnly("ref_state")
           .buildRepeatable(
               projectData ->
-                  projectData
+                  projectData.tree().stream()
-                      .tree()
-                      .stream()
                       .filter(p -> p.getProject().getConfigRefState() != null)
                       .map(p -> toRefState(p.getProject()))
                       .collect(toImmutableList()));

java/com/google/gerrit/index/query/QueryProcessor.java

@@ -373,8 +373,7 @@ public abstract class QueryProcessor<T> {
   }
 
   private static Optional<QueryParseException> findQueryParseException(Throwable t) {
-    return Throwables.getCausalChain(t)
+    return Throwables.getCausalChain(t).stream()
-        .stream()
         .filter(c -> c instanceof QueryParseException)
         .map(QueryParseException.class::cast)
         .findFirst();

java/com/google/gerrit/launcher/GerritLauncher.java

@@ -626,9 +626,7 @@ public final class GerritLauncher {
    * @return true if any thread has a stack frame in {@code org.eclipse.jdt}.
    */
   public static boolean isRunningInEclipse() {
-    return Thread.getAllStackTraces()
+    return Thread.getAllStackTraces().values().stream()
-        .values()
-        .stream()
         .flatMap(Arrays::stream)
         .anyMatch(e -> e.getClassName().startsWith("org.eclipse.jdt."));
   }

java/com/google/gerrit/lucene/LuceneChangeIndex.java

@@ -655,8 +655,7 @@ public class LuceneChangeIndex implements ChangeIndex {
   }
 
   private static List<byte[]> copyAsBytes(Collection<IndexableField> fields) {
-    return fields
+    return fields.stream()
-        .stream()
         .map(
             f -> {
               BytesRef ref = f.binaryValue();

java/com/google/gerrit/mail/HtmlParser.java

@@ -78,8 +78,7 @@ public class HtmlParser {
     for (Element e : d.body().getAllElements()) {
       String elementName = e.tagName();
       boolean isInBlockQuote =
-          e.parents()
+          e.parents().stream()
-              .stream()
               .anyMatch(
                   p ->
                       p.tagName().equals("blockquote")

java/com/google/gerrit/mail/RawMailParser.java

@@ -85,10 +85,7 @@ public class RawMailParser {
     }
 
     // Add additional headers
-    mimeMessage
+    mimeMessage.getHeader().getFields().stream()
-        .getHeader()
-        .getFields()
-        .stream()
         .filter(f -> !MAIN_HEADERS.contains(f.getName().toLowerCase()))
         .forEach(f -> messageBuilder.addAdditionalHeader(f.getName() + ": " + f.getBody()));
 

java/com/google/gerrit/pgm/init/InitLogging.java

@@ -53,8 +53,7 @@ public class InitLogging implements InitStep {
   }
 
   private static boolean isSet(List<String> javaOptions, String javaOptionName) {
-    return javaOptions
+    return javaOptions.stream()
-        .stream()
         .anyMatch(
             o ->
                 o.startsWith("-D" + javaOptionName + "=")

java/com/google/gerrit/server/CommentsUtil.java

@@ -221,8 +221,7 @@ public class CommentsUtil {
       }
       return c;
     }
-    return draftByChangeAuthor(db, notes, user.getAccountId())
+    return draftByChangeAuthor(db, notes, user.getAccountId()).stream()
-        .stream()
         .filter(c -> key.equals(c.key))
         .findFirst();
   }

java/com/google/gerrit/server/CreateGroupPermissionSyncer.java

@@ -107,9 +107,7 @@ public class CreateGroupPermissionSyncer implements ChangeMergedListener {
           config.getAccessSection(RefNames.REFS_GROUPS + "*", true);
       if (createGroupsGlobal.isEmpty()) {
         createGroupAccessSection.setPermissions(
-            createGroupAccessSection
+            createGroupAccessSection.getPermissions().stream()
-                .getPermissions()
-                .stream()
                 .filter(p -> !Permission.CREATE.equals(p.getName()))
                 .collect(toList()));
         config.replace(createGroupAccessSection);

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
+        overrideCandidates.stream()
-            .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
+    return modules.stream()
-        .stream()
         .map(
             m -> {
               ModuleImpl a = m.getClass().getAnnotation(ModuleImpl.class);
               if (a == null) {
                 return m;
               }
-              return overrides
+              return overrides.stream()
-                  .stream()
                   .filter(
                       o ->
                           o.getClass()

java/com/google/gerrit/server/StarredChangesUtil.java

@@ -298,9 +298,7 @@ public class StarredChangesUtil {
 
   private static Set<String> getRefNames(Repository repo, String prefix) throws IOException {
     RefDatabase refDb = repo.getRefDatabase();
-    return refDb
+    return refDb.getRefsByPrefix(prefix).stream()
-        .getRefsByPrefix(prefix)
-        .stream()
         .map(r -> r.getName().substring(prefix.length()))
         .collect(toSet());
   }
@@ -425,8 +423,7 @@ public class StarredChangesUtil {
   }
 
   public static Set<Integer> getStarredPatchSets(Set<String> labels, String label) {
-    return labels
+    return labels.stream()
-        .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)))

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()
+    return user.getEffectiveGroups().getKnownGroups().stream()
-        .getKnownGroups()
-        .stream()
         .filter(a -> !SystemGroupBackend.isSystemGroup(a))
         .collect(toSet());
   }

java/com/google/gerrit/server/account/AccountManager.java

@@ -456,8 +456,7 @@ public class AccountManager {
               }
 
               if (filteredExtIdsByScheme.size() > 1
-                  || !filteredExtIdsByScheme
+                  || !filteredExtIdsByScheme.stream()
-                      .stream()
                       .anyMatch(e -> e.key().equals(who.getExternalIdKey()))) {
                 u.deleteExternalIds(filteredExtIdsByScheme);
               }
@@ -514,8 +513,7 @@ public class AccountManager {
             (a, u) -> {
               u.deleteExternalIds(extIds);
               if (a.getAccount().getPreferredEmail() != null
-                  && extIds
+                  && extIds.stream()
-                      .stream()
                       .anyMatch(e -> a.getAccount().getPreferredEmail().equals(e.email()))) {
                 u.setPreferredEmail(null);
               }

java/com/google/gerrit/server/account/AccountResolver.java

@@ -205,10 +205,7 @@ public class AccountResolver {
     // and pray we come up with a reasonable result list.
     // TODO(dborowitz): This doesn't match the documentation; consider whether it's possible to be
     // more strict here.
-    return accountQueryProvider
+    return accountQueryProvider.get().byDefault(nameOrEmail).stream()
-        .get()
-        .byDefault(nameOrEmail)
-        .stream()
         .map(a -> a.getAccount().getId())
         .collect(toSet());
   }

java/com/google/gerrit/server/account/Accounts.java

@@ -140,9 +140,7 @@ public class Accounts {
   }
 
   public static Stream<Account.Id> readUserRefs(Repository repo) throws IOException {
-    return repo.getRefDatabase()
+    return repo.getRefDatabase().getRefsByPrefix(RefNames.REFS_USERS).stream()
-        .getRefsByPrefix(RefNames.REFS_USERS)
-        .stream()
         .map(r -> Account.Id.fromRef(r.getName()))
         .filter(Objects::nonNull);
   }

java/com/google/gerrit/server/account/AccountsConsistencyChecker.java

@@ -37,9 +37,7 @@ public class AccountsConsistencyChecker {
     for (AccountState accountState : accounts.all()) {
       Account account = accountState.getAccount();
       if (account.getPreferredEmail() != null) {
-        if (!accountState
+        if (!accountState.getExternalIds().stream()
-            .getExternalIds()
-            .stream()
             .anyMatch(e -> account.getPreferredEmail().equals(e.email()))) {
           addError(
               String.format(

java/com/google/gerrit/server/account/AccountsUpdate.java

@@ -462,9 +462,7 @@ public class AccountsUpdate {
   }
 
   private static Set<Account.Id> getUpdatedAccounts(BatchRefUpdate batchRefUpdate) {
-    return batchRefUpdate
+    return batchRefUpdate.getCommands().stream()
-        .getCommands()
-        .stream()
         .map(c -> Account.Id.fromRef(c.getRefName()))
         .filter(Objects::nonNull)
         .collect(toSet());

java/com/google/gerrit/server/account/Emails.java

@@ -85,10 +85,7 @@ public class Emails {
   public ImmutableSetMultimap<String, Account.Id> getAccountsFor(String... emails)
       throws IOException, OrmException {
     ImmutableSetMultimap.Builder<String, Account.Id> builder = ImmutableSetMultimap.builder();
-    externalIds
+    externalIds.byEmails(emails).entries().stream()
-        .byEmails(emails)
-        .entries()
-        .stream()
         .forEach(e -> builder.put(e.getKey(), e.getValue().accountId()));
     executeIndexQuery(() -> queryProvider.get().byPreferredEmail(emails).entries().stream())
         .forEach(e -> builder.put(e.getKey(), e.getValue().getAccount().getId()));

java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java

@@ -154,10 +154,7 @@ public class GroupIncludeCacheImpl implements GroupIncludeCache {
     @Override
     public ImmutableSet<AccountGroup.UUID> load(Account.Id memberId) throws OrmException {
       try (TraceTimer timer = TraceContext.newTimer("Loading groups with member %s", memberId)) {
-        return groupQueryProvider
+        return groupQueryProvider.get().byMember(memberId).stream()
-            .get()
-            .byMember(memberId)
-            .stream()
             .map(InternalGroup::getGroupUUID)
             .collect(toImmutableSet());
       }
@@ -176,10 +173,7 @@ public class GroupIncludeCacheImpl implements GroupIncludeCache {
     @Override
     public ImmutableList<AccountGroup.UUID> load(AccountGroup.UUID key) throws OrmException {
       try (TraceTimer timer = TraceContext.newTimer("Loading parent groups of %s", key)) {
-        return groupQueryProvider
+        return groupQueryProvider.get().bySubgroup(key).stream()
-            .get()
-            .bySubgroup(key)
-            .stream()
             .map(InternalGroup::getGroupUUID)
             .collect(toImmutableList());
       }

java/com/google/gerrit/server/account/GroupMembers.java

@@ -127,9 +127,7 @@ public class GroupMembers {
     GroupControl groupControl = groupControlFactory.controlFor(new InternalGroupDescription(group));
 
     Set<Account> directMembers =
-        group
+        group.getMembers().stream()
-            .getMembers()
-            .stream()
             .filter(groupControl::canSeeMember)
             .map(accountCache::get)
             .flatMap(Streams::stream)

java/com/google/gerrit/server/account/ProjectWatches.java

@@ -202,9 +202,7 @@ public class ProjectWatches {
   private static ImmutableMap<ProjectWatchKey, ImmutableSet<NotifyType>> immutableCopyOf(
       Map<ProjectWatchKey, Set<NotifyType>> projectWatches) {
     ImmutableMap.Builder<ProjectWatchKey, ImmutableSet<NotifyType>> b = ImmutableMap.builder();
-    projectWatches
+    projectWatches.entrySet().stream()
-        .entrySet()
-        .stream()
         .forEach(e -> b.put(e.getKey(), ImmutableSet.copyOf(e.getValue())));
     return b.build();
   }

java/com/google/gerrit/server/account/UniversalGroupBackend.java

@@ -218,8 +218,7 @@ public class UniversalGroupBackend implements GroupBackend {
     @Override
     public void check() throws StartupException {
       String invalid =
-          cfg.getSubsections("groups")
+          cfg.getSubsections("groups").stream()
-              .stream()
               .filter(
                   sub -> {
                     AccountGroup.UUID uuid = new AccountGroup.UUID(sub);

java/com/google/gerrit/server/account/externalids/AllExternalIds.java

@@ -45,8 +45,7 @@ public abstract class AllExternalIds {
 
   private static ImmutableSetMultimap<String, ExternalId> byEmailCopy(
       Collection<ExternalId> externalIds) {
-    return externalIds
+    return externalIds.stream()
-        .stream()
         .filter(e -> !Strings.isNullOrEmpty(e.email()))
         .collect(toImmutableSetMultimap(e -> e.email(), e -> e));
   }
@@ -62,10 +61,7 @@ public abstract class AllExternalIds {
     public byte[] serialize(AllExternalIds object) {
       ObjectIdConverter idConverter = ObjectIdConverter.create();
       AllExternalIdsProto.Builder allBuilder = AllExternalIdsProto.newBuilder();
-      object
+      object.byAccount().values().stream()
-          .byAccount()
-          .values()
-          .stream()
           .map(extId -> toProto(idConverter, extId))
           .forEach(allBuilder::addExternalId);
       return ProtoCacheSerializers.toByteArray(allBuilder.build());
@@ -92,8 +88,7 @@ public abstract class AllExternalIds {
     public AllExternalIds deserialize(byte[] in) {
       ObjectIdConverter idConverter = ObjectIdConverter.create();
       return create(
-          ProtoCacheSerializers.parseUnchecked(AllExternalIdsProto.parser(), in)
+          ProtoCacheSerializers.parseUnchecked(AllExternalIdsProto.parser(), in).getExternalIdList()
-              .getExternalIdList()
               .stream()
               .map(proto -> toExternalId(idConverter, proto))
               .collect(toList()));

java/com/google/gerrit/server/account/externalids/ExternalId.java

@@ -82,8 +82,7 @@ public abstract class ExternalId implements Serializable {
    *     ExternalId#SCHEME_USERNAME} scheme
    */
   public static Optional<String> getUserName(Collection<ExternalId> extIds) {
-    return extIds
+    return extIds.stream()
-        .stream()
         .filter(e -> e.isScheme(SCHEME_USERNAME))
         .map(e -> e.key().id())
         .filter(u -> !Strings.isNullOrEmpty(u))

java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java

@@ -762,8 +762,7 @@ public class ExternalIdNotes extends VersionedMetaData {
       noteMapUpdates.clear();
       if (!footers.isEmpty()) {
         commit.setMessage(
-            footers
+            footers.stream()
-                .stream()
                 .sorted()
                 .collect(joining("\n", commit.getMessage().trim() + "\n\n", "")));
       }

java/com/google/gerrit/server/account/externalids/ExternalIds.java

@@ -71,8 +71,7 @@ public class ExternalIds {
 
   /** Returns the external IDs of the specified account that have the given scheme. */
   public Set<ExternalId> byAccount(Account.Id accountId, String scheme) throws IOException {
-    return byAccount(accountId)
+    return byAccount(accountId).stream()
-        .stream()
         .filter(e -> e.key().isScheme(scheme))
         .collect(toImmutableSet());
   }
@@ -85,8 +84,7 @@ public class ExternalIds {
   /** Returns the external IDs of the specified account that have the given scheme. */
   public Set<ExternalId> byAccount(Account.Id accountId, String scheme, ObjectId rev)
       throws IOException {
-    return byAccount(accountId, rev)
+    return byAccount(accountId, rev).stream()
-        .stream()
         .filter(e -> e.key().isScheme(scheme))
         .collect(toImmutableSet());
   }

java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java

@@ -93,10 +93,7 @@ public class ExternalIdsConsistencyChecker {
       }
     }
 
-    emails
+    emails.asMap().entrySet().stream()
-        .asMap()
-        .entrySet()
-        .stream()
         .filter(e -> e.getValue().size() > 1)
         .forEach(
             e ->
@@ -104,8 +101,7 @@ public class ExternalIdsConsistencyChecker {
                     String.format(
                         "Email '%s' is not unique, it's used by the following external IDs: %s",
                         e.getKey(),
-                        e.getValue()
+                        e.getValue().stream()
-                            .stream()
                             .map(k -> "'" + k.get() + "'")
                             .sorted()
                             .collect(joining(", "))),

java/com/google/gerrit/server/cache/h2/H2CacheImpl.java

@@ -345,8 +345,7 @@ public class H2CacheImpl<K, V> extends AbstractLoadingCache<K, V> implements Per
             }
           }
         } catch (Exception e) {
-          if (Throwables.getCausalChain(e)
+          if (Throwables.getCausalChain(e).stream()
-              .stream()
               .anyMatch(InvalidClassException.class::isInstance)) {
             // If deserialization failed using default Java serialization, this means we are using
             // the old serialVersionUID-based invalidation strategy. In that case, authors are

java/com/google/gerrit/server/cache/testing/SerializedClassSubject.java

@@ -81,8 +81,7 @@ public class SerializedClassSubject extends Subject<SerializedClassSubject, Clas
   public void hasFields(Map<String, Type> expectedFields) {
     isConcrete();
     assertThat(
-            FieldUtils.getAllFieldsList(actual())
+            FieldUtils.getAllFieldsList(actual()).stream()
-                .stream()
                 .filter(f -> !Modifier.isStatic(f.getModifiers()))
                 .collect(toImmutableMap(Field::getName, Field::getGenericType)))
         .containsExactlyEntriesIn(expectedFields);

java/com/google/gerrit/server/change/AddReviewersOp.java

@@ -263,8 +263,7 @@ public class AddReviewersOp implements BatchUpdateOp {
         !change.isWorkInProgress());
     if (!addedReviewers.isEmpty()) {
       List<AccountState> reviewers =
-          addedReviewers
+          addedReviewers.stream()
-              .stream()
               .map(r -> accountCache.get(r.getAccountId()))
               .flatMap(Streams::stream)
               .collect(toList());

java/com/google/gerrit/server/change/ChangeInserter.java

@@ -480,9 +480,7 @@ public class ChangeInserter implements InsertChangeOp {
                 cm.setNotify(notify);
                 cm.setAccountsToNotify(accountsToNotify);
                 cm.addReviewers(
-                    reviewerAdditions
+                    reviewerAdditions.flattenResults(AddReviewersOp.Result::addedReviewers).stream()
-                        .flattenResults(AddReviewersOp.Result::addedReviewers)
-                        .stream()
                         .map(PatchSetApproval::getAccountId)
                         .collect(toImmutableSet()));
                 cm.addReviewersByEmail(

java/com/google/gerrit/server/change/ChangeJson.java

@@ -613,8 +613,7 @@ public class ChangeJson {
     if (has(TRACKING_IDS)) {
       ListMultimap<String, String> set = trackingFooters.extract(cd.commitFooters());
       out.trackingIds =
-          set.entries()
+          set.entries().stream()
-              .stream()
               .map(e -> new TrackingIdInfo(e.getKey(), e.getValue()))
               .collect(toList());
     }
@@ -754,16 +753,14 @@ public class ChangeJson {
   }
 
   private Collection<AccountInfo> toAccountInfo(Collection<Account.Id> accounts) {
-    return accounts
+    return accounts.stream()
-        .stream()
         .map(accountLoader::get)
         .sorted(AccountInfoComparator.ORDER_NULLS_FIRST)
         .collect(toList());
   }
 
   private Collection<AccountInfo> toAccountInfoByEmail(Collection<Address> addresses) {
-    return addresses
+    return addresses.stream()
-        .stream()
         .map(a -> new AccountInfo(a.getName(), a.getEmail()))
         .sorted(AccountInfoComparator.ORDER_NULLS_FIRST)
         .collect(toList());

java/com/google/gerrit/server/change/ChangeResource.java

@@ -154,9 +154,7 @@ public class ChangeResource implements RestResource, HasETag {
       accounts.add(getChange().getAssignee());
     }
     try {
-      patchSetUtil
+      patchSetUtil.byChange(db.get(), notes).stream()
-          .byChange(db.get(), notes)
-          .stream()
           .map(PatchSet::getUploader)
           .forEach(accounts::add);
 

java/com/google/gerrit/server/change/IncludedInResolver.java

@@ -173,8 +173,7 @@ public class IncludedInResolver {
    */
   private static ImmutableSortedSet<String> getMatchingRefNames(
       Set<String> matchingRefs, Collection<Ref> allRefs) {
-    return allRefs
+    return allRefs.stream()
-        .stream()
         .map(Ref::getName)
         .filter(matchingRefs::contains)
         .map(Repository::shortenRefName)

java/com/google/gerrit/server/change/LabelsJson.java

@@ -326,9 +326,7 @@ public class LabelsJson {
     }
 
     if (detailed) {
-      labels
+      labels.entrySet().stream()
-          .entrySet()
-          .stream()
           .filter(e -> labelTypes.byLabel(e.getKey()) != null)
           .forEach(e -> setLabelValues(labelTypes.byLabel(e.getKey()), e.getValue()));
     }
@@ -524,9 +522,7 @@ public class LabelsJson {
         Maps.newHashMapWithExpectedSize(permittedLabels.size());
     for (String label : permittedLabels.keySet()) {
       List<Integer> permittedVotingRange =
-          permittedLabels
+          permittedLabels.get(label).stream()
-              .get(label)
-              .stream()
               .map(this::parseRangeValue)
               .filter(java.util.Objects::nonNull)
               .sorted()

java/com/google/gerrit/server/change/ReviewerAdder.java

@@ -608,8 +608,7 @@ public class ReviewerAdder {
     }
 
     public ImmutableList<ReviewerAddition> getFailures() {
-      return additions
+      return additions.stream()
-          .stream()
           .filter(a -> a.isFailure() && !a.isIgnorableFailure())
           .collect(toImmutableList());
     }
@@ -639,8 +638,7 @@ public class ReviewerAdder {
               a ->
                   checkArgument(
                       a.op != null && a.op.getResult() != null, "missing result on %s", a));
-      return additions()
+      return additions().stream()
-          .stream()
           .map(a -> a.op.getResult())
           .map(func)
           .flatMap(Collection::stream)
@@ -648,8 +646,7 @@ public class ReviewerAdder {
     }
 
     private ImmutableList<ReviewerAddition> additions() {
-      return additions
+      return additions.stream()
-          .stream()
           .filter(
               a -> {
                 if (a.isFailure()) {

java/com/google/gerrit/server/config/ConfigUpdatedEvent.java

@@ -97,8 +97,7 @@ public class ConfigUpdatedEvent {
   private Multimap<UpdateResult, ConfigUpdateEntry> createUpdate(
       Set<ConfigKey> entries, UpdateResult updateResult) {
     Multimap<UpdateResult, ConfigUpdateEntry> updates = ArrayListMultimap.create();
-    entries
+    entries.stream()
-        .stream()
         .filter(this::isValueUpdated)
         .map(e -> new ConfigUpdateEntry(e, getString(e, oldConfig), getString(e, newConfig)))
         .forEach(e -> updates.put(updateResult, e));

java/com/google/gerrit/server/config/RepositoryConfig.java

@@ -61,8 +61,7 @@ public class RepositoryConfig {
   }
 
   public ImmutableList<Path> getAllBasePaths() {
-    return cfg.getSubsections(SECTION_NAME)
+    return cfg.getSubsections(SECTION_NAME).stream()
-        .stream()
         .map(sub -> cfg.getString(SECTION_NAME, sub, BASE_PATH_NAME))
         .filter(Objects::nonNull)
         .map(Paths::get)
@@ -90,8 +89,7 @@ public class RepositoryConfig {
    */
   @Nullable
   private String findSubSection(String project) {
-    return cfg.getSubsections(SECTION_NAME)
+    return cfg.getSubsections(SECTION_NAME).stream()
-        .stream()
         .filter(ss -> isMatch(ss, project))
         .max(comparing(String::length))
         .orElse(null);

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
+        batchRefUpdate.getCommands().stream()
-            .getCommands()
-            .stream()
             .filter(c -> c.getResult() == ReceiveCommand.Result.LOCK_FAILURE)
             .map(ReceiveCommand::getRefName)
             .collect(toImmutableList());

java/com/google/gerrit/server/git/MergeUtil.java

@@ -291,9 +291,7 @@ public class MergeUtil {
           ((ResolveMerger) m).getMergeResults();
 
       filesWithGitConflicts =
-          mergeResults
+          mergeResults.entrySet().stream()
-              .entrySet()
-              .stream()
               .filter(e -> e.getValue().containsConflicts())
               .map(Map.Entry::getKey)
               .collect(toImmutableSet());

java/com/google/gerrit/server/git/receive/ReceiveCommits.java

@@ -700,9 +700,7 @@ class ReceiveCommits {
     List<CreateRequest> created =
         newChanges.stream().filter(r -> r.change != null).collect(toList());
     List<ReplaceRequest> updated =
-        replaceByChange
+        replaceByChange.values().stream()
-            .values()
-            .stream()
             .filter(r -> r.inputCommand.getResult() == OK)
             .sorted(comparingInt(r -> r.notes.getChangeId().get()))
             .collect(toList());
@@ -812,9 +810,7 @@ class ReceiveCommits {
         throw INSERT_EXCEPTION.apply(e);
       }
 
-      replaceByChange
+      replaceByChange.values().stream()
-          .values()
-          .stream()
           .forEach(req -> resultChangeIds.add(Key.REPLACED, req.ontoChange));
       newChanges.stream().forEach(req -> resultChangeIds.add(Key.CREATED, req.changeId));
 

java/com/google/gerrit/server/git/receive/ReplaceOp.java

@@ -383,13 +383,9 @@ public class ReplaceOp implements BatchUpdateOp {
       inputs =
           Streams.concat(
               inputs,
-              magicBranch
+              magicBranch.getCombinedReviewers(fromFooters).stream()
-                  .getCombinedReviewers(fromFooters)
-                  .stream()
                   .map(r -> newAddReviewerInput(r, ReviewerState.REVIEWER)),
-              magicBranch
+              magicBranch.getCombinedCcs(fromFooters).stream()
-                  .getCombinedCcs(fromFooters)
-                  .stream()
                   .map(r -> newAddReviewerInput(r, ReviewerState.CC)));
     }
     return inputs.collect(toImmutableList());
@@ -582,9 +578,7 @@ public class ReplaceOp implements BatchUpdateOp {
         cm.addReviewers(
             Streams.concat(
                     oldRecipients.getReviewers().stream(),
-                    reviewerAdditions
+                    reviewerAdditions.flattenResults(AddReviewersOp.Result::addedReviewers).stream()
-                        .flattenResults(AddReviewersOp.Result::addedReviewers)
-                        .stream()
                         .map(PatchSetApproval::getAccountId))
                 .collect(toImmutableSet()));
         cm.addExtraCC(

java/com/google/gerrit/server/git/validators/AccountValidator.java

@@ -114,9 +114,7 @@ public class AccountValidator {
     accountConfig.load(allUsersName, rw, commit);
     if (messages != null) {
       messages.addAll(
-          accountConfig
+          accountConfig.getValidationErrors().stream()
-              .getValidationErrors()
-              .stream()
               .map(ValidationError::getMessage)
               .collect(toSet()));
     }

java/com/google/gerrit/server/git/validators/CommitValidators.java

@@ -699,8 +699,7 @@ public class CommitValidators {
           List<ConsistencyProblemInfo> problems =
               externalIdsConsistencyChecker.check(receiveEvent.commit);
           List<CommitValidationMessage> msgs =
-              problems
+              problems.stream()
-                  .stream()
                   .map(
                       p ->
                           new CommitValidationMessage(
@@ -766,8 +765,7 @@ public class CommitValidators {
         if (!errorMessages.isEmpty()) {
           throw new CommitValidationException(
               "invalid account configuration",
-              errorMessages
+              errorMessages.stream()
-                  .stream()
                   .map(m -> new CommitValidationMessage(m, Type.ERROR))
                   .collect(toList()));
         }

java/com/google/gerrit/server/group/PeriodicGroupIndexer.java

@@ -125,8 +125,7 @@ public class PeriodicGroupIndexer implements Runnable {
   public synchronized void run() {
     try (Repository allUsers = repoManager.openRepository(allUsersName)) {
       ImmutableSet<AccountGroup.UUID> newGroupUuids =
-          GroupNameNotes.loadAllGroups(allUsers)
+          GroupNameNotes.loadAllGroups(allUsers).stream()
-              .stream()
               .map(GroupReference::getUUID)
               .collect(toImmutableSet());
       GroupIndexer groupIndexer = groupIndexerProvider.get();

java/com/google/gerrit/server/group/db/GroupConfigCommitMessage.java

@@ -107,13 +107,11 @@ class GroupConfigCommitMessage {
     Function<T, String> toString = element -> toParsableString.apply(auditLogFormatter, element);
 
     Stream<String> removedElements =
-        Sets.difference(oldElements, newElements)
+        Sets.difference(oldElements, newElements).stream()
-            .stream()
             .map(toString)
             .map((removalFooterKey.getName() + ": ")::concat);
     Stream<String> addedElements =
-        Sets.difference(newElements, oldElements)
+        Sets.difference(newElements, oldElements).stream()
-            .stream()
             .map(toString)
             .map((additionFooterKey.getName() + ": ")::concat);
     return Stream.concat(removedElements, addedElements);

java/com/google/gerrit/server/group/db/GroupNameNotes.java

@@ -295,8 +295,7 @@ public class GroupNameNotes extends VersionedMetaData {
   private static ImmutableBiMap<AccountGroup.UUID, String> toBiMap(
       Collection<GroupReference> groupReferences) {
     try {
-      return groupReferences
+      return groupReferences.stream()
-          .stream()
           .collect(toImmutableBiMap(GroupReference::getUUID, GroupReference::getName));
     } catch (IllegalArgumentException e) {
       throw new IllegalArgumentException(UNIQUE_REF_ERROR, e);

java/com/google/gerrit/server/group/db/Groups.java

@@ -124,9 +124,7 @@ public class Groups {
           getGroupFromNoteDb(allUsersName, allUsersRepo, internalGroup.getUUID());
       group.map(InternalGroup::getSubgroups).ifPresent(allSubgroups::addAll);
     }
-    return allSubgroups
+    return allSubgroups.build().stream()
-        .build()
-        .stream()
         .filter(groupUuid -> !AccountGroup.isInternalGroup(groupUuid));
   }
 

java/com/google/gerrit/server/index/account/AccountField.java

@@ -157,8 +157,7 @@ public class AccountField {
       storedOnly("external_id_state")
           .buildRepeatable(
               a ->
-                  a.getExternalIds()
+                  a.getExternalIds().stream()
-                      .stream()
                       .filter(e -> e.blobId() != null)
                       .map(ExternalId::toByteArray)
                       .collect(toSet()));

java/com/google/gerrit/server/index/change/AllChangesIndexer.java

@@ -135,9 +135,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()
+    return repo.getRefDatabase().getRefsByPrefix(RefNames.REFS_CHANGES).stream()
-        .getRefsByPrefix(RefNames.REFS_CHANGES)
-        .stream()
         .map(r -> Change.Id.fromRef(r.getName()))
         .filter(Objects::nonNull)
         .distinct()

java/com/google/gerrit/server/index/change/ChangeField.java

@@ -737,8 +737,7 @@ public class ChangeField {
 
   @VisibleForTesting
   static List<SubmitRecord> parseSubmitRecords(Collection<String> values) {
-    return values
+    return values.stream()
-        .stream()
         .map(v -> GSON.fromJson(v, StoredSubmitRecord.class).toSubmitRecord())
         .collect(toList());
   }

java/com/google/gerrit/server/index/project/StalenessChecker.java

@@ -66,9 +66,7 @@ public class StalenessChecker {
 
     SetMultimap<Project.NameKey, RefState> currentRefStates =
         MultimapBuilder.hashKeys().hashSetValues().build();
-    projectData
+    projectData.tree().stream()
-        .tree()
-        .stream()
         .filter(p -> p.getProject().getConfigRefState() != null)
         .forEach(
             p ->

java/com/google/gerrit/server/logging/CallerFinder.java

@@ -170,8 +170,7 @@ public abstract class CallerFinder {
   public LazyArg<String> findCaller() {
     return lazy(
         () ->
-            targets()
+            targets().stream()
-                .stream()
                 .map(t -> findCallerOf(t, skip() + 1))
                 .filter(Optional::isPresent)
                 .findFirst()

java/com/google/gerrit/server/logging/TraceContext.java

@@ -134,10 +134,7 @@ public class TraceContext implements AutoCloseable {
     }
 
     Optional<String> existingTraceId =
-        LoggingContext.getInstance()
+        LoggingContext.getInstance().getTagsAsMap().get(RequestId.Type.TRACE_ID.name()).stream()
-            .getTagsAsMap()
-            .get(RequestId.Type.TRACE_ID.name())
-            .stream()
             .findAny();
     if (existingTraceId.isPresent()) {
       // request tracing was already started, no need to generate a new trace ID

java/com/google/gerrit/server/mail/receive/MailProcessor.java

@@ -233,8 +233,7 @@ public class MailProcessor {
       // comments from the outbound email.
       // TODO(hiesel) Also filter by original comment author.
       Collection<Comment> comments =
-          cd.publishedComments()
+          cd.publishedComments().stream()
-              .stream()
               .filter(c -> (c.writtenOn.getTime() / 1000) == (metadata.timestamp.getTime() / 1000))
               .sorted(CommentsUtil.COMMENT_ORDER)
               .collect(toList());
@@ -427,8 +426,7 @@ public class MailProcessor {
 
   private Set<String> existingMessageIds(ChangeData cd) throws OrmException {
     Set<String> existingMessageIds = new HashSet<>();
-    cd.messages()
+    cd.messages().stream()
-        .stream()
         .forEach(
             m -> {
               String messageId = CommentsUtil.extractMessageId(m.getTag());
@@ -436,8 +434,7 @@ public class MailProcessor {
                 existingMessageIds.add(messageId);
               }
             });
-    cd.publishedComments()
+    cd.publishedComments().stream()
-        .stream()
         .forEach(
             c -> {
               String messageId = CommentsUtil.extractMessageId(c.tag);

java/com/google/gerrit/server/mail/send/CommentSender.java

@@ -458,8 +458,7 @@ public class CommentSender extends ReplyToChangeSender {
   }
 
   private List<Map<String, Object>> commentBlocksToSoyData(List<CommentFormatter.Block> blocks) {
-    return blocks
+    return blocks.stream()
-        .stream()
         .map(
             b -> {
               Map<String, Object> map = new HashMap<>();

java/com/google/gerrit/server/notedb/ChangeBundle.java

@@ -557,8 +557,7 @@ public class ChangeBundle {
     }
     if (!bs.isEmpty()) {
       sb.append("Only in B:");
-      bs.values()
+      bs.values().stream()
-          .stream()
           .sorted(CHANGE_MESSAGE_COMPARATOR)
           .forEach(cm -> sb.append("\n  ").append(cm));
     }
@@ -675,9 +674,7 @@ public class ChangeBundle {
   private static boolean createdOnIsMonotonic(
       Map<?, PatchSet> patchSets, Set<PatchSet.Id> limitToIds) {
     List<PatchSet> orderedById =
-        patchSets
+        patchSets.values().stream()
-            .values()
-            .stream()
             .filter(ps -> limitToIds.contains(ps.getId()))
             .sorted(ChangeUtil.PS_ID_ORDER)
             .collect(toList());

java/com/google/gerrit/server/notedb/ChangeNotes.java

@@ -336,8 +336,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
       ScanResult sr = scanChangeIds(repo);
       PrimaryStorage defaultStorage = args.migration.changePrimaryStorage();
 
-      return sr.all()
+      return sr.all().stream()
-          .stream()
           .map(id -> scanOneNoteDbChange(db, project, sr, defaultStorage, id))
           .filter(Objects::nonNull);
     }

java/com/google/gerrit/server/notedb/ChangeNotesState.java

@@ -565,23 +565,17 @@ public abstract class ChangeNotesState {
               .changeId(changeId)
               .columns(toChangeColumns(changeId, proto.getColumns()))
               .pastAssignees(
-                  proto
+                  proto.getPastAssigneeList().stream()
-                      .getPastAssigneeList()
-                      .stream()
                       .map(Account.Id::new)
                       .collect(toImmutableSet()))
               .hashtags(proto.getHashtagList())
               .patchSets(
-                  proto
+                  proto.getPatchSetList().stream()
-                      .getPatchSetList()
-                      .stream()
                       .map(PATCH_SET_CODEC::decode)
                       .map(ps -> Maps.immutableEntry(ps.getId(), ps))
                       .collect(toImmutableList()))
               .approvals(
-                  proto
+                  proto.getApprovalList().stream()
-                      .getApprovalList()
-                      .stream()
                       .map(APPROVAL_CODEC::decode)
                       .map(a -> Maps.immutableEntry(a.getPatchSetId(), a))
                       .collect(toImmutableList()))
@@ -590,28 +584,20 @@ public abstract class ChangeNotesState {
               .pendingReviewers(toReviewerSet(proto.getPendingReviewerList()))
               .pendingReviewersByEmail(toReviewerByEmailSet(proto.getPendingReviewerByEmailList()))
               .allPastReviewers(
-                  proto
+                  proto.getPastReviewerList().stream()
-                      .getPastReviewerList()
-                      .stream()
                       .map(Account.Id::new)
                       .collect(toImmutableList()))
               .reviewerUpdates(toReviewerStatusUpdateList(proto.getReviewerUpdateList()))
               .submitRecords(
-                  proto
+                  proto.getSubmitRecordList().stream()
-                      .getSubmitRecordList()
-                      .stream()
                       .map(r -> GSON.fromJson(r, StoredSubmitRecord.class).toSubmitRecord())
                       .collect(toImmutableList()))
               .changeMessages(
-                  proto
+                  proto.getChangeMessageList().stream()
-                      .getChangeMessageList()
-                      .stream()
                       .map(MESSAGE_CODEC::decode)
                       .collect(toImmutableList()))
               .publishedComments(
-                  proto
+                  proto.getPublishedCommentList().stream()
-                      .getPublishedCommentList()
-                      .stream()
                       .map(r -> GSON.fromJson(r, Comment.class))
                       .collect(toImmutableListMultimap(c -> new RevId(c.revId), c -> c)));
       if (proto.getHasReadOnlyUntil()) {

java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java

@@ -141,9 +141,7 @@ public class DeleteCommentRewriter implements NoteDbRewriter {
       throws IOException, ConfigInvalidException {
     return RevisionNoteMap.parse(
             changeNoteJson, legacyChangeNoteRead, changeId, reader, noteMap, PUBLISHED)
-        .revisionNotes
+        .revisionNotes.values().stream()
-        .values()
-        .stream()
         .flatMap(n -> n.getComments().stream())
         .collect(toMap(c -> c.key.uuid, Function.identity()));
   }
@@ -189,9 +187,7 @@ public class DeleteCommentRewriter implements NoteDbRewriter {
    */
   private List<Comment> getDeletedComments(
       Map<String, Comment> parMap, Map<String, Comment> curMap) {
-    return parMap
+    return parMap.entrySet().stream()
-        .entrySet()
-        .stream()
         .filter(c -> !curMap.containsKey(c.getKey()))
         .map(Map.Entry::getValue)
         .collect(toList());

java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java

@@ -419,9 +419,7 @@ public class ChangeRebuilderImpl extends ChangeRebuilder {
 
   private static List<Comment> getComments(
       ChangeBundle bundle, String serverId, PatchLineComment.Status status, PatchSet ps) {
-    return bundle
+    return bundle.getPatchLineComments().stream()
-        .getPatchLineComments()
-        .stream()
         .filter(c -> c.getPatchSetId().equals(ps.getId()) && c.getStatus() == status)
         .map(plc -> plc.asComment(serverId))
         .sorted(CommentsUtil.COMMENT_ORDER)

java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java

@@ -447,8 +447,7 @@ public class NoteDbMigrator implements AutoCloseable {
       int sequenceGap,
       boolean autoMigrate)
       throws MigrationException {
-    if (ImmutableList.of(!changes.isEmpty(), !projects.isEmpty(), !skipProjects.isEmpty())
+    if (ImmutableList.of(!changes.isEmpty(), !projects.isEmpty(), !skipProjects.isEmpty()).stream()
-            .stream()
             .filter(e -> e)
             .count()
         > 1) {
@@ -628,8 +627,7 @@ public class NoteDbMigrator implements AutoCloseable {
 
     try (ContextHelper contextHelper = new ContextHelper()) {
       List<ListenableFuture<Boolean>> futures =
-          allChanges
+          allChanges.stream()
-              .stream()
               .map(
                   id ->
                       executor.submit(

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
+    return edits.stream()
-        .stream()
         .collect(
             toMultimap(
                 ContextAwareEdit::getNewFilePath, Function.identity(), ArrayListMultimap::create));
@@ -112,9 +111,7 @@ class EditTransformer {
         transformingEntries.stream().collect(groupingBy(EditTransformer::getOldFilePath));
 
     edits =
-        editsPerFilePath
+        editsPerFilePath.entrySet().stream()
-            .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
+    return transformingEntries.stream()
-        .stream()
         .flatMap(
             transEntry ->
                 transformEdits(
-                        sideStrategy, originalEdits, transEntry.getEdits(), transEntry.getNewName())
+                    sideStrategy, originalEdits, transEntry.getEdits(), transEntry.getNewName())
                     .stream());
   }
 

java/com/google/gerrit/server/patch/PatchListLoader.java

@@ -287,8 +287,7 @@ public class PatchListLoader implements Callable<PatchList> {
     }
 
     List<DiffEntry> relevantDiffEntries =
-        diffEntries
+        diffEntries.stream()
-            .stream()
             .filter(diffEntry -> isTouched(touchedFilePaths, diffEntry))
             .collect(toImmutableList());
 
@@ -397,8 +396,7 @@ public class PatchListLoader implements Callable<PatchList> {
   }
 
   private static Set<Edit> getContentEdits(Set<ContextAwareEdit> editsDueToRebase) {
-    return editsDueToRebase
+    return editsDueToRebase.stream()
-        .stream()
         .map(ContextAwareEdit::toEdit)
         .filter(Optional::isPresent)
         .map(Optional::get)

java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java

@@ -252,8 +252,7 @@ public class DefaultPermissionBackend extends PermissionBackend {
     private boolean allow(Collection<PermissionRule> rules) {
       return user.getEffectiveGroups()
           .containsAnyOf(
-              rules
+              rules.stream()
-                  .stream()
                   .filter(r -> r.getAction() == Action.ALLOW)
                   .map(r -> r.getGroup().getUUID())
                   .collect(toSet()));
@@ -261,8 +260,7 @@ public class DefaultPermissionBackend extends PermissionBackend {
 
     private boolean notDenied(Collection<PermissionRule> rules) {
       Set<AccountGroup.UUID> denied =
-          rules
+          rules.stream()
-              .stream()
               .filter(r -> r.getAction() != Action.ALLOW)
               .map(r -> r.getGroup().getUUID())
               .collect(toSet());

java/com/google/gerrit/server/permissions/PermissionBackend.java

@@ -502,9 +502,7 @@ public abstract class PermissionBackend {
     }
 
     private static Set<LabelPermission.WithValue> valuesOf(LabelType label) {
-      return label
+      return label.getValues().stream()
-          .getValues()
-          .stream()
           .map((v) -> new LabelPermission.WithValue(label, v))
           .collect(toSet());
     }

java/com/google/gerrit/server/permissions/PermissionCollection.java

@@ -151,8 +151,7 @@ public class PermissionCollection {
             Lists.reverse(Lists.newArrayList(sectionToProject.entrySet()));
 
         Map<Project.NameKey, List<AccessSection>> accessByProject =
-            accessDescending
+            accessDescending.stream()
-                .stream()
                 .collect(
                     Collectors.groupingBy(
                         Map.Entry::getValue,

java/com/google/gerrit/server/project/ChildProjects.java

@@ -93,8 +93,7 @@ public class ChildProjects {
       Project.NameKey parent)
       throws PermissionBackendException {
     List<Project.NameKey> canSee =
-        perm.filter(ProjectPermission.ACCESS, children.get(parent))
+        perm.filter(ProjectPermission.ACCESS, children.get(parent)).stream()
-            .stream()
             .sorted()
             .collect(toList());
     children.removeAll(parent); // removing all entries prevents cycles.

java/com/google/gerrit/server/project/ProjectCacheImpl.java

@@ -235,8 +235,7 @@ public class ProjectCacheImpl implements ProjectCache {
 
   @Override
   public Set<AccountGroup.UUID> guessRelevantGroupUUIDs() {
-    return all()
+    return all().stream()
-        .stream()
         .map(n -> byName.getIfPresent(n.get()))
         .filter(Objects::nonNull)
         .flatMap(p -> p.getConfig().getAllGroupUUIDs().stream())

java/com/google/gerrit/server/project/ProjectConfig.java

@@ -1168,14 +1168,12 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError.
 
   private void saveNotifySections(Config rc, Set<AccountGroup.UUID> keepGroups) {
     for (NotifyConfig nc : sort(notifySections.values())) {
-      nc.getGroups()
+      nc.getGroups().stream()
-          .stream()
           .map(gr -> gr.getUUID())
           .filter(Objects::nonNull)
           .forEach(keepGroups::add);
       List<String> email =
-          nc.getGroups()
+          nc.getGroups().stream()
-              .stream()
               .map(gr -> new PermissionRule(gr).asString(false))
               .sorted()
               .collect(toList());

java/com/google/gerrit/server/project/ProjectState.java

@@ -219,8 +219,7 @@ public class ProjectState {
     }
 
     // If not, we check the parents.
-    return parents()
+    return parents().stream()
-        .stream()
         .map(ProjectState::getConfig)
         .map(ProjectConfig::getRulesId)
         .anyMatch(Objects::nonNull);

java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java

@@ -296,9 +296,7 @@ public class ProjectsConsistencyChecker {
 
                 // Auto-close by commit
                 for (ObjectId patchSetSha1 :
-                    autoCloseableChange
+                    autoCloseableChange.patchSets().stream()
-                        .patchSets()
-                        .stream()
                         .map(ps -> ObjectId.fromString(ps.getRevision().get()))
                         .collect(toSet())) {
                   if (mergedSha1s.contains(patchSetSha1)) {

java/com/google/gerrit/server/project/SuggestParentCandidates.java

@@ -42,9 +42,7 @@ public class SuggestParentCandidates {
   }
 
   public List<Project.NameKey> getNameKeys() throws PermissionBackendException {
-    return permissionBackend
+    return permissionBackend.currentUser().filter(ProjectPermission.ACCESS, readableParents())
-        .currentUser()
-        .filter(ProjectPermission.ACCESS, readableParents())
         .stream()
         .sorted()
         .collect(toList());

java/com/google/gerrit/server/query/account/InternalAccountQuery.java

@@ -108,8 +108,7 @@ public class InternalAccountQuery extends InternalQuery<AccountState> {
       return ImmutableList.of();
     }
 
-    return query(AccountPredicates.preferredEmail(email))
+    return query(AccountPredicates.preferredEmail(email)).stream()
-        .stream()
         .filter(a -> a.getAccount().getPreferredEmail().equals(email))
         .collect(toList());
   }
@@ -145,8 +144,7 @@ public class InternalAccountQuery extends InternalQuery<AccountState> {
     for (int i = 0; i < emailList.size(); i++) {
       String email = emailList.get(i);
       Set<AccountState> matchingAccounts =
-          r.get(i)
+          r.get(i).stream()
-              .stream()
               .filter(a -> a.getAccount().getPreferredEmail().equals(email))
               .collect(toSet());
       accountsByEmail.putAll(email, matchingAccounts);

java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java

@@ -1358,8 +1358,7 @@ public class ChangeQueryBuilder extends QueryBuilder<ChangeData> {
       if (!forDefaultField || accounts.size() <= MAX_ACCOUNTS_PER_DEFAULT_FIELD) {
         reviewerPredicate =
             Predicate.or(
-                accounts
+                accounts.stream()
-                    .stream()
                     .map(id -> ReviewerPredicate.forState(id, state))
                     .collect(toList()));
       }

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
+        accounts.stream()
-            .stream()
             .map(a -> new SubmitRecordPredicate(status.name() + ',' + lowerLabel + ',' + a.get()))
             .collect(toList()));
   }

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)
+    return cd.submitRecords(ChangeField.SUBMIT_RULE_OPTIONS_STRICT).stream()
-        .stream()
         .anyMatch(r -> r.status == status);
   }
 

java/com/google/gerrit/server/restapi/account/DeleteEmail.java

@@ -85,9 +85,7 @@ public class DeleteEmail implements RestModifyView<AccountResource.Email, Input>
     }
 
     Set<ExternalId> extIds =
-        externalIds
+        externalIds.byAccount(user.getAccountId()).stream()
-            .byAccount(user.getAccountId())
-            .stream()
             .filter(e -> email.equals(e.email()))
             .collect(toSet());
     if (extIds.isEmpty()) {

java/com/google/gerrit/server/restapi/account/DeleteExternalIds.java

@@ -77,9 +77,7 @@ public class DeleteExternalIds implements RestModifyView<AccountResource, List<S
     }
 
     Map<ExternalId.Key, ExternalId> externalIdMap =
-        externalIds
+        externalIds.byAccount(resource.getUser().getAccountId()).stream()
-            .byAccount(resource.getUser().getAccountId())
-            .stream()
             .collect(toMap(ExternalId::key, Function.identity()));
 
     List<ExternalId> toDelete = new ArrayList<>();

java/com/google/gerrit/server/restapi/account/DeleteWatchedProjects.java

@@ -76,8 +76,7 @@ public class DeleteWatchedProjects
             accountId,
             u ->
                 u.deleteProjectWatches(
-                    input
+                    input.stream()
-                        .stream()
                         .filter(Objects::nonNull)
                         .map(w -> ProjectWatchKey.create(new Project.NameKey(w.project), w.filter))
                         .collect(toList())));

java/com/google/gerrit/server/restapi/account/GetEmails.java

@@ -48,9 +48,7 @@ public class GetEmails implements RestReadView<AccountResource> {
     if (!self.get().hasSameAccountId(rsrc.getUser())) {
       permissionBackend.currentUser().check(GlobalPermission.MODIFY_ACCOUNT);
     }
-    return rsrc.getUser()
+    return rsrc.getUser().getEmailAddresses().stream()
-        .getEmailAddresses()
-        .stream()
         .filter(Objects::nonNull)
         .map(e -> toEmailInfo(rsrc, e))
         .sorted(comparing((EmailInfo e) -> e.email))

java/com/google/gerrit/server/restapi/account/GetWatchedProjects.java

@@ -65,10 +65,7 @@ public class GetWatchedProjects implements RestReadView<AccountResource> {
 
     Account.Id accountId = rsrc.getUser().getAccountId();
     AccountState account = accounts.get(accountId).orElseThrow(ResourceNotFoundException::new);
-    return account
+    return account.getProjectWatches().entrySet().stream()
-        .getProjectWatches()
-        .entrySet()
-        .stream()
         .map(e -> toProjectWatchInfo(e.getKey(), e.getValue()))
         .sorted(
             comparing((ProjectWatchInfo pwi) -> pwi.project)

java/com/google/gerrit/server/restapi/account/PutPreferred.java

@@ -93,8 +93,7 @@ public class PutPreferred implements RestModifyView<AccountResource.Email, Input
                 // check if the user has a matching email
                 String matchingEmail = null;
                 for (String email :
-                    a.getExternalIds()
+                    a.getExternalIds().stream()
-                        .stream()
                         .map(ExternalId::email)
                         .filter(Objects::nonNull)
                         .collect(toSet())) {
@@ -121,8 +120,7 @@ public class PutPreferred implements RestModifyView<AccountResource.Email, Input
                               + " by the following account(s): %s",
                           preferredEmail,
                           user.getAccountId(),
-                          existingExtIdsWithThisEmail
+                          existingExtIdsWithThisEmail.stream()
-                              .stream()
                               .map(ExternalId::accountId)
                               .collect(toList()));
                       exception.set(

java/com/google/gerrit/server/restapi/change/CherryPickChange.java

@@ -389,9 +389,7 @@ public class CherryPickChange {
 
     if (!cherryPickCommit.getFilesWithGitConflicts().isEmpty()) {
       stringBuilder.append("\n\nThe following files contain Git conflicts:\n");
-      cherryPickCommit
+      cherryPickCommit.getFilesWithGitConflicts().stream()
-          .getFilesWithGitConflicts()
-          .stream()
           .sorted()
           .forEach(filePath -> stringBuilder.append("* ").append(filePath).append("\n"));
     }

java/com/google/gerrit/server/restapi/change/GetRelated.java

@@ -127,9 +127,7 @@ public class GetRelated implements RestReadView<RevisionResource> {
   @VisibleForTesting
   public static Set<String> getAllGroups(ChangeNotes notes, ReviewDb db, PatchSetUtil psUtil)
       throws OrmException {
-    return psUtil
+    return psUtil.byChange(db, notes).stream()
-        .byChange(db, notes)
-        .stream()
         .flatMap(ps -> ps.getGroups().stream())
         .collect(toSet());
   }

java/com/google/gerrit/server/restapi/change/ListChangeMessages.java

@@ -53,8 +53,7 @@ public class ListChangeMessages implements RestReadView<ChangeResource> {
     List<ChangeMessage> messages =
         changeMessagesUtil.byChange(dbProvider.get(), resource.getNotes());
     List<ChangeMessageInfo> messageInfos =
-        messages
+        messages.stream()
-            .stream()
             .map(m -> createChangeMessageInfo(m, accountLoader))
             .collect(Collectors.toList());
     accountLoader.fill();

java/com/google/gerrit/server/restapi/change/PostReview.java

@@ -806,8 +806,7 @@ public class PostReview
   private static void ensureRangesDoNotOverlap(
       String commentPath, List<FixReplacementInfo> fixReplacementInfos) throws BadRequestException {
     List<Range> sortedRanges =
-        fixReplacementInfos
+        fixReplacementInfos.stream()
-            .stream()
             .map(fixReplacementInfo -> fixReplacementInfo.range)
             .sorted()
             .collect(toList());
@@ -1078,17 +1077,13 @@ public class PostReview
     }
 
     private Set<CommentSetEntry> readExistingComments(ChangeContext ctx) throws OrmException {
-      return commentsUtil
+      return commentsUtil.publishedByChange(ctx.getDb(), ctx.getNotes()).stream()
-          .publishedByChange(ctx.getDb(), ctx.getNotes())
-          .stream()
           .map(CommentSetEntry::create)
           .collect(toSet());
     }
 
     private Set<CommentSetEntry> readExistingRobotComments(ChangeContext ctx) throws OrmException {
-      return commentsUtil
+      return commentsUtil.robotCommentsByChange(ctx.getNotes()).stream()
-          .robotCommentsByChange(ctx.getNotes())
-          .stream()
           .map(CommentSetEntry::create)
           .collect(toSet());
     }
@@ -1313,8 +1308,7 @@ public class PostReview
       if (!reduced.isEmpty()) {
         throw new ResourceConflictException(
             "Cannot reduce vote on labels for closed change: "
-                + reduced
+                + reduced.stream()
-                    .stream()
                     .map(PatchSetApproval::getLabel)
                     .distinct()
                     .sorted()

java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java

@@ -195,9 +195,7 @@ public class ReviewerRecommender {
 
     // Sort results
     Stream<Entry<Account.Id, MutableDouble>> sorted =
-        reviewerScores
+        reviewerScores.entrySet().stream()
-            .entrySet()
-            .stream()
             .sorted(Collections.reverseOrder(Map.Entry.comparingByValue()));
     List<Account.Id> sortedSuggestions = sorted.map(Map.Entry::getKey).collect(toList());
     logger.atFine().log("Sorted suggestions: %s", sortedSuggestions);

java/com/google/gerrit/server/restapi/change/ReviewersUtil.java

@@ -247,9 +247,7 @@ public class ReviewersUtil {
                         ImmutableSet.of(AccountField.ID.getName())))
                 .readRaw();
         List<Account.Id> matches =
-            result
+            result.toList().stream()
-                .toList()
-                .stream()
                 .map(f -> new Account.Id(f.getValue(AccountField.ID).intValue()))
                 .collect(toList());
         logger.atFine().log("Matches: %s", matches);
@@ -310,8 +308,7 @@ public class ReviewersUtil {
 
     try (Timer0.Context ctx = metrics.loadAccountsLatency.start()) {
       List<SuggestedReviewerInfo> reviewer =
-          accountIds
+          accountIds.stream()
-              .stream()
               .map(accountLoader::get)
               .filter(Objects::nonNull)
               .map(
@@ -431,8 +428,7 @@ public class ReviewersUtil {
   }
 
   private static String formatSuggestedReviewers(List<SuggestedReviewerInfo> suggestedReviewers) {
-    return suggestedReviewers
+    return suggestedReviewers.stream()
-        .stream()
         .map(
             r -> {
               if (r.account != null) {

java/com/google/gerrit/server/restapi/config/ListTasks.java

@@ -106,9 +106,7 @@ public class ListTasks implements RestReadView<ConfigResource> {
   }
 
   private List<TaskInfo> getTasks() {
-    return workQueue
+    return workQueue.getTaskInfos(TaskInfo::new).stream()
-        .getTaskInfos(TaskInfo::new)
-        .stream()
         .sorted(
             comparing((TaskInfo t) -> t.state.ordinal())
                 .thenComparing(t -> t.delay)