opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  GetAccess: Access MetaDataUpdate.Factory via Provider
  SetParent: Access MetaDataUpdate.Factory via Provider
  PutDescription: Access MetaDataUpdate.Factory via Provider

Change-Id: Iaadd15d416c2f30f43dac922fe14501b6412a826
This commit is contained in:
David Pursehouse
2019-11-01 17:51:35 +09:00
parent 9f0d895be4 1b8e602f6f
commit 831125f484
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/com/google/gerrit/server/restapi/project/GetAccess.java
View File

@@ -92,7 +92,7 @@ public class GetAccess implements RestReadView<ProjectResource> {
private final AllProjectsName allProjectsName;
private final ProjectJson projectJson;
private final ProjectCache projectCache;
private final MetaDataUpdate.Server metaDataUpdateFactory;
private final Provider<MetaDataUpdate.Server> metaDataUpdateFactory;
private final GroupBackend groupBackend;
private final WebLinks webLinks;
@@ -102,7 +102,7 @@ public class GetAccess implements RestReadView<ProjectResource> {
PermissionBackend permissionBackend,
AllProjectsName allProjectsName,
ProjectCache projectCache,
MetaDataUpdate.Server metaDataUpdateFactory,
Provider<MetaDataUpdate.Server> metaDataUpdateFactory,
ProjectJson projectJson,
GroupBackend groupBackend,
WebLinks webLinks) {
@@ -140,7 +140,7 @@ public class GetAccess implements RestReadView<ProjectResource> {
PermissionBackend.ForProject perm = permissionBackend.currentUser().project(projectName);
ProjectConfig config;
try (MetaDataUpdate md = metaDataUpdateFactory.create(projectName)) {
try (MetaDataUpdate md = metaDataUpdateFactory.get().create(projectName)) {
config = ProjectConfig.read(md);
info.configWebLinks = new ArrayList<>();

7
java/com/google/gerrit/server/restapi/project/PutDescription.java
View File

@@ -32,6 +32,7 @@ import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectConfig;
import com.google.gerrit.server.project.ProjectResource;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import org.eclipse.jgit.errors.ConfigInvalidException;
@@ -40,13 +41,13 @@ import org.eclipse.jgit.errors.RepositoryNotFoundException;
@Singleton
public class PutDescription implements RestModifyView<ProjectResource, DescriptionInput> {
private final ProjectCache cache;
private final MetaDataUpdate.Server updateFactory;
private final Provider<MetaDataUpdate.Server> updateFactory;
private final PermissionBackend permissionBackend;
@Inject
PutDescription(
ProjectCache cache,
MetaDataUpdate.Server updateFactory,
Provider<MetaDataUpdate.Server> updateFactory,
PermissionBackend permissionBackend) {
this.cache = cache;
this.updateFactory = updateFactory;
@@ -67,7 +68,7 @@ public class PutDescription implements RestModifyView<ProjectResource, Descripti
.project(resource.getNameKey())
.check(ProjectPermission.WRITE_CONFIG);
try (MetaDataUpdate md = updateFactory.create(resource.getNameKey())) {
try (MetaDataUpdate md = updateFactory.get().create(resource.getNameKey())) {
ProjectConfig config = ProjectConfig.read(md);
Project project = config.getProject();
project.setDescription(Strings.emptyToNull(input.description));

7
java/com/google/gerrit/server/restapi/project/SetParent.java
View File

@@ -47,6 +47,7 @@ import com.google.gerrit.server.project.ProjectConfig;
import com.google.gerrit.server.project.ProjectResource;
import com.google.gerrit.server.project.ProjectState;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import org.eclipse.jgit.errors.ConfigInvalidException;
@@ -58,7 +59,7 @@ public class SetParent
implements RestModifyView<ProjectResource, ParentInput>, GerritConfigListener {
private final ProjectCache cache;
private final PermissionBackend permissionBackend;
private final MetaDataUpdate.Server updateFactory;
private final Provider<MetaDataUpdate.Server> updateFactory;
private final AllProjectsName allProjects;
private final AllUsersName allUsers;
private volatile boolean allowProjectOwnersToChangeParent;
@@ -67,7 +68,7 @@ public class SetParent
SetParent(
ProjectCache cache,
PermissionBackend permissionBackend,
MetaDataUpdate.Server updateFactory,
Provider<MetaDataUpdate.Server> updateFactory,
AllProjectsName allProjects,
AllUsersName allUsers,
@GerritServerConfig Config config) {
@@ -96,7 +97,7 @@ public class SetParent
String parentName =
MoreObjects.firstNonNull(Strings.emptyToNull(input.parent), allProjects.get());
validateParentUpdate(rsrc.getProjectState().getNameKey(), user, parentName, checkIfAdmin);
try (MetaDataUpdate md = updateFactory.create(rsrc.getNameKey())) {
try (MetaDataUpdate md = updateFactory.get().create(rsrc.getNameKey())) {
ProjectConfig config = ProjectConfig.read(md);
Project project = config.getProject();
project.setParentName(parentName);