opendev/gerrit
Code Issues Proposed changes

Merge "Move #isProjectStatePermitting{Read,Write} into ProjectState"

Browse Source
This commit is contained in:
David Pursehouse
2017-08-25 07:40:31 +00:00
committed by Gerrit Code Review
parent 7c754c1975 bc180879bb
commit b4b508e362
4 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
View File

@@ -1453,9 +1453,8 @@ class ReceiveCommits {
magicBranch.dest = new Branch.NameKey(project.getNameKey(), ref);
magicBranch.ctl = projectControl.controlForRef(ref);
magicBranch.perm = permissions.ref(ref);
if (projectControl.getProject().getState()
!= com.google.gerrit.extensions.client.ProjectState.ACTIVE) {
reject(cmd, "project is read only");
if (!projectControl.getProject().getState().permitsWrite()) {
reject(cmd, "project state does not permit write");
return;
}

4
gerrit-server/src/main/java/com/google/gerrit/server/project/CreateRefControl.java
View File

@@ -67,9 +67,7 @@ public class CreateRefControl {
if (ps == null) {
throw new NoSuchProjectException(branch.getParentKey());
}
if (!ps.getProject()
.getState()
.equals(com.google.gerrit.extensions.client.ProjectState.ACTIVE)) {
if (!ps.getProject().getState().permitsWrite()) {
return "project state does not permit write";
}

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

@@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkArgument;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.common.data.PermissionRange;
import com.google.gerrit.common.data.PermissionRule;
import com.google.gerrit.extensions.client.ProjectState;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
@@ -197,12 +196,11 @@ public class RefControl {
}
private boolean isProjectStatePermittingWrite() {
return getProjectControl().getProject().getState().equals(ProjectState.ACTIVE);
return getProjectControl().getProject().getState().permitsWrite();
}
private boolean isProjectStatePermittingRead() {
return getProjectControl().getProject().getState().equals(ProjectState.READ_ONLY)
|| isProjectStatePermittingWrite();
return getProjectControl().getProject().getState().permitsRead();
}
private boolean canPushWithForce() {