diff options
Diffstat (limited to 'javatests/com/google/gerrit')
23 files changed, 39 insertions, 137 deletions
diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java index 83c180956c..775bfcf0a0 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -912,10 +912,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); @@ -2494,10 +2491,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()); @@ -2527,10 +2521,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()); @@ -2757,11 +2748,7 @@ public class AccountIT extends AbstractDaemonTest { setApiUser(testAccount); 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(); @@ -2849,9 +2836,7 @@ public class AccountIT extends AbstractDaemonTest { Iterable<String> expectedFps = expected.transform(k -> BaseEncoding.base16().encode(k.getPublicKey().getFingerprint())); Iterable<String> 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 da513e90ba..be4b2e147d 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -3872,9 +3872,7 @@ public class ChangeIT extends AbstractDaemonTest { throws Exception { ChangeInfo c = gApi.changes().id(changeId).get(DETAILED_LABELS); Set<ReviewerState> 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 86908cbb97..b058d5e7bf 100644 --- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java +++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java @@ -225,11 +225,7 @@ public class RevisionIT extends AbstractDaemonTest { setApiUser(admin); gApi.changes().id(changeId).reviewer(user.username).deleteVote("Code-Review"); Optional<ApprovalInfo> 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(); @@ -244,13 +240,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 cd20765940..dfd25e25cb 100644 --- a/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java +++ b/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java @@ -1140,8 +1140,7 @@ public class RobotCommentsIT extends AbstractDaemonTest { private static List<String> getFixIds(List<RobotCommentInfo> 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 015dd31028..12266614c2 100644 --- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java +++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java @@ -590,8 +590,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { ChangeInfo ci = get(r.getChangeId(), DETAILED_LABELS); ImmutableList<AccountInfo> ccs = - firstNonNull(ci.reviewers.get(ReviewerState.CC), ImmutableList.<AccountInfo>of()) - .stream() + firstNonNull(ci.reviewers.get(ReviewerState.CC), ImmutableList.<AccountInfo>of()).stream() .sorted(comparing((AccountInfo a) -> a.email)) .collect(toImmutableList()); assertThat(ccs).hasSize(2); @@ -2059,9 +2058,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { assertThat(getLastMessage(r.getChangeId())).isEqualTo("Uploaded patch set 3.\n\n(3 comments)"); List<String> messages = - sender - .getMessages() - .stream() + sender.getMessages().stream() .map(Message::body) .sorted(Comparator.comparingInt(m -> m.contains("reexamine") ? 0 : 1)) .collect(toList()); @@ -2330,11 +2327,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { } private Collection<CommentInfo> 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 907ad7f2b6..30e179d31d 100644 --- a/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java +++ b/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java @@ -340,8 +340,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/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/ChangesRestApiBindingsIT.java b/javatests/com/google/gerrit/acceptance/rest/ChangesRestApiBindingsIT.java index 59c0903452..c00c2aad40 100644 --- a/javatests/com/google/gerrit/acceptance/rest/ChangesRestApiBindingsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/ChangesRestApiBindingsIT.java @@ -499,8 +499,7 @@ public class ChangesRestApiBindingsIT extends AbstractRestApiBindingsTest { private static List<String> getFixIds(List<RobotCommentInfo> 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/ConfigRestApiBindingsIT.java b/javatests/com/google/gerrit/acceptance/rest/ConfigRestApiBindingsIT.java index 508d407edf..4a2c81b6aa 100644 --- a/javatests/com/google/gerrit/acceptance/rest/ConfigRestApiBindingsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/ConfigRestApiBindingsIT.java @@ -99,8 +99,7 @@ public class ConfigRestApiBindingsIT extends AbstractRestApiBindingsTest { r.consume(); Optional<String> 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 4d499f0c4a..b0a89c35a0 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java @@ -530,8 +530,7 @@ public class SuggestReviewersIT extends AbstractDaemonTest { List<TestAccount> expectedUsers, List<InternalGroup> expectedGroups) { List<Integer> 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<String> 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 736b7659c8..e9d2611143 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java @@ -960,9 +960,7 @@ public class CommentsIT extends AbstractDaemonTest { } private List<CommentInfo> 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> 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/ChangeRebuilderIT.java b/javatests/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java index 29f1b7dfc3..5ebfa9e926 100644 --- a/javatests/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java +++ b/javatests/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java @@ -1412,11 +1412,7 @@ public class ChangeRebuilderIT extends AbstractDaemonTest { CommentInfo draftInfo = putDraft(user, id, 1, "draft comment", null, Side.PARENT); putComment(user, id, 1, "published comment", null, Side.PARENT); CommentInfo commentInfo = - gApi.changes() - .id(id.get()) - .comments() - .values() - .stream() + gApi.changes().id(id.get()).comments().values().stream() .flatMap(List::stream) .findFirst() .get(); diff --git a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java index 8d6fecdfc4..f4cedbb957 100644 --- a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java +++ b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java @@ -295,11 +295,7 @@ public class NoteDbOnlyIT extends AbstractDaemonTest { } private List<String> 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/acceptance/server/notedb/NoteDbPrimaryIT.java b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java index 26d546184a..486a0de55a 100644 --- a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java +++ b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java @@ -267,8 +267,7 @@ public class NoteDbPrimaryIT extends AbstractDaemonTest { fail("expected read-only exception"); } catch (RestApiException e) { Optional<Throwable> oe = - Throwables.getCausalChain(e) - .stream() + Throwables.getCausalChain(e).stream() .filter(x -> x instanceof OrmRuntimeException) .findFirst(); assertThat(oe).named("OrmRuntimeException in causal chain of " + e).isPresent(); @@ -511,12 +510,7 @@ public class NoteDbPrimaryIT extends AbstractDaemonTest { } private List<Account.Id> getReviewers(Change.Id id) throws Exception { - return gApi.changes() - .id(id.get()) - .get() - .reviewers - .values() - .stream() + return gApi.changes().id(id.get()).get().reviewers.values().stream() .flatMap(Collection::stream) .map(a -> new Account.Id(a._accountId)) .collect(toList()); 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<SubmitRecord> recordList = ImmutableList.copyOf(records); List<String> 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/CommentJsonMigratorTest.java b/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java index b9027bc175..dee61814c1 100644 --- a/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java +++ b/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java @@ -481,10 +481,7 @@ public class CommentJsonMigratorTest extends AbstractChangeNotesTest { reader, noteMap, status); - return revNoteMap - .revisionNotes - .values() - .stream() + return revNoteMap.revisionNotes.values().stream() .flatMap(crn -> crn.getComments().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 b39208a339..07f64a8cae 100644 --- a/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java +++ b/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java @@ -220,9 +220,7 @@ public class CommitsCollectionTest { .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 7cf148d182..c01bf0438c 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -561,8 +561,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { // Convert AccountInfos to strings, either account ID or email. List<String> reviewerIds = - reviewers - .stream() + reviewers.stream() .map( ai -> { if (ai._accountId != null) { @@ -2102,10 +2101,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { gApi.groups().id(group).addMembers(user2.toString(), user3.toString()); List<String> 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()); @@ -2515,8 +2511,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { expectedStates.add("All-Users:refs/draft-comments/" + cs + "/" + u); } assertThat( - cd.getRefStates() - .stream() + cd.getRefStates().stream() .map(String::new) // Omit SHA-1, we're just concerned with the project/ref names. .map(s -> s.substring(0, s.lastIndexOf(':'))) diff --git a/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java b/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java index 3855b03798..7872b444a4 100644 --- a/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java +++ b/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java @@ -210,10 +210,7 @@ public abstract class AbstractQueryProjectsTest extends GerritServerTests { public void byParentOfAllProjects() throws Exception { Set<String> 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/Schema_159_to_160_Test.java b/javatests/com/google/gerrit/server/schema/Schema_159_to_160_Test.java index 0080f3f692..9bd20841b4 100644 --- a/javatests/com/google/gerrit/server/schema/Schema_159_to_160_Test.java +++ b/javatests/com/google/gerrit/server/schema/Schema_159_to_160_Test.java @@ -191,8 +191,7 @@ public class Schema_159_to_160_Test { VersionedAccountPreferences prefs = prefsSupplier.get(); prefs.load(allUsersName, repo); Config cfg = prefs.getConfig(); - return cfg.getSubsections(MY) - .stream() + return cfg.getSubsections(MY).stream() .collect(toImmutableMap(i -> i, i -> cfg.getString(MY, i, KEY_URL))); } } |