diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2019-03-14 09:01:59 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2019-03-14 09:08:30 +0900 |
| commit | 7a519876e5eaec14a86d091962a767054530709e (patch) | |
| tree | fe099a465a92f6ae30156703d13cfa9c564c454f /java/com/google/gerrit/server/schema/GroupBundle.java | |
| parent | fed5a852ffc4e21df6673715ac8febb52dd578d8 (diff) | |
| parent | 70c569da872934815f43cb16db8286d14b6b2dfa (diff) | |
Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Upgrade google-java-format to 1.7
Change-Id: Ia7383822ef59fb60bb5559956a065ae46b2e4f4a
Diffstat (limited to 'java/com/google/gerrit/server/schema/GroupBundle.java')
| -rw-r--r-- | java/com/google/gerrit/server/schema/GroupBundle.java | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/java/com/google/gerrit/server/schema/GroupBundle.java b/java/com/google/gerrit/server/schema/GroupBundle.java index 26cd96ada3..4b8bdcc032 100644 --- a/java/com/google/gerrit/server/schema/GroupBundle.java +++ b/java/com/google/gerrit/server/schema/GroupBundle.java @@ -139,17 +139,13 @@ abstract class GroupBundle { return create( Source.NOTE_DB, accountGroup, - internalGroup - .getMembers() - .stream() + internalGroup.getMembers().stream() .map( accountId -> new AccountGroupMember(new AccountGroupMember.Key(accountId, groupId))) .collect(toImmutableSet()), auditLogReader.getMembersAudit(repo, uuid), - internalGroup - .getSubgroups() - .stream() + internalGroup.getSubgroups().stream() .map( subgroupUuid -> new AccountGroupById(new AccountGroupById.Key(groupId, subgroupUuid))) @@ -518,8 +514,7 @@ abstract class GroupBundle { private static ListMultimap<String, AuditEntry> toMemberAuditEntriesByMemberId( ImmutableSet<AccountGroupMemberAudit> memberAudits) { - return memberAudits - .stream() + return memberAudits.stream() .flatMap(GroupBundle::toAuditEntries) .collect( Multimaps.toMultimap( @@ -550,8 +545,7 @@ abstract class GroupBundle { private static ListMultimap<String, AuditEntry> toByIdAuditEntriesById( ImmutableSet<AccountGroupByIdAud> byIdAudits) { - return byIdAudits - .stream() + return byIdAudits.stream() .flatMap(GroupBundle::toAuditEntries) .collect( Multimaps.toMultimap( @@ -587,15 +581,11 @@ abstract class GroupBundle { ListMultimap<String, AuditEntry> noteDbMemberAuditsByTarget) { for (String target : reviewDbMemberAuditsByTarget.keySet()) { ImmutableList<AuditEntry> reviewDbAuditEntries = - reviewDbMemberAuditsByTarget - .get(target) - .stream() + reviewDbMemberAuditsByTarget.get(target).stream() .sorted(AUDIT_ENTRY_COMPARATOR) .collect(toImmutableList()); ImmutableSet<AuditEntry> noteDbAuditEntries = - noteDbMemberAuditsByTarget - .get(target) - .stream() + noteDbMemberAuditsByTarget.get(target).stream() .sorted(AUDIT_ENTRY_COMPARATOR) .collect(toImmutableSet()); |