commit 2ae832e7ed3483902503295fb2c9a79dfa7f5aaa
author Shawn Pearce <sop@google.com> Thu Oct 16 22:35:41 2014 -0700
committer Shawn Pearce <sop@google.com> Thu Oct 16 22:35:41 2014 -0700
tree 19fa477972b507c3fa59103e24e56f8a396edc3a
parent 79b7aa185e8758cdfaab0aa9eb2677a08455a0ba

Avoid empty web_links element inside of RevisionInfo

Web UI always requests WEB_LINKS from /changes/{id}, but the common
case for a server is to have no special PatchSetWebLink.

Skip the "web_links = []" JSON code that appears in every revision on
the change by setting the list to null.

Skip pointless copying of the computed collection by changing the
return type from WebLinks to clearly be a List<WebLinkInfo>, like
RevisionInfo expects.  This allows direct assignment into the result.

Change-Id: I665e225b5abdd571a0adba8d2a1d318a1926801a

gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java

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 d2e3e49..318f847 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
@@ -24,6 +24,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Singleton
@@ -45,8 +46,8 @@
     this.branchLinks = branchLinks;
   }
 
-  public Iterable<WebLinkInfo> getPatchSetLinks(String project, String commit) {
-    List<WebLinkInfo> links = Lists.newArrayList();
+  public List<WebLinkInfo> getPatchSetLinks(String project, String commit) {
+    List<WebLinkInfo> links = new ArrayList<>(4);
     for (PatchSetWebLink webLink : patchSetLinks) {
       links.add(new WebLinkInfo(webLink.getLinkName(),
           webLink.getImageUrl(),

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

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