opendev/gerrit
Code Issues Proposed changes

Refactor DeleteDraft into gerrit-server

Browse Source 
This change moves logic that was duplicated over the ssh command and the
rpc handler into a DeleteDraft class in gerrit-server.

Change-Id: I308f5371697776cd210199910fc787fc1220fbf1
This commit is contained in:
Conley Owens
2012-01-24 10:59:10 -08:00
committed by Edwin Kempin
parent b917a2ac5a
commit 852e88bc9b
6 changed files with 161 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
View File

@@ -24,17 +24,13 @@ import com.google.gerrit.reviewdb.PatchSet;
import com.google.gerrit.reviewdb.PatchSetApproval;
import com.google.gerrit.reviewdb.RevId;
import com.google.gerrit.reviewdb.ReviewDb;
import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.changedetail.AbandonChange;
import com.google.gerrit.server.changedetail.DeleteDraftPatchSet;
import com.google.gerrit.server.changedetail.PublishDraft;
import com.google.gerrit.server.changedetail.RestoreChange;
import com.google.gerrit.server.changedetail.Submit;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.ReplicationQueue;
import com.google.gerrit.server.mail.EmailException;
import com.google.gerrit.server.patch.PatchSetInfoFactory;
import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException;
import com.google.gerrit.server.patch.PublishComments;
import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.InvalidChangeOperationException;
@@ -123,6 +119,9 @@ public class ReviewCommand extends BaseCommand {
@Inject
private ChangeControl.Factory changeControlFactory;
@Inject
private DeleteDraftPatchSet.Factory deleteDraftPatchSetFactory;
@Inject
private AbandonChange.Factory abandonChangeFactory;
@@ -138,18 +137,9 @@ public class ReviewCommand extends BaseCommand {
@Inject
private RestoreChange.Factory restoreChangeFactory;
@Inject
private GitRepositoryManager gitManager;
@Inject
private ReplicationQueue replication;
@Inject
private Submit.Factory submitFactory;
@Inject
private PatchSetInfoFactory patchSetInfoFactory;
private List<ApproveOption> optionList;
@Override
@@ -233,16 +223,16 @@ public class ReviewCommand extends BaseCommand {
publishCommentsFactory.create(patchSetId, changeComment, aps, forceMessage).call();
if (abandonChange) {
ReviewResult result = abandonChangeFactory.create(
final ReviewResult result = abandonChangeFactory.create(
patchSetId, changeComment).call();
handleReviewResultErrors(result);
} else if (restoreChange) {
ReviewResult result = restoreChangeFactory.create(
final ReviewResult result = restoreChangeFactory.create(
patchSetId, changeComment).call();
handleReviewResultErrors(result);
}
if (submitChange) {
ReviewResult result = submitFactory.create(patchSetId).call();
final ReviewResult result = submitFactory.create(patchSetId).call();
handleReviewResultErrors(result);
}
} catch (InvalidChangeOperationException e) {
@@ -252,20 +242,12 @@ public class ReviewCommand extends BaseCommand {
}
if (publishPatchSet) {
ReviewResult result = publishDraftFactory.create(patchSetId).call();
final ReviewResult result = publishDraftFactory.create(patchSetId).call();
handleReviewResultErrors(result);
} else if (deleteDraftPatchSet) {
if (changeControl.canDelete(db)) {
try {
ChangeUtil.deleteDraftPatchSet(patchSetId, gitManager, replication, patchSetInfoFactory, db);
} catch (PatchSetInfoNotAvailableException e) {
throw error("Error retrieving draft patchset: " + patchSetId);
} catch (IOException e) {
throw error("Error deleting draft patchset: " + patchSetId);
}
} else {
throw error("Not permitted to delete draft patchset");
}
final ReviewResult result =
deleteDraftPatchSetFactory.create(patchSetId).call();
handleReviewResultErrors(result);
}
}
@@ -291,12 +273,18 @@ public class ReviewCommand extends BaseCommand {
case PUBLISH_NOT_PERMITTED:
errMsg += "not permitted to publish change";
break;
case DELETE_NOT_PERMITTED:
errMsg += "not permitted to delete change/patch set";
break;
case RULE_ERROR:
errMsg += "rule error";
break;
case NOT_A_DRAFT:
errMsg += "change is not a draft";
break;
case GIT_ERROR:
errMsg += "error writing change to git repository";
break;
default:
errMsg += "failure in review";
}