opendev/gerrit
Code Issues Proposed changes

Move creation of Change instance into ChangeInserter

Browse Source 
Every caller of ChangeInserter had to do the creation of the Change
instance on its own. By letting ChangeInserter create the Change
instance we can remove some duplicate code. This way it is also
guranteed that the Change instance is consistent with the other input
parameters of ChangeInserter. When the Change instance was passed in
we had to check this explicitly.

Change-Id: Ie5a115988f967ae41cc0b57343ebe3fe78386a3d
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-01-15 11:48:10 -08:00
parent 6808f277cb
commit 4d1f3c3da9
9 changed files with 288 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
View File

@@ -203,12 +203,12 @@ public class ChangeUtil {
throws NoSuchChangeException, OrmException,
MissingObjectException, IncorrectObjectTypeException, IOException,
RestApiException, UpdateException {
Change.Id changeId = patchSetId.getParentKey();
Change.Id changeIdToRevert = patchSetId.getParentKey();
PatchSet patch = db.get().patchSets().get(patchSetId);
if (patch == null) {
throw new NoSuchChangeException(changeId);
throw new NoSuchChangeException(changeIdToRevert);
}
Change changeToRevert = db.get().changes().get(changeId);
Change changeToRevert = db.get().changes().get(changeIdToRevert);
Project.NameKey project = ctl.getChange().getProject();
try (Repository git = gitManager.openRepository(project);
@@ -246,22 +246,17 @@ public class ChangeUtil {
RevCommit revertCommit;
ChangeInserter ins;
Change.Id changeId = new Change.Id(seq.nextChangeId());
try (ObjectInserter oi = git.newObjectInserter()) {
ObjectId id = oi.insert(revertCommitBuilder);
oi.flush();
revertCommit = revWalk.parseCommit(id);
RefControl refControl = ctl.getRefControl();
Change change = new Change(
new Change.Key("I" + computedChangeId.name()),
new Change.Id(seq.nextChangeId()),
user.get().getAccountId(),
changeToRevert.getDest(),
TimeUtil.nowTs());
change.setTopic(changeToRevert.getTopic());
ins = changeInserterFactory.create(
refControl, change, revertCommit)
.setValidatePolicy(CommitValidators.Policy.GERRIT);
refControl, changeId, revertCommit)
.setValidatePolicy(CommitValidators.Policy.GERRIT)
.setTopic(changeToRevert.getTopic());
ChangeMessage changeMessage = new ChangeMessage(
new ChangeMessage.Key(
@@ -271,7 +266,7 @@ public class ChangeUtil {
msgBuf.append("Patch Set ").append(patchSetId.get()).append(": Reverted");
msgBuf.append("\n\n");
msgBuf.append("This patchset was reverted in change: ")
.append(change.getKey().get());
.append("I").append(computedChangeId.name());
changeMessage.setMessage(msgBuf.toString());
ChangeUpdate update = changeUpdateFactory.create(ctl, TimeUtil.nowTs());
changeMessagesUtil.addChangeMessage(db.get(), update, changeMessage);
@@ -279,27 +274,26 @@ public class ChangeUtil {
ins.setMessage("Uploaded patch set 1.");
try (BatchUpdate bu = updateFactory.create(
db.get(), change.getProject(), refControl.getUser(),
change.getCreatedOn())) {
db.get(), project, refControl.getUser(),
TimeUtil.nowTs())) {
bu.setRepository(git, revWalk, oi);
bu.insertChange(ins);
bu.execute();
}
}
Change.Id id = ins.getChange().getId();
try {
RevertedSender cm = revertedSenderFactory.create(id);
RevertedSender cm = revertedSenderFactory.create(changeId);
cm.setFrom(user.get().getAccountId());
cm.setChangeMessage(ins.getChangeMessage());
cm.send();
} catch (Exception err) {
log.error("Cannot send email for revert change " + id, err);
log.error("Cannot send email for revert change " + changeId, err);
}
return id;
return changeId;
} catch (RepositoryNotFoundException e) {
throw new NoSuchChangeException(changeId, e);
throw new NoSuchChangeException(changeIdToRevert, e);
}
}