diff options
Diffstat (limited to 'java/com/google/gerrit/server/notedb')
6 files changed, 15 insertions, 41 deletions
diff --git a/java/com/google/gerrit/server/notedb/ChangeBundle.java b/java/com/google/gerrit/server/notedb/ChangeBundle.java index c4d6a91f72..058e5e5785 100644 --- a/java/com/google/gerrit/server/notedb/ChangeBundle.java +++ b/java/com/google/gerrit/server/notedb/ChangeBundle.java @@ -557,8 +557,7 @@ public class ChangeBundle { } if (!bs.isEmpty()) { sb.append("Only in B:"); - bs.values() - .stream() + bs.values().stream() .sorted(CHANGE_MESSAGE_COMPARATOR) .forEach(cm -> sb.append("\n ").append(cm)); } @@ -675,9 +674,7 @@ public class ChangeBundle { private static boolean createdOnIsMonotonic( Map<?, PatchSet> patchSets, Set<PatchSet.Id> limitToIds) { List<PatchSet> orderedById = - patchSets - .values() - .stream() + patchSets.values().stream() .filter(ps -> limitToIds.contains(ps.getId())) .sorted(ChangeUtil.PS_ID_ORDER) .collect(toList()); diff --git a/java/com/google/gerrit/server/notedb/ChangeNotes.java b/java/com/google/gerrit/server/notedb/ChangeNotes.java index d2942dc7a6..086b2e28f2 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotes.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotes.java @@ -336,8 +336,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> { ScanResult sr = scanChangeIds(repo); PrimaryStorage defaultStorage = args.migration.changePrimaryStorage(); - return sr.all() - .stream() + return sr.all().stream() .map(id -> scanOneNoteDbChange(db, project, sr, defaultStorage, id)) .filter(Objects::nonNull); } diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesState.java b/java/com/google/gerrit/server/notedb/ChangeNotesState.java index ca579ae231..02fe4167a6 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesState.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesState.java @@ -565,23 +565,17 @@ public abstract class ChangeNotesState { .changeId(changeId) .columns(toChangeColumns(changeId, proto.getColumns())) .pastAssignees( - proto - .getPastAssigneeList() - .stream() + proto.getPastAssigneeList().stream() .map(Account.Id::new) .collect(toImmutableSet())) .hashtags(proto.getHashtagList()) .patchSets( - proto - .getPatchSetList() - .stream() + proto.getPatchSetList().stream() .map(PATCH_SET_CODEC::decode) .map(ps -> Maps.immutableEntry(ps.getId(), ps)) .collect(toImmutableList())) .approvals( - proto - .getApprovalList() - .stream() + proto.getApprovalList().stream() .map(APPROVAL_CODEC::decode) .map(a -> Maps.immutableEntry(a.getPatchSetId(), a)) .collect(toImmutableList())) @@ -590,28 +584,20 @@ public abstract class ChangeNotesState { .pendingReviewers(toReviewerSet(proto.getPendingReviewerList())) .pendingReviewersByEmail(toReviewerByEmailSet(proto.getPendingReviewerByEmailList())) .allPastReviewers( - proto - .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(MESSAGE_CODEC::decode) .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))); if (proto.getHasReadOnlyUntil()) { diff --git a/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java b/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java index 0cd3452b64..656e9ec951 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.getComments().stream()) .collect(toMap(c -> c.key.uuid, Function.identity())); } @@ -189,9 +187,7 @@ public class DeleteCommentRewriter implements NoteDbRewriter { */ private List<Comment> getDeletedComments( Map<String, Comment> parMap, Map<String, Comment> curMap) { - return parMap - .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/notedb/rebuild/ChangeRebuilderImpl.java b/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java index 8740710d05..0d516e5b88 100644 --- a/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java +++ b/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java @@ -419,9 +419,7 @@ public class ChangeRebuilderImpl extends ChangeRebuilder { private static List<Comment> getComments( ChangeBundle bundle, String serverId, PatchLineComment.Status status, PatchSet ps) { - return bundle - .getPatchLineComments() - .stream() + return bundle.getPatchLineComments().stream() .filter(c -> c.getPatchSetId().equals(ps.getId()) && c.getStatus() == status) .map(plc -> plc.asComment(serverId)) .sorted(CommentsUtil.COMMENT_ORDER) diff --git a/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java b/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java index 736792df5c..1ac1da2a6b 100644 --- a/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java +++ b/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java @@ -447,8 +447,7 @@ public class NoteDbMigrator implements AutoCloseable { int sequenceGap, boolean autoMigrate) throws MigrationException { - if (ImmutableList.of(!changes.isEmpty(), !projects.isEmpty(), !skipProjects.isEmpty()) - .stream() + if (ImmutableList.of(!changes.isEmpty(), !projects.isEmpty(), !skipProjects.isEmpty()).stream() .filter(e -> e) .count() > 1) { @@ -628,8 +627,7 @@ public class NoteDbMigrator implements AutoCloseable { try (ContextHelper contextHelper = new ContextHelper()) { List<ListenableFuture<Boolean>> futures = - allChanges - .stream() + allChanges.stream() .map( id -> executor.submit( |