opendev/gerrit
Code Issues Proposed changes

Merge "Avoid empty web_links element inside of RevisionInfo"

Browse Source
This commit is contained in:
Edwin Kempin
2014-10-17 07:36:33 +00:00
committed by Gerrit Code Review
parent 27aab2a7ac 2ae832e7ed
commit ece11b780a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
View File

@@ -24,6 +24,7 @@ import com.google.gerrit.extensions.webui.ProjectWebLink;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Singleton @Singleton
@@ -45,8 +46,8 @@ public class WebLinks {
this.branchLinks = branchLinks; this.branchLinks = branchLinks;
} }
public Iterable<WebLinkInfo> getPatchSetLinks(String project, String commit) { public List<WebLinkInfo> getPatchSetLinks(String project, String commit) {
List<WebLinkInfo> links = Lists.newArrayList(); List<WebLinkInfo> links = new ArrayList<>(4);
for (PatchSetWebLink webLink : patchSetLinks) { for (PatchSetWebLink webLink : patchSetLinks) {
links.add(new WebLinkInfo(webLink.getLinkName(), links.add(new WebLinkInfo(webLink.getLinkName(),
webLink.getImageUrl(), webLink.getImageUrl(),

8
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
View File

@@ -843,11 +843,9 @@ public class ChangeJson {
} }
if (has(WEB_LINKS)) { if (has(WEB_LINKS)) {
out.webLinks = Lists.newArrayList(); List<WebLinkInfo> links =
for (WebLinkInfo link : webLinks.getPatchSetLinks( webLinks.getPatchSetLinks(project, in.getRevision().get());
project, in.getRevision().get())) { out.webLinks = !links.isEmpty() ? links : null;
out.webLinks.add(link);
}
} }
return out; return out;
} }