opendev/gerrit
Code Issues Proposed changes

WebLinks: Use WebLinkInfo directly

Browse Source 
Intermediate class WebLinks.Link is used in REST web links related
endpoints. This is unnecessary complication. Use WebLinkInfo class
directly.

Change-Id: I279f65bb8a2b9442f3035ad3e8a02fe34761b54f
This commit is contained in:
David Ostrovsky
2014-07-17 00:30:08 +02:00
parent f28493ab31
commit d898f12a9b
4 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@
package com.google.gerrit.server; package com.google.gerrit.server;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.gerrit.extensions.common.WebLinkInfo;
import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.webui.PatchSetWebLink; import com.google.gerrit.extensions.webui.PatchSetWebLink;
import com.google.gerrit.extensions.webui.ProjectWebLink; import com.google.gerrit.extensions.webui.ProjectWebLink;
@@ -32,31 +33,21 @@ public class WebLinks {
this.projectLinks = projectLinks; this.projectLinks = projectLinks;
} }
public Iterable<Link> getPatchSetLinks(String project, String commit) { public Iterable<WebLinkInfo> getPatchSetLinks(String project, String commit) {
List<Link> links = Lists.newArrayList(); List<WebLinkInfo> links = Lists.newArrayList();
for (PatchSetWebLink webLink : patchSetLinks) { for (PatchSetWebLink webLink : patchSetLinks) {
links.add(new Link(webLink.getLinkName(), links.add(new WebLinkInfo(webLink.getLinkName(),
webLink.getPatchSetUrl(project, commit))); webLink.getPatchSetUrl(project, commit)));
} }
return links; return links;
} }
public Iterable<Link> getProjectLinks(String project) { public Iterable<WebLinkInfo> getProjectLinks(String project) {
List<Link> links = Lists.newArrayList(); List<WebLinkInfo> links = Lists.newArrayList();
for (ProjectWebLink webLink : projectLinks) { for (ProjectWebLink webLink : projectLinks) {
links.add(new Link(webLink.getLinkName(), links.add(new WebLinkInfo(webLink.getLinkName(),
webLink.getProjectUrl(project))); webLink.getProjectUrl(project)));
} }
return links; return links;
} }
public class Link {
public String name;
public String url;
public Link(String name, String url) {
this.name = name;
this.url = url;
}
}
} }

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

@@ -830,9 +830,9 @@ public class ChangeJson {
if (has(WEB_LINKS)) { if (has(WEB_LINKS)) {
out.webLinks = Lists.newArrayList(); out.webLinks = Lists.newArrayList();
for (WebLinks.Link link : webLinks.get().getPatchSetLinks( for (WebLinkInfo link : webLinks.get().getPatchSetLinks(
project, in.getRevision().get())) { project, in.getRevision().get())) {
out.webLinks.add(new WebLinkInfo(link.name, link.url)); out.webLinks.add(link);
} }
} }
return out; return out;

4
gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
View File

@@ -386,9 +386,9 @@ public class ListProjects implements RestReadView<TopLevelResource> {
} }
info.webLinks = Lists.newArrayList(); info.webLinks = Lists.newArrayList();
for (WebLinks.Link link : webLinks.get().getProjectLinks(projectName.get())) { for (WebLinkInfo link : webLinks.get().getProjectLinks(projectName.get())) {
if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) { if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) {
info.webLinks.add(new WebLinkInfo(link.name, link.url)); info.webLinks.add(link);
} }
} }
} }

4
gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java
View File

@@ -54,9 +54,9 @@ public class ProjectJson {
info.id = Url.encode(info.name); info.id = Url.encode(info.name);
info.webLinks = Lists.newArrayList(); info.webLinks = Lists.newArrayList();
for (WebLinks.Link link : webLinks.get().getProjectLinks(p.getName())) { for (WebLinkInfo link : webLinks.get().getProjectLinks(p.getName())) {
if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) { if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) {
info.webLinks.add(new WebLinkInfo(link.name, link.url)); info.webLinks.add(link);
} }
} }