diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/notedb')
6 files changed, 9 insertions, 22 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java index a2e0997aa8..b9348ebc7a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java @@ -733,9 +733,7 @@ public class ChangeBundle { private static boolean createdOnIsMonotonic( Map<?, PatchSet> patchSets, Set<PatchSet.Id> limitToIds) { List<PatchSet> orderedById = - patchSets - .values() - .stream() + patchSets.values().stream() .filter(ps -> limitToIds.contains(ps.getId())) .sorted(ChangeUtil.PS_ID_ORDER) .collect(toList()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java index e652a35eb6..65e1f5d51e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java @@ -337,8 +337,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> { ScanResult sr = scanChangeIds(repo); PrimaryStorage defaultStorage = args.migration.changePrimaryStorage(); - return sr.all() - .stream() + return sr.all().stream() .map(id -> scanOneNoteDbChange(db, project, sr, defaultStorage, id)) .filter(Objects::nonNull); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java index db7b86a022..7a3d441a8f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java @@ -134,10 +134,8 @@ public class DeleteCommentRewriter implements NoteDbRewriter { public static Map<String, Comment> getPublishedComments( ChangeNoteUtil noteUtil, Change.Id changeId, ObjectReader reader, NoteMap noteMap) throws IOException, ConfigInvalidException { - return RevisionNoteMap.parse(noteUtil, changeId, reader, noteMap, PUBLISHED) - .revisionNotes - .values() - .stream() + return RevisionNoteMap.parse(noteUtil, changeId, reader, noteMap, PUBLISHED).revisionNotes + .values().stream() .flatMap(n -> n.getComments().stream()) .collect(toMap(c -> c.key.uuid, c -> c)); } @@ -173,9 +171,7 @@ public class DeleteCommentRewriter implements NoteDbRewriter { */ private List<Comment> getDeletedComments( Map<String, Comment> parMap, Map<String, Comment> curMap) { - return parMap - .entrySet() - .stream() + return parMap.entrySet().stream() .filter(c -> !curMap.containsKey(c.getKey())) .map(c -> c.getValue()) .collect(toList()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java index b9f5fe6be8..cb7232006c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java @@ -696,9 +696,7 @@ public class NoteDbUpdateManager implements AutoCloseable { } if (!rewriters.isEmpty()) { Optional<String> conflictKey = - rewriters - .keySet() - .stream() + rewriters.keySet().stream() .filter(k -> (draftUpdates.containsKey(k) || robotCommentUpdates.containsKey(k))) .findAny(); if (conflictKey.isPresent()) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java index 8d5af698bc..cabe18f998 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java @@ -427,9 +427,7 @@ public class ChangeRebuilderImpl extends ChangeRebuilder { private static List<Comment> getComments( ChangeBundle bundle, String serverId, PatchLineComment.Status status, PatchSet ps) { - return bundle - .getPatchLineComments() - .stream() + return bundle.getPatchLineComments().stream() .filter(c -> c.getPatchSetId().equals(ps.getId()) && c.getStatus() == status) .map(plc -> plc.asComment(serverId)) .sorted(CommentsUtil.COMMENT_ORDER) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java index 3ea3e2b15a..efff3388af 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java @@ -448,8 +448,7 @@ public class NoteDbMigrator implements AutoCloseable { int sequenceGap, boolean autoMigrate) throws MigrationException { - if (ImmutableList.of(!changes.isEmpty(), !projects.isEmpty(), !skipProjects.isEmpty()) - .stream() + if (ImmutableList.of(!changes.isEmpty(), !projects.isEmpty(), !skipProjects.isEmpty()).stream() .filter(e -> e) .count() > 1) { @@ -629,8 +628,7 @@ public class NoteDbMigrator implements AutoCloseable { try (ContextHelper contextHelper = new ContextHelper()) { List<ListenableFuture<Boolean>> futures = - allChanges - .stream() + allChanges.stream() .map( id -> executor.submit( |