From 55709c6d76bc37a4a0c6b88bcb1becae76ee8f12 Mon Sep 17 00:00:00 2001 From: Jason Tsay Date: Tue, 26 Jul 2011 00:12:39 -0700 Subject: [PATCH] Refactor ChangeMessage to include PatchSet.Id 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 --- .../java/com/google/gerrit/reviewdb/ChangeMessage.java | 10 ++++++---- .../main/java/com/google/gerrit/server/ChangeUtil.java | 6 +++--- .../java/com/google/gerrit/server/git/MergeOp.java | 3 ++- .../com/google/gerrit/server/git/ReceiveCommits.java | 4 ++-- .../google/gerrit/server/patch/PublishComments.java | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeMessage.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeMessage.java index 549d1b374a..d8f1dd43ef 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeMessage.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeMessage.java @@ -77,15 +77,17 @@ public final class ChangeMessage { protected ChangeMessage() { } - public ChangeMessage(final ChangeMessage.Key k, final Account.Id a) { - this(k, a, new Timestamp(System.currentTimeMillis())); + public ChangeMessage(final ChangeMessage.Key k, final Account.Id a, + final PatchSet.Id psid) { + this(k, a, new Timestamp(System.currentTimeMillis()), psid); } public ChangeMessage(final ChangeMessage.Key k, final Account.Id a, - final Timestamp wo) { + final Timestamp wo, final PatchSet.Id psid) { key = k; author = a; writtenOn = wo; + patchset = psid; } public ChangeMessage.Key getKey() { @@ -123,4 +125,4 @@ public final class ChangeMessage { public void setPatchSetId(PatchSet.Id id) { patchset = id; } -} +} \ No newline at end of file diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java index 93665f44db..5a72ff6f66 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java @@ -226,7 +226,7 @@ public class ChangeUtil { final ChangeMessage cmsg = new ChangeMessage(new ChangeMessage.Key(changeId, ChangeUtil - .messageUUID(db)), user.getAccountId()); + .messageUUID(db)), user.getAccountId(), patchSetId); final StringBuilder msgBuf = new StringBuilder("Patch Set " + patchSetId.get() + ": Abandoned"); if (message != null && message.length() > 0) { @@ -337,7 +337,7 @@ public class ChangeUtil { final ChangeMessage cmsg = new ChangeMessage(new ChangeMessage.Key(changeId, - ChangeUtil.messageUUID(db)), user.getAccountId()); + ChangeUtil.messageUUID(db)), user.getAccountId(), patchSetId); final StringBuilder msgBuf = new StringBuilder("Patch Set " + patchSetId.get() + ": Reverted"); msgBuf.append("\n\n"); @@ -373,7 +373,7 @@ public class ChangeUtil { final ChangeMessage cmsg = new ChangeMessage(new ChangeMessage.Key(changeId, ChangeUtil - .messageUUID(db)), user.getAccountId()); + .messageUUID(db)), user.getAccountId(), patchSetId); final StringBuilder msgBuf = new StringBuilder("Patch Set " + patchSetId.get() + ": Restored"); if (message != null && message.length() > 0) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java index 96d1afcddd..32813069d9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java @@ -1261,7 +1261,8 @@ public class MergeOp { return null; } 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); return m; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index e1bedb3ac0..132303ead2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -1278,7 +1278,7 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook { msg = 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() + "."); db.changeMessages().insert(Collections.singleton(msg)); ChangeUtil.updateTrackingIds(db, change, trackingFooters, footerLines); @@ -1838,7 +1838,7 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook { msgBuf.append("."); final ChangeMessage msg = new ChangeMessage(new ChangeMessage.Key(change.getId(), ChangeUtil - .messageUUID(db)), currentUser.getAccountId()); + .messageUUID(db)), currentUser.getAccountId(), result.info.getKey()); msg.setMessage(msgBuf.toString()); db.changeMessages().insert(Collections.singleton(msg)); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PublishComments.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PublishComments.java index 4ab16189d7..be20b3d4aa 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PublishComments.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PublishComments.java @@ -265,7 +265,7 @@ public class PublishComments implements Callable { msgbuf.append(messageText != null ? messageText : ""); message = new ChangeMessage(new ChangeMessage.Key(change.getId(),// - ChangeUtil.messageUUID(db)), user.getAccountId()); + ChangeUtil.messageUUID(db)), user.getAccountId(), patchSetId); message.setMessage(msgbuf.toString()); db.changeMessages().insert(Collections.singleton(message)); }