diff options
Diffstat (limited to 'java/com/google/gerrit/server/restapi')
19 files changed, 27 insertions, 78 deletions
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<AccountResource.Email, Input> } Set<ExternalId> 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<AccountResource, List<S } Map<ExternalId.Key, ExternalId> externalIdMap = - externalIds - .byAccount(resource.getUser().getAccountId()) - .stream() + externalIds.byAccount(resource.getUser().getAccountId()).stream() .collect(toMap(ExternalId::key, Function.identity())); List<ExternalId> 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<AccountResource> { 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<AccountResource> { 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<AccountResource.Email, Input // check if the user has a matching email String matchingEmail = null; for (String email : - a.getExternalIds() - .stream() + a.getExternalIds().stream() .map(ExternalId::email) .filter(Objects::nonNull) .collect(toSet())) { @@ -121,8 +120,7 @@ public class PutPreferred implements RestModifyView<AccountResource.Email, Input + " by the following account(s): %s", preferredEmail, user.getAccountId(), - existingExtIdsWithThisEmail - .stream() + existingExtIdsWithThisEmail.stream() .map(ExternalId::accountId) .collect(toList())); exception.set( diff --git a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java index 6399cdec6d..b0ebd2b7f1 100644 --- a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java +++ b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java @@ -389,9 +389,7 @@ public class CherryPickChange { if (!cherryPickCommit.getFilesWithGitConflicts().isEmpty()) { stringBuilder.append("\n\nThe following files contain Git conflicts:\n"); - cherryPickCommit - .getFilesWithGitConflicts() - .stream() + cherryPickCommit.getFilesWithGitConflicts().stream() .sorted() .forEach(filePath -> stringBuilder.append("* ").append(filePath).append("\n")); } diff --git a/java/com/google/gerrit/server/restapi/change/GetRelated.java b/java/com/google/gerrit/server/restapi/change/GetRelated.java index 30fbf39386..3eea73671d 100644 --- a/java/com/google/gerrit/server/restapi/change/GetRelated.java +++ b/java/com/google/gerrit/server/restapi/change/GetRelated.java @@ -127,9 +127,7 @@ public class GetRelated implements RestReadView<RevisionResource> { @VisibleForTesting public static Set<String> getAllGroups(ChangeNotes notes, ReviewDb db, PatchSetUtil psUtil) throws OrmException { - return psUtil - .byChange(db, notes) - .stream() + return psUtil.byChange(db, notes).stream() .flatMap(ps -> ps.getGroups().stream()) .collect(toSet()); } diff --git a/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java b/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java index 39c12f7579..9ce21574bb 100644 --- a/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java +++ b/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java @@ -53,8 +53,7 @@ public class ListChangeMessages implements RestReadView<ChangeResource> { List<ChangeMessage> messages = changeMessagesUtil.byChange(dbProvider.get(), resource.getNotes()); List<ChangeMessageInfo> messageInfos = - messages - .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 d06766dba0..845f584578 100644 --- a/java/com/google/gerrit/server/restapi/change/PostReview.java +++ b/java/com/google/gerrit/server/restapi/change/PostReview.java @@ -806,8 +806,7 @@ public class PostReview private static void ensureRangesDoNotOverlap( String commentPath, List<FixReplacementInfo> fixReplacementInfos) throws BadRequestException { List<Range> sortedRanges = - fixReplacementInfos - .stream() + fixReplacementInfos.stream() .map(fixReplacementInfo -> fixReplacementInfo.range) .sorted() .collect(toList()); @@ -1078,17 +1077,13 @@ public class PostReview } private Set<CommentSetEntry> readExistingComments(ChangeContext ctx) throws OrmException { - return commentsUtil - .publishedByChange(ctx.getDb(), ctx.getNotes()) - .stream() + return commentsUtil.publishedByChange(ctx.getDb(), ctx.getNotes()).stream() .map(CommentSetEntry::create) .collect(toSet()); } private Set<CommentSetEntry> readExistingRobotComments(ChangeContext ctx) throws OrmException { - return commentsUtil - .robotCommentsByChange(ctx.getNotes()) - .stream() + return commentsUtil.robotCommentsByChange(ctx.getNotes()).stream() .map(CommentSetEntry::create) .collect(toSet()); } @@ -1313,8 +1308,7 @@ public class PostReview if (!reduced.isEmpty()) { throw new ResourceConflictException( "Cannot reduce vote on labels for closed change: " - + reduced - .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 d88489ea85..ece52bf08f 100644 --- a/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java +++ b/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java @@ -195,9 +195,7 @@ public class ReviewerRecommender { // Sort results Stream<Entry<Account.Id, MutableDouble>> sorted = - reviewerScores - .entrySet() - .stream() + reviewerScores.entrySet().stream() .sorted(Collections.reverseOrder(Map.Entry.comparingByValue())); List<Account.Id> sortedSuggestions = sorted.map(Map.Entry::getKey).collect(toList()); logger.atFine().log("Sorted suggestions: %s", sortedSuggestions); diff --git a/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java b/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java index f7959c82ce..1c97431de2 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<Account.Id> 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<SuggestedReviewerInfo> reviewer = - accountIds - .stream() + accountIds.stream() .map(accountLoader::get) .filter(Objects::nonNull) .map( @@ -431,8 +428,7 @@ public class ReviewersUtil { } private static String formatSuggestedReviewers(List<SuggestedReviewerInfo> suggestedReviewers) { - return suggestedReviewers - .stream() + return suggestedReviewers.stream() .map( r -> { if (r.account != null) { 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<ConfigResource> { } private List<TaskInfo> 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<ConfigResource, Input> { 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<ConfigResource, Input> { private static List<ConfigUpdateEntryInfo> toEntryInfos( Collection<ConfigUpdateEntry> 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<TopLevelResource> { private Stream<GroupReference> 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/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<String> 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 a6b9404df8..3f7d406ccc 100644 --- a/java/com/google/gerrit/server/restapi/project/GetAccess.java +++ b/java/com/google/gerrit/server/restapi/project/GetAccess.java @@ -275,9 +275,7 @@ public class GetAccess implements RestReadView<ProjectResource> { 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<ProjectResource> { private List<ProjectInfo> 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 c3dec09d04..eccf29e975 100644 --- a/java/com/google/gerrit/server/restapi/project/ListProjects.java +++ b/java/com/google/gerrit/server/restapi/project/ListProjects.java @@ -364,12 +364,7 @@ public class ListProjects implements RestReadView<TopLevelResource> { private SortedMap<String, ProjectInfo> 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( @@ -663,9 +658,7 @@ public class ListProjects implements RestReadView<TopLevelResource> { 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) { |