opendev/gerrit
Code Issues Proposed changes

Merge "Inject AllProjectsName directly instead of through AllProjectsNameProvider"

Browse Source
This commit is contained in:
Edwin Kempin
2016-02-22 12:39:38 +00:00
committed by Gerrit Code Review
parent 9785d74164 91ef0badae
commit beb083106c
9 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsNameProvider.java
View File

@@ -16,9 +16,11 @@ package com.google.gerrit.server.config;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import org.eclipse.jgit.lib.Config;
@Singleton
public class AllProjectsNameProvider implements Provider<AllProjectsName> {
public static final String DEFAULT = "All-Projects";

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

@@ -25,7 +25,7 @@ import com.google.gerrit.extensions.registration.DynamicMap.Entry;
import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.extensions.webui.UiAction;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.gerrit.server.config.ProjectConfigEntry;
@@ -61,7 +61,7 @@ public class ConfigInfo {
TransferConfig config,
DynamicMap<ProjectConfigEntry> pluginConfigEntries,
PluginConfigFactory cfgFactory,
AllProjectsNameProvider allProjects,
AllProjectsName allProjects,
DynamicMap<RestView<ProjectResource>> views) {
ProjectState projectState = control.getProjectState();
Project p = control.getProject();
@@ -151,7 +151,7 @@ public class ConfigInfo {
private Map<String, Map<String, ConfigParameterInfo>> getPluginConfig(
ProjectState project, DynamicMap<ProjectConfigEntry> pluginConfigEntries,
PluginConfigFactory cfgFactory, AllProjectsNameProvider allProjects) {
PluginConfigFactory cfgFactory, AllProjectsName allProjects) {
TreeMap<String, Map<String, ConfigParameterInfo>> pluginConfig = new TreeMap<>();
for (Entry<ProjectConfigEntry> e : pluginConfigEntries) {
ProjectConfigEntry configEntry = e.getProvider().get();

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

@@ -18,7 +18,7 @@ import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.server.EnableSignedPush;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.gerrit.server.config.ProjectConfigEntry;
import com.google.gerrit.server.git.TransferConfig;
@@ -31,7 +31,7 @@ public class GetConfig implements RestReadView<ProjectResource> {
private final TransferConfig config;
private final DynamicMap<ProjectConfigEntry> pluginConfigEntries;
private final PluginConfigFactory cfgFactory;
private final AllProjectsNameProvider allProjects;
private final AllProjectsName allProjects;
private final DynamicMap<RestView<ProjectResource>> views;
@Inject
@@ -39,7 +39,7 @@ public class GetConfig implements RestReadView<ProjectResource> {
TransferConfig config,
DynamicMap<ProjectConfigEntry> pluginConfigEntries,
PluginConfigFactory cfgFactory,
AllProjectsNameProvider allProjects,
AllProjectsName allProjects,
DynamicMap<RestView<ProjectResource>> views) {
this.serverEnableSignedPush = serverEnableSignedPush;
this.config = config;

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

@@ -21,7 +21,6 @@ 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;
@@ -42,10 +41,10 @@ public class ListChildProjects implements RestReadView<ProjectResource> {
@Inject
ListChildProjects(ProjectCache projectCache,
AllProjectsNameProvider allProjectsNameProvider,
AllProjectsName allProjectsName,
ProjectJson json, ProjectNode.Factory projectNodeFactory) {
this.projectCache = projectCache;
this.allProjects = allProjectsNameProvider.get();
this.allProjects = allProjectsName;
this.json = json;
this.projectNodeFactory = projectNodeFactory;
}

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

@@ -22,7 +22,6 @@ 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.Singleton;
@@ -33,9 +32,9 @@ public class ProjectJson {
private final WebLinks webLinks;
@Inject
ProjectJson(AllProjectsNameProvider allProjectsNameProvider,
ProjectJson(AllProjectsName allProjectsName,
WebLinks webLinks) {
this.allProjects = allProjectsNameProvider.get();
this.allProjects = allProjectsName;
this.webLinks = webLinks;
}

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

@@ -32,7 +32,7 @@ import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.EnableSignedPush;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.gerrit.server.config.ProjectConfigEntry;
@@ -86,7 +86,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
private final TransferConfig config;
private final DynamicMap<ProjectConfigEntry> pluginConfigEntries;
private final PluginConfigFactory cfgFactory;
private final AllProjectsNameProvider allProjects;
private final AllProjectsName allProjects;
private final DynamicMap<RestView<ProjectResource>> views;
private final Provider<CurrentUser> user;
private final ChangeHooks hooks;
@@ -101,7 +101,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
TransferConfig config,
DynamicMap<ProjectConfigEntry> pluginConfigEntries,
PluginConfigFactory cfgFactory,
AllProjectsNameProvider allProjects,
AllProjectsName allProjects,
DynamicMap<RestView<ProjectResource>> views,
ChangeHooks hooks,
GitReferenceUpdated gitRefUpdated,