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

4
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectAccess.java
View File

@@ -23,7 +23,7 @@ import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupBackend;
import com.google.gerrit.server.config.AllProjectsNameProvider; import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.git.ProjectConfig;
@@ -62,7 +62,7 @@ class ChangeProjectAccess extends ProjectAccessHandler<ProjectAccess> {
ProjectControl.Factory projectControlFactory, ProjectControl.Factory projectControlFactory,
ProjectCache projectCache, GroupBackend groupBackend, ProjectCache projectCache, GroupBackend groupBackend,
MetaDataUpdate.User metaDataUpdateFactory, MetaDataUpdate.User metaDataUpdateFactory,
AllProjectsNameProvider allProjects, AllProjectsName allProjects,
Provider<SetParent> setParent, Provider<SetParent> setParent,
ChangeHooks hooks, ChangeHooks hooks,
GitReferenceUpdated gitRefUpdated, GitReferenceUpdated gitRefUpdated,

12
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessHandler.java
View File

@@ -32,7 +32,7 @@ import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupBackend;
import com.google.gerrit.server.account.GroupBackends; import com.google.gerrit.server.account.GroupBackends;
import com.google.gerrit.server.config.AllProjectsNameProvider; import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.NoSuchProjectException;
@@ -56,7 +56,7 @@ public abstract class ProjectAccessHandler<T> extends Handler<T> {
private final ProjectControl.Factory projectControlFactory; private final ProjectControl.Factory projectControlFactory;
protected final GroupBackend groupBackend; protected final GroupBackend groupBackend;
private final MetaDataUpdate.User metaDataUpdateFactory; private final MetaDataUpdate.User metaDataUpdateFactory;
private final AllProjectsNameProvider allProjects; private final AllProjectsName allProjects;
private final Provider<SetParent> setParent; private final Provider<SetParent> setParent;
protected final Project.NameKey projectName; protected final Project.NameKey projectName;
@@ -68,7 +68,7 @@ public abstract class ProjectAccessHandler<T> extends Handler<T> {
protected ProjectAccessHandler(ProjectControl.Factory projectControlFactory, protected ProjectAccessHandler(ProjectControl.Factory projectControlFactory,
GroupBackend groupBackend, MetaDataUpdate.User metaDataUpdateFactory, GroupBackend groupBackend, MetaDataUpdate.User metaDataUpdateFactory,
AllProjectsNameProvider allProjects, Provider<SetParent> setParent, AllProjectsName allProjects, Provider<SetParent> setParent,
Project.NameKey projectName, ObjectId base, Project.NameKey projectName, ObjectId base,
List<AccessSection> sectionList, Project.NameKey parentProjectName, List<AccessSection> sectionList, Project.NameKey parentProjectName,
String message, boolean checkIfOwner) { String message, boolean checkIfOwner) {
@@ -129,12 +129,12 @@ public abstract class ProjectAccessHandler<T> extends Handler<T> {
} }
boolean parentProjectUpdate = false; boolean parentProjectUpdate = false;
if (!config.getProject().getNameKey().equals(allProjects.get()) && if (!config.getProject().getNameKey().equals(allProjects) &&
!config.getProject().getParent(allProjects.get()).equals(parentProjectName)) { !config.getProject().getParent(allProjects).equals(parentProjectName)) {
parentProjectUpdate = true; parentProjectUpdate = true;
try { try {
setParent.get().validateParentUpdate(projectControl, setParent.get().validateParentUpdate(projectControl,
MoreObjects.firstNonNull(parentProjectName, allProjects.get()).get(), MoreObjects.firstNonNull(parentProjectName, allProjects).get(),
checkIfOwner); checkIfOwner);
} catch (AuthException e) { } catch (AuthException e) {
throw new UpdateParentFailedException( throw new UpdateParentFailedException(

4
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java
View File

@@ -34,7 +34,7 @@ import com.google.gerrit.server.change.ChangeInserter;
import com.google.gerrit.server.change.ChangeResource; import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.change.ChangesCollection; import com.google.gerrit.server.change.ChangesCollection;
import com.google.gerrit.server.change.PostReviewers; import com.google.gerrit.server.change.PostReviewers;
import com.google.gerrit.server.config.AllProjectsNameProvider; import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.git.BatchUpdate; import com.google.gerrit.server.git.BatchUpdate;
import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.git.ProjectConfig;
@@ -81,7 +81,7 @@ public class ReviewProjectAccess extends ProjectAccessHandler<Change.Id> {
MetaDataUpdate.User metaDataUpdateFactory, ReviewDb db, MetaDataUpdate.User metaDataUpdateFactory, ReviewDb db,
Provider<PostReviewers> reviewersProvider, Provider<PostReviewers> reviewersProvider,
ProjectCache projectCache, ProjectCache projectCache,
AllProjectsNameProvider allProjects, AllProjectsName allProjects,
ChangesCollection changes, ChangesCollection changes,
ChangeInserter.Factory changeInserterFactory, ChangeInserter.Factory changeInserterFactory,
BatchUpdate.Factory updateFactory, BatchUpdate.Factory updateFactory,

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.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.Singleton;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
@Singleton
public class AllProjectsNameProvider implements Provider<AllProjectsName> { public class AllProjectsNameProvider implements Provider<AllProjectsName> {
public static final String DEFAULT = "All-Projects"; 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.restapi.RestView;
import com.google.gerrit.extensions.webui.UiAction; import com.google.gerrit.extensions.webui.UiAction;
import com.google.gerrit.reviewdb.client.Project; 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.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory; import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.gerrit.server.config.ProjectConfigEntry; import com.google.gerrit.server.config.ProjectConfigEntry;
@@ -61,7 +61,7 @@ public class ConfigInfo {
TransferConfig config, TransferConfig config,
DynamicMap<ProjectConfigEntry> pluginConfigEntries, DynamicMap<ProjectConfigEntry> pluginConfigEntries,
PluginConfigFactory cfgFactory, PluginConfigFactory cfgFactory,
AllProjectsNameProvider allProjects, AllProjectsName allProjects,
DynamicMap<RestView<ProjectResource>> views) { DynamicMap<RestView<ProjectResource>> views) {
ProjectState projectState = control.getProjectState(); ProjectState projectState = control.getProjectState();
Project p = control.getProject(); Project p = control.getProject();
@@ -151,7 +151,7 @@ public class ConfigInfo {
private Map<String, Map<String, ConfigParameterInfo>> getPluginConfig( private Map<String, Map<String, ConfigParameterInfo>> getPluginConfig(
ProjectState project, DynamicMap<ProjectConfigEntry> pluginConfigEntries, ProjectState project, DynamicMap<ProjectConfigEntry> pluginConfigEntries,
PluginConfigFactory cfgFactory, AllProjectsNameProvider allProjects) { PluginConfigFactory cfgFactory, AllProjectsName allProjects) {
TreeMap<String, Map<String, ConfigParameterInfo>> pluginConfig = new TreeMap<>(); TreeMap<String, Map<String, ConfigParameterInfo>> pluginConfig = new TreeMap<>();
for (Entry<ProjectConfigEntry> e : pluginConfigEntries) { for (Entry<ProjectConfigEntry> e : pluginConfigEntries) {
ProjectConfigEntry configEntry = e.getProvider().get(); 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.RestReadView;
import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.server.EnableSignedPush; 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.PluginConfigFactory;
import com.google.gerrit.server.config.ProjectConfigEntry; import com.google.gerrit.server.config.ProjectConfigEntry;
import com.google.gerrit.server.git.TransferConfig; import com.google.gerrit.server.git.TransferConfig;
@@ -31,7 +31,7 @@ public class GetConfig implements RestReadView<ProjectResource> {
private final TransferConfig config; private final TransferConfig config;
private final DynamicMap<ProjectConfigEntry> pluginConfigEntries; private final DynamicMap<ProjectConfigEntry> pluginConfigEntries;
private final PluginConfigFactory cfgFactory; private final PluginConfigFactory cfgFactory;
private final AllProjectsNameProvider allProjects; private final AllProjectsName allProjects;
private final DynamicMap<RestView<ProjectResource>> views; private final DynamicMap<RestView<ProjectResource>> views;
@Inject @Inject
@@ -39,7 +39,7 @@ public class GetConfig implements RestReadView<ProjectResource> {
TransferConfig config, TransferConfig config,
DynamicMap<ProjectConfigEntry> pluginConfigEntries, DynamicMap<ProjectConfigEntry> pluginConfigEntries,
PluginConfigFactory cfgFactory, PluginConfigFactory cfgFactory,
AllProjectsNameProvider allProjects, AllProjectsName allProjects,
DynamicMap<RestView<ProjectResource>> views) { DynamicMap<RestView<ProjectResource>> views) {
this.serverEnableSignedPush = serverEnableSignedPush; this.serverEnableSignedPush = serverEnableSignedPush;
this.config = config; 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.reviewdb.client.Project;
import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.inject.Inject; import com.google.inject.Inject;
import org.kohsuke.args4j.Option; import org.kohsuke.args4j.Option;
@@ -42,10 +41,10 @@ public class ListChildProjects implements RestReadView<ProjectResource> {
@Inject @Inject
ListChildProjects(ProjectCache projectCache, ListChildProjects(ProjectCache projectCache,
AllProjectsNameProvider allProjectsNameProvider, AllProjectsName allProjectsName,
ProjectJson json, ProjectNode.Factory projectNodeFactory) { ProjectJson json, ProjectNode.Factory projectNodeFactory) {
this.projectCache = projectCache; this.projectCache = projectCache;
this.allProjects = allProjectsNameProvider.get(); this.allProjects = allProjectsName;
this.json = json; this.json = json;
this.projectNodeFactory = projectNodeFactory; 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.reviewdb.client.Project;
import com.google.gerrit.server.WebLinks; import com.google.gerrit.server.WebLinks;
import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
@@ -33,9 +32,9 @@ public class ProjectJson {
private final WebLinks webLinks; private final WebLinks webLinks;
@Inject @Inject
ProjectJson(AllProjectsNameProvider allProjectsNameProvider, ProjectJson(AllProjectsName allProjectsName,
WebLinks webLinks) { WebLinks webLinks) {
this.allProjects = allProjectsNameProvider.get(); this.allProjects = allProjectsName;
this.webLinks = webLinks; 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.reviewdb.client.RefNames;
import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.EnableSignedPush; 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.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory; import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.gerrit.server.config.ProjectConfigEntry; import com.google.gerrit.server.config.ProjectConfigEntry;
@@ -86,7 +86,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
private final TransferConfig config; private final TransferConfig config;
private final DynamicMap<ProjectConfigEntry> pluginConfigEntries; private final DynamicMap<ProjectConfigEntry> pluginConfigEntries;
private final PluginConfigFactory cfgFactory; private final PluginConfigFactory cfgFactory;
private final AllProjectsNameProvider allProjects; private final AllProjectsName allProjects;
private final DynamicMap<RestView<ProjectResource>> views; private final DynamicMap<RestView<ProjectResource>> views;
private final Provider<CurrentUser> user; private final Provider<CurrentUser> user;
private final ChangeHooks hooks; private final ChangeHooks hooks;
@@ -101,7 +101,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
TransferConfig config, TransferConfig config,
DynamicMap<ProjectConfigEntry> pluginConfigEntries, DynamicMap<ProjectConfigEntry> pluginConfigEntries,
PluginConfigFactory cfgFactory, PluginConfigFactory cfgFactory,
AllProjectsNameProvider allProjects, AllProjectsName allProjects,
DynamicMap<RestView<ProjectResource>> views, DynamicMap<RestView<ProjectResource>> views,
ChangeHooks hooks, ChangeHooks hooks,
GitReferenceUpdated gitRefUpdated, GitReferenceUpdated gitRefUpdated,