opendev/gerrit
Code Issues Proposed changes

Replace ProjectControl with ProjectState in Args4J stack

Browse Source 
This commit replaces ProjectControl with ProjectState in all classes
that depend on the Args4J argument 'PROJECT' and uses
Provider<CurrentUser> or CurrentUser where applicable.

This commit is a step towards using PermissionBackend instead of
ProjectControl.

Change-Id: If8ca1c8bac37caeff6d00abb1796570152858118
This commit is contained in:
Patrick Hiesel
2017-10-11 13:07:23 +02:00
parent 0ab394f209
commit 1e675c2b3a
24 changed files with 143 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetHeadCommand.java
View File

@@ -15,8 +15,8 @@
package com.google.gerrit.sshd.commands;
import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
import com.google.gerrit.server.project.ProjectControl;
import com.google.gerrit.server.project.ProjectResource;
import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.project.SetHead;
import com.google.gerrit.server.project.SetHead.Input;
import com.google.gerrit.sshd.CommandMetaData;
@@ -29,7 +29,7 @@ import org.kohsuke.args4j.Option;
public class SetHeadCommand extends SshCommand {
@Argument(index = 0, required = true, metaVar = "NAME", usage = "name of the project")
private ProjectControl project;
private ProjectState project;
@Option(name = "--new-head", required = true, metaVar = "REF", usage = "new HEAD reference")
private String newHead;
@@ -46,7 +46,7 @@ public class SetHeadCommand extends SshCommand {
Input input = new SetHead.Input();
input.ref = newHead;
try {
setHead.apply(new ProjectResource(project.getProjectState(), project.getUser()), input);
setHead.apply(new ProjectResource(project, user), input);
} catch (UnprocessableEntityException e) {
throw die(e);
}