WebLinks: Return List<T> from methods rather than FluentIterable<T>
All the callers of these methods convert the returned FluentIterable to
a List. Also it's inefficient to invoke FluentIterable.isEmpty() because
it has to traverse the whole thing including map and filter calls.
Change it to just return a List.
Rather than converting to use the Java 8 streams API, leave the internal
implementation of the methods unchanged for now. The links are DynamicSet,
which is an implementation of Iterable and does not have the stream()
method. There isn't much readability improvement by rewriting it to use
Spliterator, but we can revisit this later when we upgrade to Guava 21
which has a Streams utility.
Change-Id: I0e2a68f2992f6bcb2ab1ee2ae067975d416e9651
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java
index 744cab7..adfd528 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java
@@ -14,7 +14,6 @@
package com.google.gerrit.httpd.rpc.project;
-import com.google.common.collect.FluentIterable;
import com.google.common.collect.Maps;
import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.GroupDescription;
@@ -216,10 +215,10 @@
}
private List<WebLinkInfoCommon> getConfigFileLogLinks(String projectName) {
- FluentIterable<WebLinkInfoCommon> links =
+ List<WebLinkInfoCommon> links =
webLinks.getFileHistoryLinks(projectName, RefNames.REFS_CONFIG,
ProjectConfig.PROJECT_CONFIG);
- return links.isEmpty() ? null : links.toList();
+ return links.isEmpty() ? null : links;
}
private Map<AccountGroup.UUID, GroupInfo> buildGroupInfo(List<AccessSection> local) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
index 1e64a53..7b9733e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
@@ -36,6 +36,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
+
@Singleton
public class WebLinks {
private static final Logger log = LoggerFactory.getLogger(WebLinks.class);
@@ -94,7 +96,7 @@
* @param commit SHA1 of commit.
* @return Links for patch sets.
*/
- public FluentIterable<WebLinkInfo> getPatchSetLinks(Project.NameKey project,
+ public List<WebLinkInfo> getPatchSetLinks(Project.NameKey project,
String commit) {
return filterLinks(
patchSetLinks,
@@ -108,7 +110,7 @@
* @param file File name.
* @return Links for files.
*/
- public FluentIterable<WebLinkInfo> getFileLinks(String project,
+ public List<WebLinkInfo> getFileLinks(String project,
String revision, String file) {
return filterLinks(
fileLinks,
@@ -122,7 +124,7 @@
* @param file File name.
* @return Links for file history
*/
- public FluentIterable<WebLinkInfoCommon> getFileHistoryLinks(
+ public List<WebLinkInfoCommon> getFileHistoryLinks(
String project, String revision, String file) {
return FluentIterable
.from(fileHistoryLinks)
@@ -140,7 +142,8 @@
commonInfo.target = info.target;
return commonInfo;
})
- .filter(INVALID_WEBLINK_COMMON);
+ .filter(INVALID_WEBLINK_COMMON)
+ .toList();
}
/**
@@ -155,7 +158,7 @@
* @param fileB File name of side B.
* @return Links for file diffs.
*/
- public FluentIterable<DiffWebLinkInfo> getDiffLinks(final String project, final int changeId,
+ public List<DiffWebLinkInfo> getDiffLinks(final String project, final int changeId,
final Integer patchSetIdA, final String revisionA, final String fileA,
final int patchSetIdB, final String revisionB, final String fileB) {
return FluentIterable
@@ -164,7 +167,8 @@
webLink.getDiffLink(project, changeId,
patchSetIdA, revisionA, fileA,
patchSetIdB, revisionB, fileB))
- .filter(INVALID_WEBLINK);
+ .filter(INVALID_WEBLINK)
+ .toList();
}
/**
@@ -172,7 +176,7 @@
* @param project Project name.
* @return Links for projects.
*/
- public FluentIterable<WebLinkInfo> getProjectLinks(final String project) {
+ public List<WebLinkInfo> getProjectLinks(final String project) {
return filterLinks(
projectLinks,
webLink -> webLink.getProjectWeblink(project));
@@ -184,17 +188,18 @@
* @param branch Branch name
* @return Links for branches.
*/
- public FluentIterable<WebLinkInfo> getBranchLinks(final String project, final String branch) {
+ public List<WebLinkInfo> getBranchLinks(final String project, final String branch) {
return filterLinks(
branchLinks,
webLink -> webLink.getBranchWebLink(project, branch));
}
- private <T extends WebLink> FluentIterable<WebLinkInfo> filterLinks(DynamicSet<T> links,
+ private <T extends WebLink> List<WebLinkInfo> filterLinks(DynamicSet<T> links,
Function<T, WebLinkInfo> transformer) {
return FluentIterable
.from(links)
.transform(transformer)
- .filter(INVALID_WEBLINK);
+ .filter(INVALID_WEBLINK)
+ .toList();
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java
index ad07e30..330ff7b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java
@@ -15,7 +15,6 @@
package com.google.gerrit.server.change;
import com.google.common.base.Strings;
-import com.google.common.collect.FluentIterable;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.common.DiffWebLinkInfo;
import com.google.gerrit.extensions.common.EditInfo;
@@ -490,7 +489,7 @@
FileInfo r = new FileInfo();
ChangeEdit edit = rsrc.getChangeEdit();
Change change = edit.getChange();
- FluentIterable<DiffWebLinkInfo> links =
+ List<DiffWebLinkInfo> links =
webLinks.getDiffLinks(change.getProject().get(),
change.getChangeId(),
edit.getBasePatchSet().getPatchSetId(),
@@ -499,7 +498,7 @@
0,
edit.getRefName(),
rsrc.getPath());
- r.webLinks = links.isEmpty() ? null : links.toList();
+ r.webLinks = links.isEmpty() ? null : links;
return r;
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
index a5d78af..80485f9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
@@ -1211,9 +1211,9 @@
info.message = commit.getFullMessage();
if (addLinks) {
- FluentIterable<WebLinkInfo> links =
+ List<WebLinkInfo> links =
webLinks.getPatchSetLinks(project, commit.name());
- info.webLinks = links.isEmpty() ? null : links.toList();
+ info.webLinks = links.isEmpty() ? null : links;
}
for (RevCommit parent : commit.getParents()) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
index 5cf5895..d7c60f0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
@@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkState;
import com.google.common.base.MoreObjects;
-import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -207,7 +206,7 @@
? resource.getRevision().getEdit().get().getRefName()
: resource.getRevision().getPatchSet().getRefName();
- FluentIterable<DiffWebLinkInfo> links =
+ List<DiffWebLinkInfo> links =
webLinks.getDiffLinks(state.getProject().getName(),
resource.getPatchKey().getParentKey().getParentKey().get(),
basePatchSet != null ? basePatchSet.getId().get() : null,
@@ -216,7 +215,7 @@
resource.getPatchKey().getParentKey().get(),
revB,
ps.getNewName());
- result.webLinks = links.isEmpty() ? null : links.toList();
+ result.webLinks = links.isEmpty() ? null : links;
if (!webLinksOnly) {
if (ps.isBinary()) {
@@ -281,9 +280,9 @@
private List<WebLinkInfo> getFileWebLinks(Project project, String rev,
String file) {
- FluentIterable<WebLinkInfo> links =
+ List<WebLinkInfo> links =
webLinks.getFileLinks(project.getName(), rev, file);
- return links.isEmpty() ? null : links.toList();
+ return links.isEmpty() ? null : links;
}
public GetDiff setBase(String base) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
index a50705d..2da0e01 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
@@ -15,7 +15,6 @@
package com.google.gerrit.server.project;
import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.FluentIterable;
import com.google.common.collect.Sets;
import com.google.gerrit.extensions.api.projects.BranchInfo;
import com.google.gerrit.extensions.common.ActionInfo;
@@ -191,10 +190,10 @@
}
info.actions.put(d.getId(), new ActionInfo(d));
}
- FluentIterable<WebLinkInfo> links =
+ List<WebLinkInfo> links =
webLinks.getBranchLinks(
refControl.getProjectControl().getProject().getName(), ref.getName());
- info.webLinks = links.isEmpty() ? null : links.toList();
+ info.webLinks = links.isEmpty() ? null : links;
return info;
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
index 1ea0c62..92189dd 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
@@ -17,7 +17,6 @@
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.base.Strings;
-import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.gerrit.common.data.GroupReference;
@@ -378,9 +377,9 @@
log.warn("Unexpected error reading " + projectName, err);
continue;
}
- FluentIterable<WebLinkInfo> links =
+ List<WebLinkInfo> links =
webLinks.getProjectLinks(projectName.get());
- info.webLinks = links.isEmpty() ? null : links.toList();
+ info.webLinks = links.isEmpty() ? null : links;
}
if (foundIndex++ < start) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java
index 5b1d521..767e36a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java
@@ -15,7 +15,6 @@
package com.google.gerrit.server.project;
import com.google.common.base.Strings;
-import com.google.common.collect.FluentIterable;
import com.google.gerrit.extensions.common.ProjectInfo;
import com.google.gerrit.extensions.common.WebLinkInfo;
import com.google.gerrit.extensions.restapi.Url;
@@ -25,6 +24,8 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import java.util.List;
+
@Singleton
public class ProjectJson {
@@ -50,9 +51,9 @@
info.description = Strings.emptyToNull(p.getDescription());
info.state = p.getState();
info.id = Url.encode(info.name);
- FluentIterable<WebLinkInfo> links =
+ List<WebLinkInfo> links =
webLinks.getProjectLinks(p.getName());
- info.webLinks = links.isEmpty() ? null : links.toList();
+ info.webLinks = links.isEmpty() ? null : links;
return info;
}
}
