opendev/gerrit
Code Issues Proposed changes

Refactor ChangeMessage to include PatchSet.Id

Browse Source 
Requires a PatchSet.Id to be included when instantiating ChangeMessage.
PatchSet.Id can be null if necessary, for instance in the
case of MergeOp messages.

Change-Id: I2d6d980d986f72a5aed2de6443632a47e6238215
This commit is contained in:
Jason Tsay
2011-07-26 00:12:39 -07:00
committed by Mohan Zhang
parent 6e9ad1edf0
commit 55709c6d76
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeMessage.java
View File

@@ -77,15 +77,17 @@ public final class ChangeMessage {
protected ChangeMessage() { protected ChangeMessage() {
} }
public ChangeMessage(final ChangeMessage.Key k, final Account.Id a) { public ChangeMessage(final ChangeMessage.Key k, final Account.Id a,
this(k, a, new Timestamp(System.currentTimeMillis())); final PatchSet.Id psid) {
this(k, a, new Timestamp(System.currentTimeMillis()), psid);
} }
public ChangeMessage(final ChangeMessage.Key k, final Account.Id a, public ChangeMessage(final ChangeMessage.Key k, final Account.Id a,
final Timestamp wo) { final Timestamp wo, final PatchSet.Id psid) {
key = k; key = k;
author = a; author = a;
writtenOn = wo; writtenOn = wo;
patchset = psid;
} }
public ChangeMessage.Key getKey() { public ChangeMessage.Key getKey() {
@@ -123,4 +125,4 @@ public final class ChangeMessage {
public void setPatchSetId(PatchSet.Id id) { public void setPatchSetId(PatchSet.Id id) {
patchset = id; patchset = id;
} }
} }

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

@@ -226,7 +226,7 @@ public class ChangeUtil {
final ChangeMessage cmsg = final ChangeMessage cmsg =
new ChangeMessage(new ChangeMessage.Key(changeId, ChangeUtil new ChangeMessage(new ChangeMessage.Key(changeId, ChangeUtil
.messageUUID(db)), user.getAccountId()); .messageUUID(db)), user.getAccountId(), patchSetId);
final StringBuilder msgBuf = final StringBuilder msgBuf =
new StringBuilder("Patch Set " + patchSetId.get() + ": Abandoned"); new StringBuilder("Patch Set " + patchSetId.get() + ": Abandoned");
if (message != null && message.length() > 0) { if (message != null && message.length() > 0) {
@@ -337,7 +337,7 @@ public class ChangeUtil {
final ChangeMessage cmsg = final ChangeMessage cmsg =
new ChangeMessage(new ChangeMessage.Key(changeId, new ChangeMessage(new ChangeMessage.Key(changeId,
ChangeUtil.messageUUID(db)), user.getAccountId()); ChangeUtil.messageUUID(db)), user.getAccountId(), patchSetId);
final StringBuilder msgBuf = final StringBuilder msgBuf =
new StringBuilder("Patch Set " + patchSetId.get() + ": Reverted"); new StringBuilder("Patch Set " + patchSetId.get() + ": Reverted");
msgBuf.append("\n\n"); msgBuf.append("\n\n");
@@ -373,7 +373,7 @@ public class ChangeUtil {
final ChangeMessage cmsg = final ChangeMessage cmsg =
new ChangeMessage(new ChangeMessage.Key(changeId, ChangeUtil new ChangeMessage(new ChangeMessage.Key(changeId, ChangeUtil
.messageUUID(db)), user.getAccountId()); .messageUUID(db)), user.getAccountId(), patchSetId);
final StringBuilder msgBuf = final StringBuilder msgBuf =
new StringBuilder("Patch Set " + patchSetId.get() + ": Restored"); new StringBuilder("Patch Set " + patchSetId.get() + ": Restored");
if (message != null && message.length() > 0) { if (message != null && message.length() > 0) {

3
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -1261,7 +1261,8 @@ public class MergeOp {
return null; return null;
} }
final ChangeMessage m = final ChangeMessage m =
new ChangeMessage(new ChangeMessage.Key(c.getId(), uuid), null); new ChangeMessage(new ChangeMessage.Key(c.getId(), uuid), null,
c.currentPatchSetId());
m.setMessage(body); m.setMessage(body);
return m; return m;
} }

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

@@ -1278,7 +1278,7 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook {
msg = msg =
new ChangeMessage(new ChangeMessage.Key(change.getId(), ChangeUtil new ChangeMessage(new ChangeMessage.Key(change.getId(), ChangeUtil
.messageUUID(db)), me, ps.getCreatedOn()); .messageUUID(db)), me, ps.getCreatedOn(), ps.getId());
msg.setMessage("Uploaded patch set " + ps.getPatchSetId() + "."); msg.setMessage("Uploaded patch set " + ps.getPatchSetId() + ".");
db.changeMessages().insert(Collections.singleton(msg)); db.changeMessages().insert(Collections.singleton(msg));
ChangeUtil.updateTrackingIds(db, change, trackingFooters, footerLines); ChangeUtil.updateTrackingIds(db, change, trackingFooters, footerLines);
@@ -1838,7 +1838,7 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook {
msgBuf.append("."); msgBuf.append(".");
final ChangeMessage msg = final ChangeMessage msg =
new ChangeMessage(new ChangeMessage.Key(change.getId(), ChangeUtil new ChangeMessage(new ChangeMessage.Key(change.getId(), ChangeUtil
.messageUUID(db)), currentUser.getAccountId()); .messageUUID(db)), currentUser.getAccountId(), result.info.getKey());
msg.setMessage(msgBuf.toString()); msg.setMessage(msgBuf.toString());
db.changeMessages().insert(Collections.singleton(msg)); db.changeMessages().insert(Collections.singleton(msg));

2
gerrit-server/src/main/java/com/google/gerrit/server/patch/PublishComments.java
View File

@@ -265,7 +265,7 @@ public class PublishComments implements Callable<VoidResult> {
msgbuf.append(messageText != null ? messageText : ""); msgbuf.append(messageText != null ? messageText : "");
message = new ChangeMessage(new ChangeMessage.Key(change.getId(),// message = new ChangeMessage(new ChangeMessage.Key(change.getId(),//
ChangeUtil.messageUUID(db)), user.getAccountId()); ChangeUtil.messageUUID(db)), user.getAccountId(), patchSetId);
message.setMessage(msgbuf.toString()); message.setMessage(msgbuf.toString());
db.changeMessages().insert(Collections.singleton(message)); db.changeMessages().insert(Collections.singleton(message));
} }