opendev/gerrit
Code Issues Proposed changes

TestAccount: Use Java 8 streams instead of FluentIterable

Browse Source 
Change-Id: I218460336635db552ca13723876cc83d13be2a29
This commit is contained in:
David Pursehouse
2016-10-25 14:28:53 +09:00
parent dce95ae8a9
commit f8da693c64
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/TestAccount.java
View File

@@ -14,7 +14,8 @@
package com.google.gerrit.acceptance;
import com.google.common.collect.FluentIterable;
import static java.util.stream.Collectors.toList;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.server.mail.Address;
@@ -24,22 +25,22 @@ import org.eclipse.jgit.lib.PersonIdent;
import java.io.ByteArrayOutputStream;
import java.util.Arrays;
import java.util.List;
public class TestAccount {
public static FluentIterable<Account.Id> ids(
Iterable<TestAccount> accounts) {
return FluentIterable.from(accounts).transform(a -> a.id);
public static List<Account.Id> ids(List<TestAccount> accounts) {
return accounts.stream().map(a -> a.id).collect(toList());
}
public static FluentIterable<Account.Id> ids(TestAccount... accounts) {
public static List<Account.Id> ids(TestAccount... accounts) {
return ids(Arrays.asList(accounts));
}
public static FluentIterable<String> names(Iterable<TestAccount> accounts) {
return FluentIterable.from(accounts).transform(a -> a.fullName);
public static List<String> names(List<TestAccount> accounts) {
return accounts.stream().map(a -> a.fullName).collect(toList());
}
public static FluentIterable<String> names(TestAccount... accounts) {
public static List<String> names(TestAccount... accounts) {
return names(Arrays.asList(accounts));
}

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/GroupsIT.java
View File

@@ -504,7 +504,7 @@ public class GroupsIT extends AbstractDaemonTest {
throws Exception {
assertMembers(
gApi.groups().id(group).members(),
TestAccount.names(expectedMembers).toArray(String.class));
TestAccount.names(expectedMembers).stream().toArray(String[]::new));
assertAccountInfos(
Arrays.asList(expectedMembers),
gApi.groups().id(group).members());