opendev/gerrit
Code Issues Proposed changes

Use AllProjectsNameProvider instead of AllProjectsName

Browse Source 
Plugins have problem to use the classes that are using AllProjectsName
directly. Use AllProjectsNameProvider instead.

Change-Id: Idb9d9eb04ed6de1ae4209909f6d8aacd350ca51a
This commit is contained in:
David Ostrovsky
2014-06-27 19:32:56 +02:00
committed by David Ostrovsky
parent bfdcec0071
commit 5a6ab94a3d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java
View File

@@ -21,6 +21,7 @@ import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.inject.Inject;
import org.kohsuke.args4j.Option;
@@ -39,10 +40,11 @@ public class ListChildProjects implements RestReadView<ProjectResource> {
private final ProjectNode.Factory projectNodeFactory;
@Inject
ListChildProjects(ProjectCache projectCache, AllProjectsName allProjects,
ListChildProjects(ProjectCache projectCache,
AllProjectsNameProvider allProjectsNameProvider,
ProjectJson json, ProjectNode.Factory projectNodeFactory) {
this.projectCache = projectCache;
this.allProjects = allProjects;
this.allProjects = allProjectsNameProvider.get();
this.json = json;
this.projectNodeFactory = projectNodeFactory;
}

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

@@ -22,6 +22,7 @@ import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.WebLinks;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -33,8 +34,9 @@ public class ProjectJson {
private final Provider<WebLinks> webLinks;
@Inject
ProjectJson(AllProjectsName allProjects, Provider<WebLinks> webLinks) {
this.allProjects = allProjects;
ProjectJson(AllProjectsNameProvider allProjectsNameProvider,
Provider<WebLinks> webLinks) {
this.allProjects = allProjectsNameProvider.get();
this.webLinks = webLinks;
}