diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt index 366e21684c..e40af248f7 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 35073d670e..67ced54eae 100644 --- a/Documentation/dev-eclipse.txt +++ b/Documentation/dev-eclipse.txt @@ -66,7 +66,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 diff --git a/java/com/google/gerrit/acceptance/AbstractNotificationTest.java b/java/com/google/gerrit/acceptance/AbstractNotificationTest.java index 33b3e91968..1a6ed3778b 100644 --- a/java/com/google/gerrit/acceptance/AbstractNotificationTest.java +++ b/java/com/google/gerrit/acceptance/AbstractNotificationTest.java @@ -121,9 +121,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/java/com/google/gerrit/acceptance/HttpResponse.java b/java/com/google/gerrit/acceptance/HttpResponse.java index 8132c32d05..88079a4046 100644 --- a/java/com/google/gerrit/acceptance/HttpResponse.java +++ b/java/com/google/gerrit/acceptance/HttpResponse.java @@ -65,8 +65,7 @@ public class HttpResponse { } public ImmutableList getHeaders(String name) { - return Arrays.asList(response.getHeaders(name)) - .stream() + return Arrays.asList(response.getHeaders(name)).stream() .map(Header::getValue) .collect(toImmutableList()); } diff --git a/java/com/google/gerrit/acceptance/ProjectResetter.java b/java/com/google/gerrit/acceptance/ProjectResetter.java index 7d0a59c164..cc263c68b6 100644 --- a/java/com/google/gerrit/acceptance/ProjectResetter.java +++ b/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 nonRestoredRefs = - repo.getRefDatabase() - .getRefs() - .stream() + repo.getRefDatabase().getRefs().stream() .filter( r -> !keptRefsByProject.containsEntry(e.getKey(), r.getName()) @@ -315,9 +313,7 @@ public class ProjectResetter implements AutoCloseable { private Set projectsWithConfigChanges( Multimap projects) { - return projects - .entries() - .stream() + return projects.entries().stream() .filter(e -> e.getValue().equals(RefNames.REFS_CONFIG)) .map(Map.Entry::getKey) .collect(toSet()); diff --git a/java/com/google/gerrit/acceptance/ReindexProjectsAtStartup.java b/java/com/google/gerrit/acceptance/ReindexProjectsAtStartup.java index 4893efa279..f585f81810 100644 --- a/java/com/google/gerrit/acceptance/ReindexProjectsAtStartup.java +++ b/java/com/google/gerrit/acceptance/ReindexProjectsAtStartup.java @@ -42,9 +42,7 @@ public class ReindexProjectsAtStartup implements LifecycleListener { @Override public void start() { - repoMgr - .list() - .stream() + repoMgr.list().stream() .forEach( projectName -> { try { diff --git a/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java b/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java index a777f470d7..100022a181 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java +++ b/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java @@ -54,11 +54,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/java/com/google/gerrit/extensions/registration/DynamicSet.java b/java/com/google/gerrit/extensions/registration/DynamicSet.java index 4d803b63c3..3f64ddb214 100644 --- a/java/com/google/gerrit/extensions/registration/DynamicSet.java +++ b/java/com/google/gerrit/extensions/registration/DynamicSet.java @@ -222,8 +222,7 @@ public class DynamicSet implements Iterable { * @return sorted set of active plugins that supply at least one item. */ public ImmutableSortedSet plugins() { - return items - .stream() + return items.stream() .map(i -> i.get().getPluginName()) .collect(toImmutableSortedSet(naturalOrder())); } @@ -235,8 +234,7 @@ public class DynamicSet implements Iterable { * @return items exported by a plugin. */ public ImmutableSet> byPlugin(String pluginName) { - return items - .stream() + return items.stream() .filter(i -> i.get().getPluginName().equals(pluginName)) .map(i -> i.get().getProvider()) .collect(toImmutableSet()); diff --git a/java/com/google/gerrit/git/LockFailureException.java b/java/com/google/gerrit/git/LockFailureException.java index b249749b06..9e67d700a6 100644 --- a/java/com/google/gerrit/git/LockFailureException.java +++ b/java/com/google/gerrit/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/java/com/google/gerrit/index/project/ProjectField.java b/java/com/google/gerrit/index/project/ProjectField.java index 53624f2e67..119980c104 100644 --- a/java/com/google/gerrit/index/project/ProjectField.java +++ b/java/com/google/gerrit/index/project/ProjectField.java @@ -61,9 +61,7 @@ public class ProjectField { storedOnly("ref_state") .buildRepeatable( projectData -> - projectData - .tree() - .stream() + projectData.tree().stream() .filter(p -> p.getProject().getConfigRefState() != null) .map(p -> toRefState(p.getProject())) .collect(toImmutableList())); diff --git a/java/com/google/gerrit/index/query/QueryProcessor.java b/java/com/google/gerrit/index/query/QueryProcessor.java index ac96c5c711..c68f6743df 100644 --- a/java/com/google/gerrit/index/query/QueryProcessor.java +++ b/java/com/google/gerrit/index/query/QueryProcessor.java @@ -380,8 +380,7 @@ public abstract class QueryProcessor { } private static Optional findQueryParseException(Throwable t) { - return Throwables.getCausalChain(t) - .stream() + return Throwables.getCausalChain(t).stream() .filter(c -> c instanceof QueryParseException) .map(QueryParseException.class::cast) .findFirst(); diff --git a/java/com/google/gerrit/launcher/GerritLauncher.java b/java/com/google/gerrit/launcher/GerritLauncher.java index 30d4e15495..dec077a1a7 100644 --- a/java/com/google/gerrit/launcher/GerritLauncher.java +++ b/java/com/google/gerrit/launcher/GerritLauncher.java @@ -625,9 +625,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() - .values() - .stream() + return Thread.getAllStackTraces().values().stream() .flatMap(Arrays::stream) .anyMatch(e -> e.getClassName().startsWith("org.eclipse.jdt.")); } diff --git a/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/java/com/google/gerrit/lucene/LuceneChangeIndex.java index 381adcbf07..0e34c935bf 100644 --- a/java/com/google/gerrit/lucene/LuceneChangeIndex.java +++ b/java/com/google/gerrit/lucene/LuceneChangeIndex.java @@ -652,8 +652,7 @@ public class LuceneChangeIndex implements ChangeIndex { private static List decodeProtos( ListMultimap doc, String fieldName, ProtoConverter converter) { - return doc.get(fieldName) - .stream() + return doc.get(fieldName).stream() .map(IndexableField::binaryValue) .map(bytesRef -> parseProtoFrom(bytesRef, converter)) .collect(toImmutableList()); @@ -668,8 +667,7 @@ public class LuceneChangeIndex implements ChangeIndex { } private static List copyAsBytes(Collection fields) { - return fields - .stream() + return fields.stream() .map( f -> { BytesRef ref = f.binaryValue(); diff --git a/java/com/google/gerrit/mail/HtmlParser.java b/java/com/google/gerrit/mail/HtmlParser.java index 98215997a1..265c4122de 100644 --- a/java/com/google/gerrit/mail/HtmlParser.java +++ b/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() - .stream() + e.parents().stream() .anyMatch( p -> p.tagName().equals("blockquote") diff --git a/java/com/google/gerrit/mail/RawMailParser.java b/java/com/google/gerrit/mail/RawMailParser.java index 00754d3c32..b7e2030b2b 100644 --- a/java/com/google/gerrit/mail/RawMailParser.java +++ b/java/com/google/gerrit/mail/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/java/com/google/gerrit/pgm/init/InitLogging.java b/java/com/google/gerrit/pgm/init/InitLogging.java index 52d0d2f99d..b6d25bc4bc 100644 --- a/java/com/google/gerrit/pgm/init/InitLogging.java +++ b/java/com/google/gerrit/pgm/init/InitLogging.java @@ -53,8 +53,7 @@ public class InitLogging implements InitStep { } private static boolean isSet(List javaOptions, String javaOptionName) { - return javaOptions - .stream() + return javaOptions.stream() .anyMatch( o -> o.startsWith("-D" + javaOptionName + "=") diff --git a/java/com/google/gerrit/proto/testing/SerializedClassSubject.java b/java/com/google/gerrit/proto/testing/SerializedClassSubject.java index 9ca6c9b81d..a5cf3cae36 100644 --- a/java/com/google/gerrit/proto/testing/SerializedClassSubject.java +++ b/java/com/google/gerrit/proto/testing/SerializedClassSubject.java @@ -82,8 +82,7 @@ public class SerializedClassSubject extends Subject expectedFields) { isConcrete(); assertThat( - FieldUtils.getAllFieldsList(actual()) - .stream() + FieldUtils.getAllFieldsList(actual()).stream() .filter(f -> !Modifier.isStatic(f.getModifiers())) .collect(toImmutableMap(Field::getName, Field::getGenericType))) .containsExactlyEntriesIn(expectedFields); diff --git a/java/com/google/gerrit/server/ChangeUtil.java b/java/com/google/gerrit/server/ChangeUtil.java index 7a6d3e6c56..b8a00f4029 100644 --- a/java/com/google/gerrit/server/ChangeUtil.java +++ b/java/com/google/gerrit/server/ChangeUtil.java @@ -116,9 +116,7 @@ public class ChangeUtil { */ public static PatchSet.Id nextPatchSetId(Repository git, PatchSet.Id id) throws IOException { return nextPatchSetIdFromChangeRefs( - git.getRefDatabase() - .getRefsByPrefix(id.getParentKey().toRefPrefix()) - .stream() + git.getRefDatabase().getRefsByPrefix(id.getParentKey().toRefPrefix()).stream() .map(Ref::getName), id); } diff --git a/java/com/google/gerrit/server/CommentsUtil.java b/java/com/google/gerrit/server/CommentsUtil.java index b3812a0870..39df1522e8 100644 --- a/java/com/google/gerrit/server/CommentsUtil.java +++ b/java/com/google/gerrit/server/CommentsUtil.java @@ -185,8 +185,7 @@ public class CommentsUtil { public Optional getDraft(ChangeNotes notes, IdentifiedUser user, Comment.Key key) throws OrmException { - return draftByChangeAuthor(notes, user.getAccountId()) - .stream() + return draftByChangeAuthor(notes, user.getAccountId()).stream() .filter(c -> key.equals(c.key)) .findFirst(); } diff --git a/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java b/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java index 94ce924f0e..e6c46df244 100644 --- a/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java +++ b/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java @@ -110,9 +110,7 @@ public class CreateGroupPermissionSyncer implements ChangeMergedListener { config.getAccessSection(RefNames.REFS_GROUPS + "*", true); if (createGroupsGlobal.isEmpty()) { createGroupAccessSection.setPermissions( - createGroupAccessSection - .getPermissions() - .stream() + createGroupAccessSection.getPermissions().stream() .filter(p -> !Permission.CREATE.equals(p.getName())) .collect(toList())); config.replace(createGroupAccessSection); diff --git a/java/com/google/gerrit/server/ModuleOverloader.java b/java/com/google/gerrit/server/ModuleOverloader.java index 7083e6d743..9a8fe845d2 100644 --- a/java/com/google/gerrit/server/ModuleOverloader.java +++ b/java/com/google/gerrit/server/ModuleOverloader.java @@ -27,8 +27,7 @@ public class ModuleOverloader { // group candidates by annotation existence Map> grouped = - overrideCandidates - .stream() + overrideCandidates.stream() .collect( Collectors.groupingBy(m -> m.getClass().getAnnotation(ModuleImpl.class) != null)); @@ -44,16 +43,14 @@ public class ModuleOverloader { } // swipe cache implementation with alternative provided in lib - return modules - .stream() + return modules.stream() .map( m -> { ModuleImpl a = m.getClass().getAnnotation(ModuleImpl.class); if (a == null) { return m; } - return overrides - .stream() + return overrides.stream() .filter( o -> o.getClass() diff --git a/java/com/google/gerrit/server/StarredChangesUtil.java b/java/com/google/gerrit/server/StarredChangesUtil.java index ea3cf37dc7..e6d6be1b92 100644 --- a/java/com/google/gerrit/server/StarredChangesUtil.java +++ b/java/com/google/gerrit/server/StarredChangesUtil.java @@ -294,9 +294,7 @@ public class StarredChangesUtil { private static Set getRefNames(Repository repo, String prefix) throws IOException { RefDatabase refDb = repo.getRefDatabase(); - return refDb - .getRefsByPrefix(prefix) - .stream() + return refDb.getRefsByPrefix(prefix).stream() .map(r -> r.getName().substring(prefix.length())) .collect(toSet()); } @@ -421,8 +419,7 @@ public class StarredChangesUtil { } public static Set getStarredPatchSets(Set 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/java/com/google/gerrit/server/account/AccountControl.java b/java/com/google/gerrit/server/account/AccountControl.java index 89c4df82c1..f17f3876e7 100644 --- a/java/com/google/gerrit/server/account/AccountControl.java +++ b/java/com/google/gerrit/server/account/AccountControl.java @@ -204,9 +204,7 @@ public class AccountControl { } private Set groupsOf(IdentifiedUser user) { - return user.getEffectiveGroups() - .getKnownGroups() - .stream() + return user.getEffectiveGroups().getKnownGroups().stream() .filter(a -> !SystemGroupBackend.isSystemGroup(a)) .collect(toSet()); } diff --git a/java/com/google/gerrit/server/account/AccountManager.java b/java/com/google/gerrit/server/account/AccountManager.java index 6534f0fe9d..d97ff7ba7f 100644 --- a/java/com/google/gerrit/server/account/AccountManager.java +++ b/java/com/google/gerrit/server/account/AccountManager.java @@ -456,8 +456,7 @@ public class AccountManager { } if (filteredExtIdsByScheme.size() > 1 - || !filteredExtIdsByScheme - .stream() + || !filteredExtIdsByScheme.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 - .stream() + && extIds.stream() .anyMatch(e -> a.getAccount().getPreferredEmail().equals(e.email()))) { u.setPreferredEmail(null); } diff --git a/java/com/google/gerrit/server/account/AccountResolver.java b/java/com/google/gerrit/server/account/AccountResolver.java index 9b4952bad4..14f4a387ed 100644 --- a/java/com/google/gerrit/server/account/AccountResolver.java +++ b/java/com/google/gerrit/server/account/AccountResolver.java @@ -96,9 +96,7 @@ public class AccountResolver { if (result.filteredInactive().isEmpty()) { return "Account '" + result.input() + "' not found"; } - return result - .filteredInactive() - .stream() + return result.filteredInactive().stream() .map(a -> formatForException(result, a)) .collect( joining( @@ -110,9 +108,7 @@ public class AccountResolver { "")); } - return result - .asList() - .stream() + return result.asList().stream() .map(a -> formatForException(result, a)) .collect(joining("\n", "Account '" + result.input() + "' is ambiguous:\n", "")); } @@ -353,8 +349,7 @@ public class AccountResolver { // subset. Otherwise, all are equally non-matching, so return the full set. String name = nameOrEmail.substring(0, lt - 1); ImmutableList nameMatches = - allMatches - .stream() + allMatches.stream() .filter(a -> name.equals(a.getAccount().getFullName())) .collect(toImmutableList()); return !nameMatches.isEmpty() ? nameMatches.stream() : allMatches.stream(); diff --git a/java/com/google/gerrit/server/account/Accounts.java b/java/com/google/gerrit/server/account/Accounts.java index 1a61c02b6a..f3758bf2c4 100644 --- a/java/com/google/gerrit/server/account/Accounts.java +++ b/java/com/google/gerrit/server/account/Accounts.java @@ -140,9 +140,7 @@ public class Accounts { } public static Stream readUserRefs(Repository repo) throws IOException { - return repo.getRefDatabase() - .getRefsByPrefix(RefNames.REFS_USERS) - .stream() + return repo.getRefDatabase().getRefsByPrefix(RefNames.REFS_USERS).stream() .map(r -> Account.Id.fromRef(r.getName())) .filter(Objects::nonNull); } diff --git a/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java b/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java index 0b63927fe5..6873f92f42 100644 --- a/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java +++ b/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 - .getExternalIds() - .stream() + if (!accountState.getExternalIds().stream() .anyMatch(e -> account.getPreferredEmail().equals(e.email()))) { addError( String.format( diff --git a/java/com/google/gerrit/server/account/AccountsUpdate.java b/java/com/google/gerrit/server/account/AccountsUpdate.java index 32394151b7..b862793ab5 100644 --- a/java/com/google/gerrit/server/account/AccountsUpdate.java +++ b/java/com/google/gerrit/server/account/AccountsUpdate.java @@ -495,9 +495,7 @@ public class AccountsUpdate { } private static Set getUpdatedAccounts(BatchRefUpdate batchRefUpdate) { - return batchRefUpdate - .getCommands() - .stream() + return batchRefUpdate.getCommands().stream() .map(c -> Account.Id.fromRef(c.getRefName())) .filter(Objects::nonNull) .collect(toSet()); diff --git a/java/com/google/gerrit/server/account/Emails.java b/java/com/google/gerrit/server/account/Emails.java index e91ce492f3..7c798ca7e4 100644 --- a/java/com/google/gerrit/server/account/Emails.java +++ b/java/com/google/gerrit/server/account/Emails.java @@ -85,10 +85,7 @@ public class Emails { public ImmutableSetMultimap getAccountsFor(String... emails) throws IOException, OrmException { ImmutableSetMultimap.Builder builder = ImmutableSetMultimap.builder(); - externalIds - .byEmails(emails) - .entries() - .stream() + externalIds.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())); diff --git a/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java b/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java index 58eaf21811..a089d9e216 100644 --- a/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java +++ b/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java @@ -154,10 +154,7 @@ public class GroupIncludeCacheImpl implements GroupIncludeCache { @Override public ImmutableSet load(Account.Id memberId) throws OrmException { try (TraceTimer timer = TraceContext.newTimer("Loading groups with member %s", memberId)) { - return groupQueryProvider - .get() - .byMember(memberId) - .stream() + return groupQueryProvider.get().byMember(memberId).stream() .map(InternalGroup::getGroupUUID) .collect(toImmutableSet()); } @@ -176,10 +173,7 @@ public class GroupIncludeCacheImpl implements GroupIncludeCache { @Override public ImmutableList load(AccountGroup.UUID key) throws OrmException { try (TraceTimer timer = TraceContext.newTimer("Loading parent groups of %s", key)) { - return groupQueryProvider - .get() - .bySubgroup(key) - .stream() + return groupQueryProvider.get().bySubgroup(key).stream() .map(InternalGroup::getGroupUUID) .collect(toImmutableList()); } diff --git a/java/com/google/gerrit/server/account/GroupMembers.java b/java/com/google/gerrit/server/account/GroupMembers.java index 375b3a1797..d7e97ba551 100644 --- a/java/com/google/gerrit/server/account/GroupMembers.java +++ b/java/com/google/gerrit/server/account/GroupMembers.java @@ -127,9 +127,7 @@ public class GroupMembers { GroupControl groupControl = groupControlFactory.controlFor(new InternalGroupDescription(group)); Set directMembers = - group - .getMembers() - .stream() + group.getMembers().stream() .filter(groupControl::canSeeMember) .map(accountCache::get) .flatMap(Streams::stream) diff --git a/java/com/google/gerrit/server/account/ProjectWatches.java b/java/com/google/gerrit/server/account/ProjectWatches.java index cc913e536e..8b3e1b33bf 100644 --- a/java/com/google/gerrit/server/account/ProjectWatches.java +++ b/java/com/google/gerrit/server/account/ProjectWatches.java @@ -202,9 +202,7 @@ public class ProjectWatches { private static ImmutableMap> immutableCopyOf( Map> projectWatches) { ImmutableMap.Builder> b = ImmutableMap.builder(); - projectWatches - .entrySet() - .stream() + projectWatches.entrySet().stream() .forEach(e -> b.put(e.getKey(), ImmutableSet.copyOf(e.getValue()))); return b.build(); } diff --git a/java/com/google/gerrit/server/account/UniversalGroupBackend.java b/java/com/google/gerrit/server/account/UniversalGroupBackend.java index e7b3c91e82..50a5e9f842 100644 --- a/java/com/google/gerrit/server/account/UniversalGroupBackend.java +++ b/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") - .stream() + cfg.getSubsections("groups").stream() .filter( sub -> { AccountGroup.UUID uuid = new AccountGroup.UUID(sub); diff --git a/java/com/google/gerrit/server/account/externalids/AllExternalIds.java b/java/com/google/gerrit/server/account/externalids/AllExternalIds.java index 4e91e0bae5..5d12ae101b 100644 --- a/java/com/google/gerrit/server/account/externalids/AllExternalIds.java +++ b/java/com/google/gerrit/server/account/externalids/AllExternalIds.java @@ -45,8 +45,7 @@ public abstract class AllExternalIds { private static ImmutableSetMultimap byEmailCopy( Collection externalIds) { - return externalIds - .stream() + return externalIds.stream() .filter(e -> !Strings.isNullOrEmpty(e.email())) .collect(toImmutableSetMultimap(ExternalId::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 - .byAccount() - .values() - .stream() + object.byAccount().values().stream() .map(extId -> toProto(idConverter, extId)) .forEach(allBuilder::addExternalId); return Protos.toByteArray(allBuilder.build()); @@ -92,9 +88,7 @@ public abstract class AllExternalIds { public AllExternalIds deserialize(byte[] in) { ObjectIdConverter idConverter = ObjectIdConverter.create(); return create( - Protos.parseUnchecked(AllExternalIdsProto.parser(), in) - .getExternalIdList() - .stream() + Protos.parseUnchecked(AllExternalIdsProto.parser(), in).getExternalIdList().stream() .map(proto -> toExternalId(idConverter, proto)) .collect(toList())); } diff --git a/java/com/google/gerrit/server/account/externalids/ExternalId.java b/java/com/google/gerrit/server/account/externalids/ExternalId.java index 22a6ee49a3..c363b5bf03 100644 --- a/java/com/google/gerrit/server/account/externalids/ExternalId.java +++ b/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 getUserName(Collection extIds) { - return extIds - .stream() + return extIds.stream() .filter(e -> e.isScheme(SCHEME_USERNAME)) .map(e -> e.key().id()) .filter(u -> !Strings.isNullOrEmpty(u)) diff --git a/java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java b/java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java index 5acf63c4c9..76e7f81ad7 100644 --- a/java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java +++ b/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 - .stream() + footers.stream() .sorted() .collect(joining("\n", commit.getMessage().trim() + "\n\n", ""))); } diff --git a/java/com/google/gerrit/server/account/externalids/ExternalIds.java b/java/com/google/gerrit/server/account/externalids/ExternalIds.java index b1a59b1ef3..9098630f02 100644 --- a/java/com/google/gerrit/server/account/externalids/ExternalIds.java +++ b/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 byAccount(Account.Id accountId, String scheme) throws IOException { - return byAccount(accountId) - .stream() + return byAccount(accountId).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 byAccount(Account.Id accountId, String scheme, ObjectId rev) throws IOException { - return byAccount(accountId, rev) - .stream() + return byAccount(accountId, rev).stream() .filter(e -> e.key().isScheme(scheme)) .collect(toImmutableSet()); } diff --git a/java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java b/java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java index 14ead2fb50..fe7cc482b2 100644 --- a/java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java +++ b/java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java @@ -93,10 +93,7 @@ public class ExternalIdsConsistencyChecker { } } - emails - .asMap() - .entrySet() - .stream() + emails.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() - .stream() + e.getValue().stream() .map(k -> "'" + k.get() + "'") .sorted() .collect(joining(", "))), diff --git a/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java b/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java index a8fb53b9c6..3732e37e19 100644 --- a/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java +++ b/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java @@ -345,8 +345,7 @@ public class H2CacheImpl extends AbstractLoadingCache implements Per } } } catch (Exception e) { - if (Throwables.getCausalChain(e) - .stream() + if (Throwables.getCausalChain(e).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 diff --git a/java/com/google/gerrit/server/change/AddReviewersOp.java b/java/com/google/gerrit/server/change/AddReviewersOp.java index 4a97c30eca..46d57b54e3 100644 --- a/java/com/google/gerrit/server/change/AddReviewersOp.java +++ b/java/com/google/gerrit/server/change/AddReviewersOp.java @@ -250,8 +250,7 @@ public class AddReviewersOp implements BatchUpdateOp { } if (!addedReviewers.isEmpty()) { List reviewers = - addedReviewers - .stream() + addedReviewers.stream() .map(r -> accountCache.get(r.getAccountId())) .flatMap(Streams::stream) .collect(toList()); diff --git a/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java index 544edcc251..53719084e9 100644 --- a/java/com/google/gerrit/server/change/ChangeInserter.java +++ b/java/com/google/gerrit/server/change/ChangeInserter.java @@ -454,9 +454,7 @@ public class ChangeInserter implements InsertChangeOp { cm.setPatchSet(patchSet, patchSetInfo); cm.setNotify(notify); cm.addReviewers( - reviewerAdditions - .flattenResults(AddReviewersOp.Result::addedReviewers) - .stream() + reviewerAdditions.flattenResults(AddReviewersOp.Result::addedReviewers).stream() .map(PatchSetApproval::getAccountId) .collect(toImmutableSet())); cm.addReviewersByEmail( diff --git a/java/com/google/gerrit/server/change/ChangeJson.java b/java/com/google/gerrit/server/change/ChangeJson.java index f9e015e64a..e975c3d326 100644 --- a/java/com/google/gerrit/server/change/ChangeJson.java +++ b/java/com/google/gerrit/server/change/ChangeJson.java @@ -615,8 +615,7 @@ public class ChangeJson { if (has(TRACKING_IDS)) { ListMultimap set = trackingFooters.extract(cd.commitFooters()); out.trackingIds = - set.entries() - .stream() + set.entries().stream() .map(e -> new TrackingIdInfo(e.getKey(), e.getValue())) .collect(toList()); } @@ -756,16 +755,14 @@ public class ChangeJson { } private Collection toAccountInfo(Collection accounts) { - return accounts - .stream() + return accounts.stream() .map(accountLoader::get) .sorted(AccountInfoComparator.ORDER_NULLS_FIRST) .collect(toList()); } private Collection toAccountInfoByEmail(Collection
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/java/com/google/gerrit/server/change/ConsistencyChecker.java b/java/com/google/gerrit/server/change/ConsistencyChecker.java index b6df374716..83c73871c9 100644 --- a/java/com/google/gerrit/server/change/ConsistencyChecker.java +++ b/java/com/google/gerrit/server/change/ConsistencyChecker.java @@ -470,8 +470,7 @@ public class ConsistencyChecker { String.format( "Multiple patch sets for expected merged commit %s: %s", commit.name(), - thisCommitPsIds - .stream() + thisCommitPsIds.stream() .sorted(comparing(PatchSet.Id::get)) .collect(toImmutableList()))); break; diff --git a/java/com/google/gerrit/server/change/IncludedInResolver.java b/java/com/google/gerrit/server/change/IncludedInResolver.java index 62e94547a3..09ca258103 100644 --- a/java/com/google/gerrit/server/change/IncludedInResolver.java +++ b/java/com/google/gerrit/server/change/IncludedInResolver.java @@ -173,8 +173,7 @@ public class IncludedInResolver { */ private static ImmutableSortedSet getMatchingRefNames( Set matchingRefs, Collection allRefs) { - return allRefs - .stream() + return allRefs.stream() .map(Ref::getName) .filter(matchingRefs::contains) .map(Repository::shortenRefName) diff --git a/java/com/google/gerrit/server/change/LabelsJson.java b/java/com/google/gerrit/server/change/LabelsJson.java index 9d8f3a8f99..01ac37b94d 100644 --- a/java/com/google/gerrit/server/change/LabelsJson.java +++ b/java/com/google/gerrit/server/change/LabelsJson.java @@ -320,9 +320,7 @@ public class LabelsJson { } if (detailed) { - labels - .entrySet() - .stream() + labels.entrySet().stream() .filter(e -> labelTypes.byLabel(e.getKey()) != null) .forEach(e -> setLabelValues(labelTypes.byLabel(e.getKey()), e.getValue())); } @@ -519,9 +517,7 @@ public class LabelsJson { Maps.newHashMapWithExpectedSize(permittedLabels.size()); for (String label : permittedLabels.keySet()) { List permittedVotingRange = - permittedLabels - .get(label) - .stream() + permittedLabels.get(label).stream() .map(this::parseRangeValue) .filter(java.util.Objects::nonNull) .sorted() diff --git a/java/com/google/gerrit/server/change/ReviewerAdder.java b/java/com/google/gerrit/server/change/ReviewerAdder.java index 6dd0db829a..21fc03c840 100644 --- a/java/com/google/gerrit/server/change/ReviewerAdder.java +++ b/java/com/google/gerrit/server/change/ReviewerAdder.java @@ -550,8 +550,7 @@ public class ReviewerAdder { } public ImmutableList getFailures() { - return additions - .stream() + return additions.stream() .filter(a -> a.isFailure() && !a.isIgnorableFailure()) .collect(toImmutableList()); } @@ -581,8 +580,7 @@ public class ReviewerAdder { a -> checkArgument( a.op != null && a.op.getResult() != null, "missing result on %s", a)); - return additions() - .stream() + return additions().stream() .map(a -> a.op.getResult()) .map(func) .flatMap(Collection::stream) @@ -590,8 +588,7 @@ public class ReviewerAdder { } private ImmutableList additions() { - return additions - .stream() + return additions.stream() .filter( a -> { if (a.isFailure()) { diff --git a/java/com/google/gerrit/server/config/ConfigUpdatedEvent.java b/java/com/google/gerrit/server/config/ConfigUpdatedEvent.java index 600ce1098e..b37e489a50 100644 --- a/java/com/google/gerrit/server/config/ConfigUpdatedEvent.java +++ b/java/com/google/gerrit/server/config/ConfigUpdatedEvent.java @@ -97,8 +97,7 @@ public class ConfigUpdatedEvent { private Multimap createUpdate( Set entries, UpdateResult updateResult) { Multimap updates = ArrayListMultimap.create(); - entries - .stream() + entries.stream() .filter(this::isValueUpdated) .map(e -> new ConfigUpdateEntry(e, getString(e, oldConfig), getString(e, newConfig))) .forEach(e -> updates.put(updateResult, e)); diff --git a/java/com/google/gerrit/server/config/RepositoryConfig.java b/java/com/google/gerrit/server/config/RepositoryConfig.java index a52c0760c6..d8c8468854 100644 --- a/java/com/google/gerrit/server/config/RepositoryConfig.java +++ b/java/com/google/gerrit/server/config/RepositoryConfig.java @@ -61,8 +61,7 @@ public class RepositoryConfig { } public ImmutableList getAllBasePaths() { - return cfg.getSubsections(SECTION_NAME) - .stream() + return cfg.getSubsections(SECTION_NAME).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) - .stream() + return cfg.getSubsections(SECTION_NAME).stream() .filter(ss -> isMatch(ss, project)) .max(comparing(String::length)) .orElse(null); diff --git a/java/com/google/gerrit/server/git/HookUtil.java b/java/com/google/gerrit/server/git/HookUtil.java index 27c6e1ea4a..6e8f27cd90 100644 --- a/java/com/google/gerrit/server/git/HookUtil.java +++ b/java/com/google/gerrit/server/git/HookUtil.java @@ -40,10 +40,7 @@ public class HookUtil { } try { refs = - rp.getRepository() - .getRefDatabase() - .getRefs() - .stream() + rp.getRepository().getRefDatabase().getRefs().stream() .collect(toMap(Ref::getName, r -> r)); } catch (ServiceMayNotContinueException e) { throw e; diff --git a/java/com/google/gerrit/server/git/MergeUtil.java b/java/com/google/gerrit/server/git/MergeUtil.java index 208dafb743..5d7a27b49c 100644 --- a/java/com/google/gerrit/server/git/MergeUtil.java +++ b/java/com/google/gerrit/server/git/MergeUtil.java @@ -294,9 +294,7 @@ public class MergeUtil { ((ResolveMerger) m).getMergeResults(); filesWithGitConflicts = - mergeResults - .entrySet() - .stream() + mergeResults.entrySet().stream() .filter(e -> e.getValue().containsConflicts()) .map(Map.Entry::getKey) .collect(toImmutableSet()); diff --git a/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java b/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java index c6c48190a4..9bad21d528 100644 --- a/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java +++ b/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java @@ -79,10 +79,7 @@ public class HackPushNegotiateHook implements AdvertiseRefsHook { if (r == null) { try { r = - rp.getRepository() - .getRefDatabase() - .getRefs() - .stream() + rp.getRepository().getRefDatabase().getRefs().stream() .collect(toMap(Ref::getName, x -> x)); } catch (ServiceMayNotContinueException e) { throw e; diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index 79dd5b5707..103edd8c84 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -734,14 +734,11 @@ class ReceiveCommits { Collections.reverse(orderedCommits); Map created = - newChanges - .stream() + newChanges.stream() .filter(r -> r.change != null) .collect(Collectors.toMap(r -> r.commit.name(), r -> r)); Map updated = - replaceByChange - .values() - .stream() + replaceByChange.values().stream() .filter(r -> r.inputCommand.getResult() == OK) .collect(Collectors.toMap(r -> r.newCommitId.name(), r -> r)); @@ -861,12 +858,9 @@ class ReceiveCommits { throw INSERT_EXCEPTION.apply(e); } - replaceByChange - .values() - .stream() + replaceByChange.values().stream() .forEach(req -> resultChangeIds.add(ResultChangeIds.Key.REPLACED, req.ontoChange)); - newChanges - .stream() + newChanges.stream() .forEach(req -> resultChangeIds.add(ResultChangeIds.Key.CREATED, req.changeId)); if (magicBranchCmd != null) { diff --git a/java/com/google/gerrit/server/git/receive/ReplaceOp.java b/java/com/google/gerrit/server/git/receive/ReplaceOp.java index 4acde286af..6636b1fa94 100644 --- a/java/com/google/gerrit/server/git/receive/ReplaceOp.java +++ b/java/com/google/gerrit/server/git/receive/ReplaceOp.java @@ -364,13 +364,9 @@ public class ReplaceOp implements BatchUpdateOp { inputs = Streams.concat( inputs, - magicBranch - .getCombinedReviewers(fromFooters) - .stream() + magicBranch.getCombinedReviewers(fromFooters).stream() .map(r -> newAddReviewerInput(r, ReviewerState.REVIEWER)), - magicBranch - .getCombinedCcs(fromFooters) - .stream() + magicBranch.getCombinedCcs(fromFooters).stream() .map(r -> newAddReviewerInput(r, ReviewerState.CC))); } return inputs.collect(toImmutableList()); @@ -557,9 +553,7 @@ public class ReplaceOp implements BatchUpdateOp { cm.addReviewers( Streams.concat( oldRecipients.getReviewers().stream(), - reviewerAdditions - .flattenResults(AddReviewersOp.Result::addedReviewers) - .stream() + reviewerAdditions.flattenResults(AddReviewersOp.Result::addedReviewers).stream() .map(PatchSetApproval::getAccountId)) .collect(toImmutableSet())); cm.addExtraCC( diff --git a/java/com/google/gerrit/server/git/validators/AccountValidator.java b/java/com/google/gerrit/server/git/validators/AccountValidator.java index e9fe562cbf..08870d36dc 100644 --- a/java/com/google/gerrit/server/git/validators/AccountValidator.java +++ b/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 - .getValidationErrors() - .stream() + accountConfig.getValidationErrors().stream() .map(ValidationError::getMessage) .collect(toSet())); } diff --git a/java/com/google/gerrit/server/git/validators/CommitValidators.java b/java/com/google/gerrit/server/git/validators/CommitValidators.java index 36561d8345..1897d62d1e 100644 --- a/java/com/google/gerrit/server/git/validators/CommitValidators.java +++ b/java/com/google/gerrit/server/git/validators/CommitValidators.java @@ -705,8 +705,7 @@ public class CommitValidators { List problems = externalIdsConsistencyChecker.check(receiveEvent.commit); List msgs = - problems - .stream() + problems.stream() .map( p -> new CommitValidationMessage( @@ -772,8 +771,7 @@ public class CommitValidators { if (!errorMessages.isEmpty()) { throw new CommitValidationException( "invalid account configuration", - errorMessages - .stream() + errorMessages.stream() .map(m -> new CommitValidationMessage(m, Type.ERROR)) .collect(toList())); } diff --git a/java/com/google/gerrit/server/group/PeriodicGroupIndexer.java b/java/com/google/gerrit/server/group/PeriodicGroupIndexer.java index dbbc3f690a..2a9538d07a 100644 --- a/java/com/google/gerrit/server/group/PeriodicGroupIndexer.java +++ b/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 newGroupUuids = - GroupNameNotes.loadAllGroups(allUsers) - .stream() + GroupNameNotes.loadAllGroups(allUsers).stream() .map(GroupReference::getUUID) .collect(toImmutableSet()); GroupIndexer groupIndexer = groupIndexerProvider.get(); diff --git a/java/com/google/gerrit/server/group/db/GroupConfigCommitMessage.java b/java/com/google/gerrit/server/group/db/GroupConfigCommitMessage.java index 62cc20de39..56271546af 100644 --- a/java/com/google/gerrit/server/group/db/GroupConfigCommitMessage.java +++ b/java/com/google/gerrit/server/group/db/GroupConfigCommitMessage.java @@ -107,13 +107,11 @@ class GroupConfigCommitMessage { Function toString = element -> toParsableString.apply(auditLogFormatter, element); Stream removedElements = - Sets.difference(oldElements, newElements) - .stream() + Sets.difference(oldElements, newElements).stream() .map(toString) .map((removalFooterKey.getName() + ": ")::concat); Stream addedElements = - Sets.difference(newElements, oldElements) - .stream() + Sets.difference(newElements, oldElements).stream() .map(toString) .map((additionFooterKey.getName() + ": ")::concat); return Stream.concat(removedElements, addedElements); diff --git a/java/com/google/gerrit/server/group/db/GroupNameNotes.java b/java/com/google/gerrit/server/group/db/GroupNameNotes.java index 6c21dc4334..e95e91fbd2 100644 --- a/java/com/google/gerrit/server/group/db/GroupNameNotes.java +++ b/java/com/google/gerrit/server/group/db/GroupNameNotes.java @@ -295,8 +295,7 @@ public class GroupNameNotes extends VersionedMetaData { private static ImmutableBiMap toBiMap( Collection groupReferences) { try { - return groupReferences - .stream() + return groupReferences.stream() .collect(toImmutableBiMap(GroupReference::getUUID, GroupReference::getName)); } catch (IllegalArgumentException e) { throw new IllegalArgumentException(UNIQUE_REF_ERROR, e); diff --git a/java/com/google/gerrit/server/group/db/Groups.java b/java/com/google/gerrit/server/group/db/Groups.java index f2289d47a6..37de011fb7 100644 --- a/java/com/google/gerrit/server/group/db/Groups.java +++ b/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 - .build() - .stream() + return allSubgroups.build().stream() .filter(groupUuid -> !AccountGroup.isInternalGroup(groupUuid)); } diff --git a/java/com/google/gerrit/server/index/account/AccountField.java b/java/com/google/gerrit/server/index/account/AccountField.java index 111991ce93..f67a41d045 100644 --- a/java/com/google/gerrit/server/index/account/AccountField.java +++ b/java/com/google/gerrit/server/index/account/AccountField.java @@ -157,8 +157,7 @@ public class AccountField { storedOnly("external_id_state") .buildRepeatable( a -> - a.getExternalIds() - .stream() + a.getExternalIds().stream() .filter(e -> e.blobId() != null) .map(ExternalId::toByteArray) .collect(toSet())); diff --git a/java/com/google/gerrit/server/index/change/AllChangesIndexer.java b/java/com/google/gerrit/server/index/change/AllChangesIndexer.java index 78e14e49da..577c255086 100644 --- a/java/com/google/gerrit/server/index/change/AllChangesIndexer.java +++ b/java/com/google/gerrit/server/index/change/AllChangesIndexer.java @@ -130,9 +130,7 @@ public class AllChangesIndexer extends SiteIndexer Change.Id.fromRef(r.getName())) .filter(Objects::nonNull) .distinct() diff --git a/java/com/google/gerrit/server/index/change/ChangeField.java b/java/com/google/gerrit/server/index/change/ChangeField.java index 593fb85349..50b38d3ad4 100644 --- a/java/com/google/gerrit/server/index/change/ChangeField.java +++ b/java/com/google/gerrit/server/index/change/ChangeField.java @@ -216,8 +216,7 @@ public class ChangeField { */ private static Stream extensions(ChangeData cd) throws OrmException { try { - return cd.currentFilePaths() - .stream() + return cd.currentFilePaths().stream() // Use case-insensitive file extensions even though other file fields are case-sensitive. // If we want to find "all Java files", we want to match both .java and .JAVA, even if we // normally care about case sensitivity. (Whether we should change the existing file/path @@ -234,8 +233,7 @@ public class ChangeField { public static Set getFooters(ChangeData cd) throws OrmException { try { - return cd.commitFooters() - .stream() + return cd.commitFooters().stream() .map(f -> f.toString().toLowerCase(Locale.US)) .collect(toSet()); } catch (IOException e) { @@ -843,8 +841,7 @@ public class ChangeField { @VisibleForTesting static List parseSubmitRecords(Collection values) { - return values - .stream() + return values.stream() .map(v -> GSON.fromJson(v, StoredSubmitRecord.class).toSubmitRecord()) .collect(toList()); } diff --git a/java/com/google/gerrit/server/index/project/StalenessChecker.java b/java/com/google/gerrit/server/index/project/StalenessChecker.java index 25cc5faca3..733e48657f 100644 --- a/java/com/google/gerrit/server/index/project/StalenessChecker.java +++ b/java/com/google/gerrit/server/index/project/StalenessChecker.java @@ -66,9 +66,7 @@ public class StalenessChecker { SetMultimap currentRefStates = MultimapBuilder.hashKeys().hashSetValues().build(); - projectData - .tree() - .stream() + projectData.tree().stream() .filter(p -> p.getProject().getConfigRefState() != null) .forEach( p -> diff --git a/java/com/google/gerrit/server/logging/CallerFinder.java b/java/com/google/gerrit/server/logging/CallerFinder.java index 62f2bbc860..c27dbbb05c 100644 --- a/java/com/google/gerrit/server/logging/CallerFinder.java +++ b/java/com/google/gerrit/server/logging/CallerFinder.java @@ -170,8 +170,7 @@ public abstract class CallerFinder { public LazyArg findCaller() { return lazy( () -> - targets() - .stream() + targets().stream() .map(t -> findCallerOf(t, skip() + 1)) .filter(Optional::isPresent) .findFirst() diff --git a/java/com/google/gerrit/server/logging/TraceContext.java b/java/com/google/gerrit/server/logging/TraceContext.java index 76968d546f..ded34d03e8 100644 --- a/java/com/google/gerrit/server/logging/TraceContext.java +++ b/java/com/google/gerrit/server/logging/TraceContext.java @@ -134,10 +134,7 @@ public class TraceContext implements AutoCloseable { } Optional existingTraceId = - LoggingContext.getInstance() - .getTagsAsMap() - .get(RequestId.Type.TRACE_ID.name()) - .stream() + LoggingContext.getInstance().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 diff --git a/java/com/google/gerrit/server/mail/receive/MailProcessor.java b/java/com/google/gerrit/server/mail/receive/MailProcessor.java index 79a915c259..39cd9c3c53 100644 --- a/java/com/google/gerrit/server/mail/receive/MailProcessor.java +++ b/java/com/google/gerrit/server/mail/receive/MailProcessor.java @@ -231,8 +231,7 @@ public class MailProcessor { // comments from the outbound email. // TODO(hiesel) Also filter by original comment author. Collection comments = - cd.publishedComments() - .stream() + cd.publishedComments().stream() .filter(c -> (c.writtenOn.getTime() / 1000) == (metadata.timestamp.getTime() / 1000)) .sorted(CommentsUtil.COMMENT_ORDER) .collect(toList()); @@ -415,8 +414,7 @@ public class MailProcessor { private Set existingMessageIds(ChangeData cd) throws OrmException { Set existingMessageIds = new HashSet<>(); - cd.messages() - .stream() + cd.messages().stream() .forEach( m -> { String messageId = CommentsUtil.extractMessageId(m.getTag()); @@ -424,8 +422,7 @@ public class MailProcessor { existingMessageIds.add(messageId); } }); - cd.publishedComments() - .stream() + cd.publishedComments().stream() .forEach( c -> { String messageId = CommentsUtil.extractMessageId(c.tag); diff --git a/java/com/google/gerrit/server/mail/send/CommentSender.java b/java/com/google/gerrit/server/mail/send/CommentSender.java index e2a7d92f79..0f5536660b 100644 --- a/java/com/google/gerrit/server/mail/send/CommentSender.java +++ b/java/com/google/gerrit/server/mail/send/CommentSender.java @@ -458,8 +458,7 @@ public class CommentSender extends ReplyToChangeSender { } private List> commentBlocksToSoyData(List blocks) { - return blocks - .stream() + return blocks.stream() .map( b -> { Map map = new HashMap<>(); diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesState.java b/java/com/google/gerrit/server/notedb/ChangeNotesState.java index 446740178e..fd260e7449 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesState.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesState.java @@ -543,23 +543,17 @@ public abstract class ChangeNotesState { .changeId(changeId) .columns(toChangeColumns(changeId, proto.getColumns())) .pastAssignees( - proto - .getPastAssigneeList() - .stream() + proto.getPastAssigneeList().stream() .map(Account.Id::new) .collect(toImmutableSet())) .hashtags(proto.getHashtagList()) .patchSets( - proto - .getPatchSetList() - .stream() + proto.getPatchSetList().stream() .map(bytes -> parseProtoFrom(PatchSetProtoConverter.INSTANCE, bytes)) .map(ps -> Maps.immutableEntry(ps.getId(), ps)) .collect(toImmutableList())) .approvals( - proto - .getApprovalList() - .stream() + proto.getApprovalList().stream() .map(bytes -> parseProtoFrom(PatchSetApprovalProtoConverter.INSTANCE, bytes)) .map(a -> Maps.immutableEntry(a.getPatchSetId(), a)) .collect(toImmutableList())) @@ -568,28 +562,20 @@ public abstract class ChangeNotesState { .pendingReviewers(toReviewerSet(proto.getPendingReviewerList())) .pendingReviewersByEmail(toReviewerByEmailSet(proto.getPendingReviewerByEmailList())) .allPastReviewers( - proto - .getPastReviewerList() - .stream() + proto.getPastReviewerList().stream() .map(Account.Id::new) .collect(toImmutableList())) .reviewerUpdates(toReviewerStatusUpdateList(proto.getReviewerUpdateList())) .submitRecords( - proto - .getSubmitRecordList() - .stream() + proto.getSubmitRecordList().stream() .map(r -> GSON.fromJson(r, StoredSubmitRecord.class).toSubmitRecord()) .collect(toImmutableList())) .changeMessages( - proto - .getChangeMessageList() - .stream() + proto.getChangeMessageList().stream() .map(bytes -> parseProtoFrom(ChangeMessageProtoConverter.INSTANCE, bytes)) .collect(toImmutableList())) .publishedComments( - proto - .getPublishedCommentList() - .stream() + proto.getPublishedCommentList().stream() .map(r -> GSON.fromJson(r, Comment.class)) .collect(toImmutableListMultimap(c -> new RevId(c.revId), c -> c))); return b.build(); diff --git a/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java b/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java index cce7540062..4f1a5d01be 100644 --- a/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java +++ b/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 - .values() - .stream() + .revisionNotes.values().stream() .flatMap(n -> n.getEntities().stream()) .collect(toMap(c -> c.key.uuid, Function.identity())); } @@ -189,9 +187,7 @@ public class DeleteCommentRewriter implements NoteDbRewriter { */ private List getDeletedComments( Map parMap, Map curMap) { - return parMap - .entrySet() - .stream() + return parMap.entrySet().stream() .filter(c -> !curMap.containsKey(c.getKey())) .map(Map.Entry::getValue) .collect(toList()); diff --git a/java/com/google/gerrit/server/patch/EditTransformer.java b/java/com/google/gerrit/server/patch/EditTransformer.java index 9083ede9c4..90f442eca3 100644 --- a/java/com/google/gerrit/server/patch/EditTransformer.java +++ b/java/com/google/gerrit/server/patch/EditTransformer.java @@ -89,8 +89,7 @@ class EditTransformer { * @return the transformed edits per file path */ public Multimap 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 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/java/com/google/gerrit/server/patch/PatchListLoader.java b/java/com/google/gerrit/server/patch/PatchListLoader.java index 074e3441ca..08de537305 100644 --- a/java/com/google/gerrit/server/patch/PatchListLoader.java +++ b/java/com/google/gerrit/server/patch/PatchListLoader.java @@ -287,8 +287,7 @@ public class PatchListLoader implements Callable { } List relevantDiffEntries = - diffEntries - .stream() + diffEntries.stream() .filter(diffEntry -> isTouched(touchedFilePaths, diffEntry)) .collect(toImmutableList()); @@ -397,8 +396,7 @@ public class PatchListLoader implements Callable { } private static Set getContentEdits(Set editsDueToRebase) { - return editsDueToRebase - .stream() + return editsDueToRebase.stream() .map(ContextAwareEdit::toEdit) .filter(Optional::isPresent) .map(Optional::get) diff --git a/java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java b/java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java index fa634cae7b..b23c85f246 100644 --- a/java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java +++ b/java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java @@ -251,8 +251,7 @@ public class DefaultPermissionBackend extends PermissionBackend { private boolean allow(Collection rules) { return user.getEffectiveGroups() .containsAnyOf( - rules - .stream() + rules.stream() .filter(r -> r.getAction() == Action.ALLOW) .map(r -> r.getGroup().getUUID()) .collect(toSet())); @@ -260,8 +259,7 @@ public class DefaultPermissionBackend extends PermissionBackend { private boolean notDenied(Collection rules) { Set denied = - rules - .stream() + rules.stream() .filter(r -> r.getAction() != Action.ALLOW) .map(r -> r.getGroup().getUUID()) .collect(toSet()); diff --git a/java/com/google/gerrit/server/permissions/DefaultRefFilter.java b/java/com/google/gerrit/server/permissions/DefaultRefFilter.java index c189f338fe..913921fc46 100644 --- a/java/com/google/gerrit/server/permissions/DefaultRefFilter.java +++ b/java/com/google/gerrit/server/permissions/DefaultRefFilter.java @@ -301,9 +301,7 @@ class DefaultRefFilter { private static Map getTaggableRefsMap(Repository repo) throws PermissionBackendException { try { - return repo.getRefDatabase() - .getRefs() - .stream() + return repo.getRefDatabase().getRefs().stream() .filter( r -> !RefNames.isGerritRef(r.getName()) diff --git a/java/com/google/gerrit/server/permissions/PermissionBackend.java b/java/com/google/gerrit/server/permissions/PermissionBackend.java index 22fde79edc..3ac294abb6 100644 --- a/java/com/google/gerrit/server/permissions/PermissionBackend.java +++ b/java/com/google/gerrit/server/permissions/PermissionBackend.java @@ -505,9 +505,7 @@ public abstract class PermissionBackend { } private static Set valuesOf(LabelType label) { - return label - .getValues() - .stream() + return label.getValues().stream() .map((v) -> new LabelPermission.WithValue(label, v)) .collect(toSet()); } diff --git a/java/com/google/gerrit/server/permissions/PermissionCollection.java b/java/com/google/gerrit/server/permissions/PermissionCollection.java index b419698415..1a3198d84e 100644 --- a/java/com/google/gerrit/server/permissions/PermissionCollection.java +++ b/java/com/google/gerrit/server/permissions/PermissionCollection.java @@ -151,8 +151,7 @@ public class PermissionCollection { Lists.reverse(Lists.newArrayList(sectionToProject.entrySet())); Map> accessByProject = - accessDescending - .stream() + accessDescending.stream() .collect( Collectors.groupingBy( Map.Entry::getValue, diff --git a/java/com/google/gerrit/server/project/ChildProjects.java b/java/com/google/gerrit/server/project/ChildProjects.java index 868d0afff5..ce9992eeba 100644 --- a/java/com/google/gerrit/server/project/ChildProjects.java +++ b/java/com/google/gerrit/server/project/ChildProjects.java @@ -93,8 +93,7 @@ public class ChildProjects { Project.NameKey parent) throws PermissionBackendException { List 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/java/com/google/gerrit/server/project/ProjectCacheImpl.java b/java/com/google/gerrit/server/project/ProjectCacheImpl.java index cc8fbe8e2b..4a85554bc5 100644 --- a/java/com/google/gerrit/server/project/ProjectCacheImpl.java +++ b/java/com/google/gerrit/server/project/ProjectCacheImpl.java @@ -249,8 +249,7 @@ public class ProjectCacheImpl implements ProjectCache { @Override public Set guessRelevantGroupUUIDs() { try (Timer0.Context ignored = guessRelevantGroupsLatency.start()) { - return all() - .stream() + return all().stream() .map(n -> byName.getIfPresent(n.get())) .filter(Objects::nonNull) .flatMap(p -> p.getConfig().getAllGroupUUIDs().stream()) diff --git a/java/com/google/gerrit/server/project/ProjectConfig.java b/java/com/google/gerrit/server/project/ProjectConfig.java index 4e939ff4e9..6dd697f956 100644 --- a/java/com/google/gerrit/server/project/ProjectConfig.java +++ b/java/com/google/gerrit/server/project/ProjectConfig.java @@ -1248,14 +1248,12 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError. private void saveNotifySections(Config rc, Set keepGroups) { for (NotifyConfig nc : sort(notifySections.values())) { - nc.getGroups() - .stream() + nc.getGroups().stream() .map(GroupReference::getUUID) .filter(Objects::nonNull) .forEach(keepGroups::add); List email = - nc.getGroups() - .stream() + nc.getGroups().stream() .map(gr -> new PermissionRule(gr).asString(false)) .sorted() .collect(toList()); diff --git a/java/com/google/gerrit/server/project/ProjectState.java b/java/com/google/gerrit/server/project/ProjectState.java index 73c222dec9..8d6923bc40 100644 --- a/java/com/google/gerrit/server/project/ProjectState.java +++ b/java/com/google/gerrit/server/project/ProjectState.java @@ -204,8 +204,7 @@ public class ProjectState { } // If not, we check the parents. - return parents() - .stream() + return parents().stream() .map(ProjectState::getConfig) .map(ProjectConfig::getRulesId) .anyMatch(Objects::nonNull); diff --git a/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java b/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java index e61c5df4c4..894037d2ac 100644 --- a/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java +++ b/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java @@ -296,9 +296,7 @@ public class ProjectsConsistencyChecker { // Auto-close by commit for (ObjectId patchSetSha1 : - autoCloseableChange - .patchSets() - .stream() + autoCloseableChange.patchSets().stream() .map(ps -> ObjectId.fromString(ps.getRevision().get())) .collect(toSet())) { if (mergedSha1s.contains(patchSetSha1)) { diff --git a/java/com/google/gerrit/server/project/SuggestParentCandidates.java b/java/com/google/gerrit/server/project/SuggestParentCandidates.java index 99833af9fa..d3dfdcdf04 100644 --- a/java/com/google/gerrit/server/project/SuggestParentCandidates.java +++ b/java/com/google/gerrit/server/project/SuggestParentCandidates.java @@ -42,9 +42,7 @@ public class SuggestParentCandidates { } public List getNameKeys() throws PermissionBackendException { - return permissionBackend - .currentUser() - .filter(ProjectPermission.ACCESS, readableParents()) + return permissionBackend.currentUser().filter(ProjectPermission.ACCESS, readableParents()) .stream() .sorted() .collect(toList()); diff --git a/java/com/google/gerrit/server/query/account/InternalAccountQuery.java b/java/com/google/gerrit/server/query/account/InternalAccountQuery.java index 6f3194e246..61a969083e 100644 --- a/java/com/google/gerrit/server/query/account/InternalAccountQuery.java +++ b/java/com/google/gerrit/server/query/account/InternalAccountQuery.java @@ -83,8 +83,7 @@ public class InternalAccountQuery extends InternalQuery a.getAccount().getPreferredEmail().equals(email)) .collect(toList()); } @@ -120,8 +119,7 @@ public class InternalAccountQuery extends InternalQuery 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/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index 93ece2b580..ab0c94784d 100644 --- a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -957,8 +957,7 @@ public class ChangeQueryBuilder extends QueryBuilder { } try { return Predicate.or( - parseAccount(who) - .stream() + parseAccount(who).stream() .map(a -> visibleto(args.userFactory.create(a))) .collect(toImmutableList())); } catch (QueryParseException e) { @@ -1401,8 +1400,7 @@ public class ChangeQueryBuilder extends QueryBuilder { 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/java/com/google/gerrit/server/query/change/FileExtensionListPredicate.java b/java/com/google/gerrit/server/query/change/FileExtensionListPredicate.java index 339933847c..fc33b65e04 100644 --- a/java/com/google/gerrit/server/query/change/FileExtensionListPredicate.java +++ b/java/com/google/gerrit/server/query/change/FileExtensionListPredicate.java @@ -22,9 +22,7 @@ import com.google.gwtorm.server.OrmException; public class FileExtensionListPredicate extends ChangeIndexPredicate { private static String clean(String extList) { - return Splitter.on(',') - .splitToList(extList) - .stream() + return Splitter.on(',').splitToList(extList).stream() .map(FileExtensionPredicate::clean) .distinct() .sorted() diff --git a/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java b/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java index 17034dfff4..6a81ff60df 100644 --- a/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java +++ b/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/java/com/google/gerrit/server/query/change/SubmittablePredicate.java b/java/com/google/gerrit/server/query/change/SubmittablePredicate.java index df78315bd5..8a2c8896b9 100644 --- a/java/com/google/gerrit/server/query/change/SubmittablePredicate.java +++ b/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/java/com/google/gerrit/server/quota/QuotaResponse.java b/java/com/google/gerrit/server/quota/QuotaResponse.java index 9a8a5151e6..99a7c1d86a 100644 --- a/java/com/google/gerrit/server/quota/QuotaResponse.java +++ b/java/com/google/gerrit/server/quota/QuotaResponse.java @@ -101,8 +101,7 @@ public abstract class QuotaResponse { } public String errorMessage() { - return error() - .stream() + return error().stream() .map(QuotaResponse::message) .flatMap(Streams::stream) .collect(Collectors.joining(", ")); diff --git a/java/com/google/gerrit/server/restapi/account/DeleteEmail.java b/java/com/google/gerrit/server/restapi/account/DeleteEmail.java index f0269f1775..6bacde2220 100644 --- a/java/com/google/gerrit/server/restapi/account/DeleteEmail.java +++ b/java/com/google/gerrit/server/restapi/account/DeleteEmail.java @@ -85,9 +85,7 @@ public class DeleteEmail implements RestModifyView } Set 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/java/com/google/gerrit/server/restapi/account/DeleteExternalIds.java b/java/com/google/gerrit/server/restapi/account/DeleteExternalIds.java index 05b1771467..9fb535c114 100644 --- a/java/com/google/gerrit/server/restapi/account/DeleteExternalIds.java +++ b/java/com/google/gerrit/server/restapi/account/DeleteExternalIds.java @@ -77,9 +77,7 @@ public class DeleteExternalIds implements RestModifyView externalIdMap = - externalIds - .byAccount(resource.getUser().getAccountId()) - .stream() + externalIds.byAccount(resource.getUser().getAccountId()).stream() .collect(toMap(ExternalId::key, Function.identity())); List toDelete = new ArrayList<>(); diff --git a/java/com/google/gerrit/server/restapi/account/DeleteWatchedProjects.java b/java/com/google/gerrit/server/restapi/account/DeleteWatchedProjects.java index 0e2edb9e38..deb70fe8fd 100644 --- a/java/com/google/gerrit/server/restapi/account/DeleteWatchedProjects.java +++ b/java/com/google/gerrit/server/restapi/account/DeleteWatchedProjects.java @@ -76,8 +76,7 @@ public class DeleteWatchedProjects accountId, u -> u.deleteProjectWatches( - input - .stream() + input.stream() .filter(Objects::nonNull) .map(w -> ProjectWatchKey.create(new Project.NameKey(w.project), w.filter)) .collect(toList()))); diff --git a/java/com/google/gerrit/server/restapi/account/GetEmails.java b/java/com/google/gerrit/server/restapi/account/GetEmails.java index ed3347fc97..8c21536ed3 100644 --- a/java/com/google/gerrit/server/restapi/account/GetEmails.java +++ b/java/com/google/gerrit/server/restapi/account/GetEmails.java @@ -48,9 +48,7 @@ public class GetEmails implements RestReadView { if (!self.get().hasSameAccountId(rsrc.getUser())) { permissionBackend.currentUser().check(GlobalPermission.MODIFY_ACCOUNT); } - return rsrc.getUser() - .getEmailAddresses() - .stream() + return rsrc.getUser().getEmailAddresses().stream() .filter(Objects::nonNull) .map(e -> toEmailInfo(rsrc, e)) .sorted(comparing((EmailInfo e) -> e.email)) diff --git a/java/com/google/gerrit/server/restapi/account/GetWatchedProjects.java b/java/com/google/gerrit/server/restapi/account/GetWatchedProjects.java index 61021be73c..ba8c72a65d 100644 --- a/java/com/google/gerrit/server/restapi/account/GetWatchedProjects.java +++ b/java/com/google/gerrit/server/restapi/account/GetWatchedProjects.java @@ -65,10 +65,7 @@ public class GetWatchedProjects implements RestReadView { Account.Id accountId = rsrc.getUser().getAccountId(); AccountState account = accounts.get(accountId).orElseThrow(ResourceNotFoundException::new); - return account - .getProjectWatches() - .entrySet() - .stream() + return account.getProjectWatches().entrySet().stream() .map(e -> toProjectWatchInfo(e.getKey(), e.getValue())) .sorted( comparing((ProjectWatchInfo pwi) -> pwi.project) diff --git a/java/com/google/gerrit/server/restapi/account/PutPreferred.java b/java/com/google/gerrit/server/restapi/account/PutPreferred.java index a8289878f4..265bf530ec 100644 --- a/java/com/google/gerrit/server/restapi/account/PutPreferred.java +++ b/java/com/google/gerrit/server/restapi/account/PutPreferred.java @@ -93,8 +93,7 @@ public class PutPreferred implements RestModifyView stringBuilder.append("* ").append(filePath).append("\n")); } diff --git a/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java b/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java index ba092816ee..c658fc407b 100644 --- a/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java +++ b/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java @@ -46,8 +46,7 @@ public class ListChangeMessages implements RestReadView { throws OrmException, PermissionBackendException { List messages = changeMessagesUtil.byChange(resource.getNotes()); List messageInfos = - messages - .stream() + messages.stream() .map(m -> createChangeMessageInfo(m, accountLoader)) .collect(Collectors.toList()); accountLoader.fill(); diff --git a/java/com/google/gerrit/server/restapi/change/PostReview.java b/java/com/google/gerrit/server/restapi/change/PostReview.java index ff27bfae58..7658f3460d 100644 --- a/java/com/google/gerrit/server/restapi/change/PostReview.java +++ b/java/com/google/gerrit/server/restapi/change/PostReview.java @@ -775,8 +775,7 @@ public class PostReview private static void ensureRangesDoNotOverlap( String commentPath, List fixReplacementInfos) throws BadRequestException { List sortedRanges = - fixReplacementInfos - .stream() + fixReplacementInfos.stream() .map(fixReplacementInfo -> fixReplacementInfo.range) .sorted() .collect(toList()); @@ -1033,17 +1032,13 @@ public class PostReview } private Set readExistingComments(ChangeContext ctx) throws OrmException { - return commentsUtil - .publishedByChange(ctx.getNotes()) - .stream() + return commentsUtil.publishedByChange(ctx.getNotes()).stream() .map(CommentSetEntry::create) .collect(toSet()); } private Set readExistingRobotComments(ChangeContext ctx) throws OrmException { - return commentsUtil - .robotCommentsByChange(ctx.getNotes()) - .stream() + return commentsUtil.robotCommentsByChange(ctx.getNotes()).stream() .map(CommentSetEntry::create) .collect(toSet()); } @@ -1255,8 +1250,7 @@ public class PostReview if (!reduced.isEmpty()) { throw new ResourceConflictException( "Cannot reduce vote on labels for closed change: " - + reduced - .stream() + + reduced.stream() .map(PatchSetApproval::getLabel) .distinct() .sorted() diff --git a/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java b/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java index b2cbe80f0f..1d4d4dd0a4 100644 --- a/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java +++ b/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java @@ -190,9 +190,7 @@ public class ReviewerRecommender { // Sort results Stream> sorted = - reviewerScores - .entrySet() - .stream() + reviewerScores.entrySet().stream() .sorted(Collections.reverseOrder(Map.Entry.comparingByValue())); List sortedSuggestions = sorted.map(Map.Entry::getKey).collect(toList()); logger.atFine().log("Sorted suggestions: %s", sortedSuggestions); diff --git a/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java b/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java index 75710c46fb..343afc3bde 100644 --- a/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java +++ b/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java @@ -247,9 +247,7 @@ public class ReviewersUtil { ImmutableSet.of(AccountField.ID.getName()))) .readRaw(); List matches = - result - .toList() - .stream() + result.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 reviewer = - accountIds - .stream() + accountIds.stream() .map(accountLoader::get) .filter(Objects::nonNull) .map( @@ -432,8 +429,7 @@ public class ReviewersUtil { } private static String formatSuggestedReviewers(List suggestedReviewers) { - return suggestedReviewers - .stream() + return suggestedReviewers.stream() .map( r -> { if (r.account != null) { diff --git a/java/com/google/gerrit/server/restapi/config/ListCapabilities.java b/java/com/google/gerrit/server/restapi/config/ListCapabilities.java index 9bb2e6dbfc..cacbbf590a 100644 --- a/java/com/google/gerrit/server/restapi/config/ListCapabilities.java +++ b/java/com/google/gerrit/server/restapi/config/ListCapabilities.java @@ -58,9 +58,7 @@ public class ListCapabilities implements RestReadView { private static ImmutableMap convertToPermissionInfos( ImmutableMap permissionIdNames) { - return permissionIdNames - .entrySet() - .stream() + return permissionIdNames.entrySet().stream() .collect( toImmutableMap(Map.Entry::getKey, e -> new CapabilityInfo(e.getKey(), e.getValue()))); } diff --git a/java/com/google/gerrit/server/restapi/config/ListTasks.java b/java/com/google/gerrit/server/restapi/config/ListTasks.java index f77cda4a59..7402c15b21 100644 --- a/java/com/google/gerrit/server/restapi/config/ListTasks.java +++ b/java/com/google/gerrit/server/restapi/config/ListTasks.java @@ -106,9 +106,7 @@ public class ListTasks implements RestReadView { } private List getTasks() { - return workQueue - .getTaskInfos(TaskInfo::new) - .stream() + return workQueue.getTaskInfos(TaskInfo::new).stream() .sorted( comparing((TaskInfo t) -> t.state.ordinal()) .thenComparing(t -> t.delay) diff --git a/java/com/google/gerrit/server/restapi/config/ReloadConfig.java b/java/com/google/gerrit/server/restapi/config/ReloadConfig.java index cab07e3ae0..0685a5862e 100644 --- a/java/com/google/gerrit/server/restapi/config/ReloadConfig.java +++ b/java/com/google/gerrit/server/restapi/config/ReloadConfig.java @@ -54,10 +54,7 @@ public class ReloadConfig implements RestModifyView { if (updates.isEmpty()) { return Collections.emptyMap(); } - return updates - .asMap() - .entrySet() - .stream() + return updates.asMap().entrySet().stream() .collect( Collectors.toMap( e -> e.getKey().name().toLowerCase(), e -> toEntryInfos(e.getValue()))); @@ -65,8 +62,7 @@ public class ReloadConfig implements RestModifyView { private static List toEntryInfos( Collection updateEntries) { - return updateEntries - .stream() + return updateEntries.stream() .map(ReloadConfig::toConfigUpdateEntryInfo) .collect(toImmutableList()); } diff --git a/java/com/google/gerrit/server/restapi/group/ListGroups.java b/java/com/google/gerrit/server/restapi/group/ListGroups.java index 968a7dd733..8d8dc3dafb 100644 --- a/java/com/google/gerrit/server/restapi/group/ListGroups.java +++ b/java/com/google/gerrit/server/restapi/group/ListGroups.java @@ -308,8 +308,7 @@ public class ListGroups implements RestReadView { private Stream getAllExistingGroups() throws IOException, ConfigInvalidException { if (!projects.isEmpty()) { - return projects - .stream() + return projects.stream() .map(ProjectState::getAllGroups) .flatMap(Collection::stream) .distinct(); diff --git a/java/com/google/gerrit/server/restapi/project/CommitsCollection.java b/java/com/google/gerrit/server/restapi/project/CommitsCollection.java index 66559f7431..e8a12bc041 100644 --- a/java/com/google/gerrit/server/restapi/project/CommitsCollection.java +++ b/java/com/google/gerrit/server/restapi/project/CommitsCollection.java @@ -125,9 +125,7 @@ public class CommitsCollection implements ChildCollection refs = - repo.getRefDatabase() - .getRefs() - .stream() + repo.getRefDatabase().getRefs().stream() .filter(r -> !r.getName().startsWith(RefNames.REFS_CHANGES)) .collect(toImmutableList()); return reachable.fromRefs(project, repo, commit, refs); diff --git a/java/com/google/gerrit/server/restapi/project/DeleteRef.java b/java/com/google/gerrit/server/restapi/project/DeleteRef.java index 9a9ead3cc1..5df102c074 100644 --- a/java/com/google/gerrit/server/restapi/project/DeleteRef.java +++ b/java/com/google/gerrit/server/restapi/project/DeleteRef.java @@ -204,8 +204,7 @@ public class DeleteRef { ImmutableSet refs = prefix == null ? refsToDelete - : refsToDelete - .stream() + : refsToDelete.stream() .map(ref -> ref.startsWith(R_REFS) ? ref : prefix + ref) .collect(toImmutableSet()); for (String ref : refs) { diff --git a/java/com/google/gerrit/server/restapi/project/GetAccess.java b/java/com/google/gerrit/server/restapi/project/GetAccess.java index 0f46535a6c..559e8e1d11 100644 --- a/java/com/google/gerrit/server/restapi/project/GetAccess.java +++ b/java/com/google/gerrit/server/restapi/project/GetAccess.java @@ -272,9 +272,7 @@ public class GetAccess implements RestReadView { info.configVisible = canReadConfig || canWriteConfig; info.groups = - groups - .entrySet() - .stream() + groups.entrySet().stream() .filter(e -> e.getValue() != null) .collect(toMap(e -> e.getKey().get(), Map.Entry::getValue)); diff --git a/java/com/google/gerrit/server/restapi/project/ListChildProjects.java b/java/com/google/gerrit/server/restapi/project/ListChildProjects.java index cfeec5a4e1..ea54a4a217 100644 --- a/java/com/google/gerrit/server/restapi/project/ListChildProjects.java +++ b/java/com/google/gerrit/server/restapi/project/ListChildProjects.java @@ -85,12 +85,7 @@ public class ListChildProjects implements RestReadView { private List directChildProjects(Project.NameKey parent) throws OrmException, RestApiException { PermissionBackend.WithUser currentUser = permissionBackend.currentUser(); - return queryProvider - .get() - .withQuery("parent:" + parent.get()) - .withLimit(limit) - .apply() - .stream() + return queryProvider.get().withQuery("parent:" + parent.get()).withLimit(limit).apply().stream() .filter( p -> currentUser diff --git a/java/com/google/gerrit/server/restapi/project/ListProjects.java b/java/com/google/gerrit/server/restapi/project/ListProjects.java index 4c55ff5301..dc7e5377d3 100644 --- a/java/com/google/gerrit/server/restapi/project/ListProjects.java +++ b/java/com/google/gerrit/server/restapi/project/ListProjects.java @@ -353,12 +353,7 @@ public class ListProjects implements RestReadView { private SortedMap applyAsQuery(String query) throws BadRequestException { try { - return queryProjectsProvider - .get() - .withQuery(query) - .withStart(start) - .withLimit(limit) - .apply() + return queryProjectsProvider.get().withQuery(query).withStart(start).withLimit(limit).apply() .stream() .collect( ImmutableSortedMap.toImmutableSortedMap( @@ -657,9 +652,7 @@ public class ListProjects implements RestReadView { return projectCache.byName(matchPrefix).stream(); } else if (matchSubstring != null) { checkMatchOptions(matchPrefix == null && matchRegex == null); - return projectCache - .all() - .stream() + return projectCache.all().stream() .filter( p -> p.get().toLowerCase(Locale.US).contains(matchSubstring.toLowerCase(Locale.US))); } else if (matchRegex != null) { diff --git a/java/com/google/gerrit/server/rules/DefaultSubmitRule.java b/java/com/google/gerrit/server/rules/DefaultSubmitRule.java index 65ac88fa99..b70858d2c7 100644 --- a/java/com/google/gerrit/server/rules/DefaultSubmitRule.java +++ b/java/com/google/gerrit/server/rules/DefaultSubmitRule.java @@ -124,8 +124,7 @@ public final class DefaultSubmitRule implements SubmitRule { private static List getApprovalsForLabel( List approvals, LabelType t) { - return approvals - .stream() + return approvals.stream() .filter(input -> input.getLabel().equals(t.getLabelId().get())) .collect(toImmutableList()); } diff --git a/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java b/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java index 4a7eea7b57..f4b7254182 100644 --- a/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java +++ b/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java @@ -154,8 +154,7 @@ public class IgnoreSelfApprovalRule implements SubmitRule { @VisibleForTesting static Collection filterOutPositiveApprovalsOfUser( Collection approvals, Account.Id user) { - return approvals - .stream() + return approvals.stream() .filter(input -> input.getValue() < 0 || !input.getAccountId().equals(user)) .collect(toImmutableList()); } @@ -163,8 +162,7 @@ public class IgnoreSelfApprovalRule implements SubmitRule { @VisibleForTesting static Collection filterApprovalsByLabel( Collection approvals, LabelType t) { - return approvals - .stream() + return approvals.stream() .filter(input -> input.getLabelId().get().equals(t.getLabelId().get())) .collect(toImmutableList()); } diff --git a/java/com/google/gerrit/server/submit/CommitMergeStatus.java b/java/com/google/gerrit/server/submit/CommitMergeStatus.java index b101898e10..5ac7c98d27 100644 --- a/java/com/google/gerrit/server/submit/CommitMergeStatus.java +++ b/java/com/google/gerrit/server/submit/CommitMergeStatus.java @@ -110,8 +110,7 @@ public enum CommitMergeStatus { commit, otherCommit, cd.getId().get()); } Optional patchSet = - cd.patchSets() - .stream() + cd.patchSets().stream() .filter(ps -> ps.getRevision().get().equals(otherCommit)) .findAny(); if (patchSet.isPresent()) { diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java index f41e776589..8b93ce8a4e 100644 --- a/java/com/google/gerrit/server/submit/MergeOp.java +++ b/java/com/google/gerrit/server/submit/MergeOp.java @@ -338,9 +338,7 @@ public class MergeOp implements AutoCloseable { blockingConditions.add(describeLabels(cd, record.labels)); } if (record.requirements != null) { - record - .requirements - .stream() + record.requirements.stream() .map(SubmitRequirement::fallbackText) .forEach(blockingConditions::add); } diff --git a/java/com/google/gerrit/server/submit/SubmoduleOp.java b/java/com/google/gerrit/server/submit/SubmoduleOp.java index ffa1fe54e8..9b418dbacc 100644 --- a/java/com/google/gerrit/server/submit/SubmoduleOp.java +++ b/java/com/google/gerrit/server/submit/SubmoduleOp.java @@ -444,9 +444,7 @@ public class SubmoduleOp { int count = 0; List subscriptions = - targets - .get(subscriber) - .stream() + targets.get(subscriber).stream() .sorted(comparing(SubmoduleSubscription::getPath)) .collect(toList()); for (SubmoduleSubscription s : subscriptions) { diff --git a/java/com/google/gerrit/server/update/BatchUpdate.java b/java/com/google/gerrit/server/update/BatchUpdate.java index 8cf302befa..27a6aeec64 100644 --- a/java/com/google/gerrit/server/update/BatchUpdate.java +++ b/java/com/google/gerrit/server/update/BatchUpdate.java @@ -154,8 +154,7 @@ public class BatchUpdate implements AutoCloseable { // 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/java/com/google/gerrit/server/update/RepoView.java b/java/com/google/gerrit/server/update/RepoView.java index 23853eec59..73dd12f35e 100644 --- a/java/com/google/gerrit/server/update/RepoView.java +++ b/java/com/google/gerrit/server/update/RepoView.java @@ -136,9 +136,7 @@ public class RepoView { */ public Map getRefs(String prefix) throws IOException { Map result = - repo.getRefDatabase() - .getRefsByPrefix(prefix) - .stream() + repo.getRefDatabase().getRefsByPrefix(prefix).stream() .collect(toMap(r -> r.getName().substring(prefix.length()), Ref::getObjectId)); // First, overwrite any cached reads from the underlying RepoRefCache. If any of these differ, diff --git a/java/com/google/gerrit/sshd/commands/SetMembersCommand.java b/java/com/google/gerrit/sshd/commands/SetMembersCommand.java index 9d7f2d93f0..324257b93a 100644 --- a/java/com/google/gerrit/sshd/commands/SetMembersCommand.java +++ b/java/com/google/gerrit/sshd/commands/SetMembersCommand.java @@ -132,8 +132,7 @@ public class SetMembersCommand extends SshCommand { String action, GroupResource group, List accountIdList) throws UnsupportedEncodingException, IOException { String names = - accountIdList - .stream() + accountIdList.stream() .map( accountId -> { Optional accountState = accountCache.get(accountId); @@ -152,8 +151,7 @@ public class SetMembersCommand extends SshCommand { String action, GroupResource group, List 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/java/com/google/gerrit/sshd/commands/ShowConnections.java b/java/com/google/gerrit/sshd/commands/ShowConnections.java index 0faf8030ad..d579ef68a7 100644 --- a/java/com/google/gerrit/sshd/commands/ShowConnections.java +++ b/java/com/google/gerrit/sshd/commands/ShowConnections.java @@ -91,10 +91,7 @@ final class ShowConnections extends SshCommand { } final ImmutableList list = - acceptor - .getManagedSessions() - .values() - .stream() + acceptor.getManagedSessions().values().stream() .sorted( (arg0, arg1) -> { if (arg0 instanceof MinaSession) { diff --git a/java/com/google/gerrit/testing/FakeEmailSender.java b/java/com/google/gerrit/testing/FakeEmailSender.java index bbfd9b1978..4977cb337e 100644 --- a/java/com/google/gerrit/testing/FakeEmailSender.java +++ b/java/com/google/gerrit/testing/FakeEmailSender.java @@ -150,8 +150,7 @@ public class FakeEmailSender implements EmailSender { public List getMessages(String changeId, String type) { final String idFooter = "\n" + MailHeader.CHANGE_ID.withDelimiter() + changeId + "\n"; final String typeFooter = "\n" + MailHeader.MESSAGE_TYPE.withDelimiter() + type + "\n"; - return getMessages() - .stream() + return getMessages().stream() .filter(in -> in.body().contains(idFooter) && in.body().contains(typeFooter)) .collect(toList()); } diff --git a/java/com/google/gerrit/testing/IndexVersions.java b/java/com/google/gerrit/testing/IndexVersions.java index fde93b24f1..3281ffc71f 100644 --- a/java/com/google/gerrit/testing/IndexVersions.java +++ b/java/com/google/gerrit/testing/IndexVersions.java @@ -131,8 +131,7 @@ public class IndexVersions { List schemaVersions, String testSuiteNamePrefix, Config baseConfig) { - return schemaVersions - .stream() + return schemaVersions.stream() .collect( toMap( i -> testSuiteNamePrefix + i, diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java index d723a0fdfc..37b4559f34 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -922,10 +922,7 @@ public class AccountIT extends AbstractDaemonTest { gApi.accounts().id(foo.id.hashCode()).addEmail(input); assertThat( - gApi.accounts() - .id(foo.id.get()) - .getEmails() - .stream() + gApi.accounts().id(foo.id.get()).getEmails().stream() .map(e -> e.email) .collect(toSet())) .containsExactly(email, secondaryEmail); @@ -2474,10 +2471,7 @@ public class AccountIT extends AbstractDaemonTest { assertThat(bgCounterA1.get()).isEqualTo(0); assertThat(bgCounterA2.get()).isEqualTo(0); assertThat( - gApi.accounts() - .id(accountId.get()) - .getExternalIds() - .stream() + gApi.accounts().id(accountId.get()).getExternalIds().stream() .map(i -> i.identity) .collect(toSet())) .containsExactly(extIdA1.key().get()); @@ -2507,10 +2501,7 @@ public class AccountIT extends AbstractDaemonTest { assertThat(updatedAccount.get().getExternalIds()).containsExactly(extIdB2); assertThat(accounts.get(accountId).get().getExternalIds()).containsExactly(extIdB2); assertThat( - gApi.accounts() - .id(accountId.get()) - .getExternalIds() - .stream() + gApi.accounts().id(accountId.get()).getExternalIds().stream() .map(i -> i.identity) .collect(toSet())) .containsExactly(extIdB2.key().get()); @@ -2737,11 +2728,7 @@ public class AccountIT extends AbstractDaemonTest { requestScopeOperations.setApiUser(testAccount.getId()); for (ChangeInfo changeInfo : gApi.changes().query("has:draft").get()) { for (CommentInfo c : - gApi.changes() - .id(changeInfo.id) - .drafts() - .values() - .stream() + gApi.changes().id(changeInfo.id).drafts().values().stream() .flatMap(List::stream) .collect(toImmutableList())) { gApi.changes().id(changeInfo.id).revision(c.patchSet).draft(c.id).delete(); @@ -2829,9 +2816,7 @@ public class AccountIT extends AbstractDaemonTest { Iterable expectedFps = expected.transform(k -> BaseEncoding.base16().encode(k.getPublicKey().getFingerprint())); Iterable 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/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index 4d1f62ffba..d7083bc490 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -3884,9 +3884,7 @@ public class ChangeIT extends AbstractDaemonTest { throws Exception { ChangeInfo c = gApi.changes().id(changeId).get(DETAILED_LABELS); Set states = - c.reviewers - .entrySet() - .stream() + c.reviewers.entrySet().stream() .filter(e -> e.getValue().stream().anyMatch(a -> a._accountId == accountId.get())) .map(Map.Entry::getKey) .collect(toSet()); diff --git a/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java b/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java index 6c6ad3d23c..3b2df797c9 100644 --- a/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java +++ b/javatests/com/google/gerrit/acceptance/api/project/CheckProjectIT.java @@ -78,10 +78,7 @@ public class CheckProjectIT extends AbstractDaemonTest { CheckProjectResultInfo checkResult = gApi.projects().name(project.get()).check(checkProjectInputForAutoCloseableCheck(branch)); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toList())) .containsExactly(change._number); @@ -106,10 +103,7 @@ public class CheckProjectIT extends AbstractDaemonTest { input.autoCloseableChangesCheck.fix = true; CheckProjectResultInfo checkResult = gApi.projects().name(project.get()).check(input); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toSet())) .containsExactly(change._number); @@ -132,10 +126,7 @@ public class CheckProjectIT extends AbstractDaemonTest { CheckProjectResultInfo checkResult = gApi.projects().name(project.get()).check(checkProjectInputForAutoCloseableCheck(branch)); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toSet())) .containsExactly(r.getChange().getId().get()); @@ -159,10 +150,7 @@ public class CheckProjectIT extends AbstractDaemonTest { input.autoCloseableChangesCheck.fix = true; CheckProjectResultInfo checkResult = gApi.projects().name(project.get()).check(input); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toSet())) .containsExactly(r.getChange().getId().get()); @@ -196,10 +184,7 @@ public class CheckProjectIT extends AbstractDaemonTest { input.autoCloseableChangesCheck.maxCommits = 2; checkResult = gApi.projects().name(project.get()).check(input); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toSet())) .containsExactly(r.getChange().getId().get()); @@ -233,10 +218,7 @@ public class CheckProjectIT extends AbstractDaemonTest { input.autoCloseableChangesCheck.skipCommits = 1; checkResult = gApi.projects().name(project.get()).check(input); assertThat( - checkResult - .autoCloseableChangesCheckResult - .autoCloseableChanges - .stream() + checkResult.autoCloseableChangesCheckResult.autoCloseableChanges.stream() .map(i -> i._number) .collect(toSet())) .containsExactly(r.getChange().getId().get()); diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java index 9538e59aa3..7a0fff842d 100644 --- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java +++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java @@ -227,11 +227,7 @@ public class RevisionIT extends AbstractDaemonTest { requestScopeOperations.setApiUser(admin.getId()); gApi.changes().id(changeId).reviewer(user.username).deleteVote("Code-Review"); Optional crUser = - get(changeId, DETAILED_LABELS) - .labels - .get("Code-Review") - .all - .stream() + get(changeId, DETAILED_LABELS).labels.get("Code-Review").all.stream() .filter(a -> a._accountId == user.id.get()) .findFirst(); assertThat(crUser).isPresent(); @@ -246,13 +242,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/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java index b00837d097..2f23123855 100644 --- a/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java +++ b/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java @@ -1024,8 +1024,7 @@ public class RobotCommentsIT extends AbstractDaemonTest { private static List getFixIds(List robotComments) { assertThatList(robotComments).isNotNull(); - return robotComments - .stream() + return robotComments.stream() .map(robotCommentInfo -> robotCommentInfo.fixSuggestions) .filter(Objects::nonNull) .flatMap(List::stream) diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java index 93aaf1fe2a..ede450a85d 100644 --- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java +++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java @@ -643,8 +643,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { ChangeInfo ci = get(r.getChangeId(), DETAILED_LABELS); ImmutableList ccs = - firstNonNull(ci.reviewers.get(ReviewerState.CC), ImmutableList.of()) - .stream() + firstNonNull(ci.reviewers.get(ReviewerState.CC), ImmutableList.of()).stream() .sorted(comparing((AccountInfo a) -> a.email)) .collect(toImmutableList()); assertThat(ccs).hasSize(2); @@ -2058,9 +2057,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { assertThat(getLastMessage(r.getChangeId())).isEqualTo("Uploaded patch set 3.\n\n(3 comments)"); List messages = - sender - .getMessages() - .stream() + sender.getMessages().stream() .map(Message::body) .sorted(Comparator.comparingInt(m -> m.contains("reexamine") ? 0 : 1)) .collect(toList()); @@ -2494,11 +2491,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { } private Collection getPublishedComments(String changeId) throws Exception { - return gApi.changes() - .id(changeId) - .comments() - .values() - .stream() + return gApi.changes().id(changeId).comments().values().stream() .flatMap(Collection::stream) .collect(toList()); } diff --git a/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java b/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java index 61f40f77e2..dd0a5cbe94 100644 --- a/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java +++ b/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java @@ -344,8 +344,7 @@ public class PushPermissionsIT extends AbstractDaemonTest { } private static void removeAllBranchPermissions(ProjectConfig cfg, String... permissions) { - cfg.getAccessSections() - .stream() + cfg.getAccessSections().stream() .filter( s -> s.getName().startsWith("refs/heads/") diff --git a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java index ce8327b7a0..ff4a4238ca 100644 --- a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java +++ b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java @@ -794,9 +794,7 @@ public class RefAdvertisementIT extends AbstractDaemonTest { } private static Map getAllRefs(Repository repo) throws IOException { - return repo.getRefDatabase() - .getRefs() - .stream() + return repo.getRefDatabase().getRefs().stream() .collect(toMap(Ref::getName, Function.identity())); } } diff --git a/javatests/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java b/javatests/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java index c166acfb85..c07d512946 100644 --- a/javatests/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java +++ b/javatests/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java @@ -76,11 +76,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()); @@ -271,10 +267,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/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java b/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java index db5dfabaec..6addf514ce 100644 --- a/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java @@ -488,8 +488,7 @@ public class ChangesRestApiBindingsIT extends AbstractDaemonTest { private static List getFixIds(List robotComments) { assertThatList(robotComments).isNotNull(); - return robotComments - .stream() + return robotComments.stream() .map(robotCommentInfo -> robotCommentInfo.fixSuggestions) .filter(Objects::nonNull) .flatMap(List::stream) diff --git a/javatests/com/google/gerrit/acceptance/rest/binding/ConfigRestApiBindingsIT.java b/javatests/com/google/gerrit/acceptance/rest/binding/ConfigRestApiBindingsIT.java index f187094848..02c44ef72a 100644 --- a/javatests/com/google/gerrit/acceptance/rest/binding/ConfigRestApiBindingsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/binding/ConfigRestApiBindingsIT.java @@ -101,8 +101,7 @@ public class ConfigRestApiBindingsIT extends AbstractDaemonTest { r.consume(); Optional id = - result - .stream() + result.stream() .filter(t -> "Log File Compressor".equals(t.command)) .map(t -> t.id) .findFirst(); diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java index 919b2fd164..13321d048e 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java @@ -577,8 +577,7 @@ public class SuggestReviewersIT extends AbstractDaemonTest { List expectedUsers, List expectedGroups) { List actualAccountIds = - actual - .stream() + actual.stream() .filter(i -> i.account != null) .map(i -> i.account._accountId) .collect(toList()); diff --git a/javatests/com/google/gerrit/acceptance/rest/config/KillTaskIT.java b/javatests/com/google/gerrit/acceptance/rest/config/KillTaskIT.java index c19f5d021c..2a891aad0a 100644 --- a/javatests/com/google/gerrit/acceptance/rest/config/KillTaskIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/config/KillTaskIT.java @@ -36,8 +36,7 @@ public class KillTaskIT extends AbstractDaemonTest { r.consume(); Optional id = - result - .stream() + result.stream() .filter(t -> "Log File Compressor".equals(t.command)) .map(t -> t.id) .findFirst(); diff --git a/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java b/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java index 8a5fddd6ed..2a7cadc7a1 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java @@ -942,9 +942,7 @@ public class CommentsIT extends AbstractDaemonTest { } private List 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/javatests/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java b/javatests/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java index 580b5decd8..18925665a7 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java @@ -296,9 +296,7 @@ public class PatchListCacheIT extends AbstractDaemonTest { private static PatchListEntry getEntryFor(PatchList patchList, String filePath) { Optional patchListEntry = - patchList - .getPatches() - .stream() + patchList.getPatches().stream() .filter(entry -> entry.getNewName().equals(filePath)) .findAny(); return patchListEntry.orElseThrow( diff --git a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java index a61b7a6d99..1ea64ca688 100644 --- a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java +++ b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java @@ -286,11 +286,7 @@ public class NoteDbOnlyIT extends AbstractDaemonTest { } private List 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/javatests/com/google/gerrit/server/account/AccountResolverTest.java b/javatests/com/google/gerrit/server/account/AccountResolverTest.java index fefbc2ff50..5f662e9725 100644 --- a/javatests/com/google/gerrit/server/account/AccountResolverTest.java +++ b/javatests/com/google/gerrit/server/account/AccountResolverTest.java @@ -85,8 +85,7 @@ public class AccountResolverTest extends GerritBaseTests { @Override public String toString() { - return accounts - .stream() + return accounts.stream() .map(a -> a.getAccount().getId().toString()) .collect(joining(",", pattern + "(", ")")); } @@ -358,9 +357,7 @@ public class AccountResolverTest extends GerritBaseTests { } private static ImmutableSet filteredInactiveIds(Result result) { - return result - .filteredInactive() - .stream() + return result.filteredInactive().stream() .map(a -> a.getAccount().getId()) .collect(toImmutableSet()); } diff --git a/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java b/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java index d3792b73bb..758c304822 100644 --- a/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java +++ b/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java @@ -150,8 +150,7 @@ public class ChangeFieldTest extends GerritBaseTests { private static void assertStoredRecordRoundTrip(SubmitRecord... records) { List recordList = ImmutableList.copyOf(records); List stored = - ChangeField.storedSubmitRecords(recordList) - .stream() + ChangeField.storedSubmitRecords(recordList).stream() .map(s -> new String(s, UTF_8)) .collect(toList()); assertThat(ChangeField.parseSubmitRecords(stored)) diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java index 8892e84b22..1da412180f 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java @@ -407,10 +407,7 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { ChangeNotes notes = newNotes(c); ImmutableList approvals = - notes - .getApprovals() - .get(c.currentPatchSetId()) - .stream() + notes.getApprovals().get(c.currentPatchSetId()).stream() .sorted(comparing(a -> a.getAccountId().get())) .collect(toImmutableList()); assertThat(approvals).hasSize(2); diff --git a/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java b/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java index 80634f532e..8440d9f181 100644 --- a/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java +++ b/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java @@ -478,10 +478,7 @@ public class CommentJsonMigratorTest extends AbstractChangeNotesTest { reader, noteMap, status); - return revNoteMap - .revisionNotes - .values() - .stream() + return revNoteMap.revisionNotes.values().stream() .flatMap(crn -> crn.getEntities().stream()) .collect(toImmutableMap(c -> c.key, c -> c.legacyFormat)); } diff --git a/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java b/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java index 79c620a732..cf6d50fab6 100644 --- a/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java +++ b/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java @@ -222,9 +222,7 @@ public class CommitsCollectionTest extends GerritBaseTests { .getAccessSection(AccessSection.GLOBAL_CAPABILITIES) .getPermission(GlobalCapability.ADMINISTRATE_SERVER); - return adminPermission - .getRules() - .stream() + return adminPermission.getRules().stream() .map(PermissionRule::getGroup) .map(GroupReference::getUUID) .collect(ImmutableList.toImmutableList()); diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 100c25eec6..fd81507e42 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -528,8 +528,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { // Convert AccountInfos to strings, either account ID or email. List reviewerIds = - reviewers - .stream() + reviewers.stream() .map( ai -> { if (ai._accountId != null) { @@ -2235,10 +2234,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { gApi.groups().id(group).addMembers(user2.toString(), user3.toString()); List members = - gApi.groups() - .id(group) - .members() - .stream() + gApi.groups().id(group).members().stream() .map(a -> a._accountId.toString()) .collect(toList()); assertThat(members).contains(user2.toString()); @@ -3337,10 +3333,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { protected void assertQuery(Predicate predicate, Change... changes) throws Exception { ImmutableList actualIds = - queryProvider - .get() - .query(predicate) - .stream() + queryProvider.get().query(predicate).stream() .map(ChangeData::getId) .collect(toImmutableList()); Change.Id[] expectedIds = Arrays.stream(changes).map(Change::getId).toArray(Change.Id[]::new); diff --git a/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java b/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java index d3c7809ef0..08ef2b0e05 100644 --- a/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java +++ b/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java @@ -177,10 +177,7 @@ public abstract class AbstractQueryProjectsTest extends GerritServerTests { public void byParentOfAllProjects() throws Exception { Set excludedProjects = ImmutableSet.of(allProjects.get(), allUsers.get()); ProjectInfo[] projects = - gApi.projects() - .list() - .get() - .stream() + gApi.projects().list().get().stream() .filter(p -> !excludedProjects.contains(p.name)) .toArray(s -> new ProjectInfo[s]); assertQuery("parent:" + allProjects.get(), projects); diff --git a/javatests/com/google/gerrit/server/schema/NoteDbSchemaVersionsTest.java b/javatests/com/google/gerrit/server/schema/NoteDbSchemaVersionsTest.java index 530010fc23..7bc3848f6d 100644 --- a/javatests/com/google/gerrit/server/schema/NoteDbSchemaVersionsTest.java +++ b/javatests/com/google/gerrit/server/schema/NoteDbSchemaVersionsTest.java @@ -53,8 +53,7 @@ public class NoteDbSchemaVersionsTest extends GerritBaseTests { int minNoteDbVersion = 180; ImmutableList allSchemaVersions = ClassPath.from(getClass().getClassLoader()) - .getTopLevelClasses(getClass().getPackage().getName()) - .stream() + .getTopLevelClasses(getClass().getPackage().getName()).stream() .map(ClassInfo::load) .map(NoteDbSchemaVersions::guessVersion) .flatMap(Streams::stream) diff --git a/plugins/delete-project b/plugins/delete-project index 231197b040..1304fb030e 160000 --- a/plugins/delete-project +++ b/plugins/delete-project @@ -1 +1 @@ -Subproject commit 231197b040ed3f11b997195de021f7f073877070 +Subproject commit 1304fb030ea990d63df42cab678cdf2b46722d1b diff --git a/plugins/replication b/plugins/replication index 9ad16dabda..a4bae3f491 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 9ad16dabdaf49757d67b3ebcf5dd9b1bc30fb277 +Subproject commit a4bae3f491bb3f693e2407d353d3a81ce2a5c8be diff --git a/plugins/singleusergroup b/plugins/singleusergroup index 17f5d016b8..ff777080a8 160000 --- a/plugins/singleusergroup +++ b/plugins/singleusergroup @@ -1 +1 @@ -Subproject commit 17f5d016b8c9e76cdbf467a004ba22d4c46311fa +Subproject commit ff777080a881e85060ab446ae3f00612bcfb5ae1 diff --git a/plugins/webhooks b/plugins/webhooks index f2282644c9..b8fcfd5d71 160000 --- a/plugins/webhooks +++ b/plugins/webhooks @@ -1 +1 @@ -Subproject commit f2282644c9da0e0fe1a9e106f26ddcb3ad42358d +Subproject commit b8fcfd5d712abb599e49c3e40d266b77f05a398a 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)