opendev/gerrit
Code Issues Proposed changes

Removing redundant class WeblinksProvider

Browse Source 
Change-Id: I06f2117ad16718a7329dd589ca9d95235783363c
This commit is contained in:
Sven Selberg
2014-10-01 12:49:36 +02:00
parent bde6f0933f
commit 6914a8327c
8 changed files with 19 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
View File

@@ -29,7 +29,6 @@ import com.google.gerrit.server.WebLinks;
import com.google.gerrit.server.extensions.webui.UiActions;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import com.google.inject.util.Providers;
@@ -51,12 +50,12 @@ import java.util.TreeMap;
public class ListBranches implements RestReadView<ProjectResource> {
private final GitRepositoryManager repoManager;
private final DynamicMap<RestView<BranchResource>> branchViews;
private final Provider<WebLinks> webLinks;
private final WebLinks webLinks;
@Inject
public ListBranches(GitRepositoryManager repoManager,
DynamicMap<RestView<BranchResource>> branchViews,
Provider<WebLinks> webLinks) {
WebLinks webLinks) {
this.repoManager = repoManager;
this.branchViews = branchViews;
this.webLinks = webLinks;
@@ -169,7 +168,7 @@ public class ListBranches implements RestReadView<ProjectResource> {
info.actions.put(d.getId(), new ActionInfo(d));
}
info.webLinks = Lists.newArrayList();
for (WebLinkInfo link : webLinks.get().getBranchLinks(
for (WebLinkInfo link : webLinks.getBranchLinks(
refControl.getProjectControl().getProject().getName(), ref.getName())) {
if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) {
info.webLinks.add(link);