diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeAbandonedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeAbandonedEvent.java index b0eb9c6b4f..33cf241208 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeAbandonedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeAbandonedEvent.java @@ -14,14 +14,38 @@ package com.google.gerrit.server.events; +import static org.eclipse.jgit.lib.Constants.R_HEADS; + +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.ChangeAttribute; import com.google.gerrit.server.data.PatchSetAttribute; public class ChangeAbandonedEvent extends ChangeEvent { - public final String type = "change-abandoned"; - public ChangeAttribute change; - public PatchSetAttribute patchSet; - public AccountAttribute abandoner; - public String reason; + public final String type = "change-abandoned"; + public ChangeAttribute change; + public PatchSetAttribute patchSet; + public AccountAttribute abandoner; + public String reason; + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return new Project.NameKey(change.project); + } + + @Override + public Change.Key getChangeKey() { + return new Change.Key(change.id); + } + + @Override + public String getRefName() { + return R_HEADS + change.branch; + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeEvent.java index 904a0a0489..77ba75665f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeEvent.java @@ -14,5 +14,15 @@ package com.google.gerrit.server.events; +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; + public abstract class ChangeEvent { + public abstract String getType(); + + public abstract Project.NameKey getProjectNameKey(); + + public abstract Change.Key getChangeKey(); + + public abstract String getRefName(); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeMergedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeMergedEvent.java index 38996a5e05..f1aaa0a880 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeMergedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeMergedEvent.java @@ -14,13 +14,37 @@ package com.google.gerrit.server.events; +import static org.eclipse.jgit.lib.Constants.R_HEADS; + +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.ChangeAttribute; import com.google.gerrit.server.data.PatchSetAttribute; public class ChangeMergedEvent extends ChangeEvent { - public final String type = "change-merged"; - public ChangeAttribute change; - public PatchSetAttribute patchSet; - public AccountAttribute submitter; + public final String type = "change-merged"; + public ChangeAttribute change; + public PatchSetAttribute patchSet; + public AccountAttribute submitter; + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return new Project.NameKey(change.project); + } + + @Override + public Change.Key getChangeKey() { + return new Change.Key(change.id); + } + + @Override + public String getRefName() { + return R_HEADS + change.branch; + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeRestoredEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeRestoredEvent.java index e761190d6e..bf759249c1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeRestoredEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeRestoredEvent.java @@ -14,14 +14,38 @@ package com.google.gerrit.server.events; +import static org.eclipse.jgit.lib.Constants.R_HEADS; + +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.ChangeAttribute; import com.google.gerrit.server.data.PatchSetAttribute; public class ChangeRestoredEvent extends ChangeEvent { - public final String type = "change-restored"; - public ChangeAttribute change; - public PatchSetAttribute patchSet; - public AccountAttribute restorer; - public String reason; + public final String type = "change-restored"; + public ChangeAttribute change; + public PatchSetAttribute patchSet; + public AccountAttribute restorer; + public String reason; + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return new Project.NameKey(change.project); + } + + @Override + public Change.Key getChangeKey() { + return new Change.Key(change.id); + } + + @Override + public String getRefName() { + return R_HEADS + change.branch; + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/CommentAddedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/CommentAddedEvent.java index 52d7409819..3b0cf9c39b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/CommentAddedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/CommentAddedEvent.java @@ -14,16 +14,40 @@ package com.google.gerrit.server.events; +import static org.eclipse.jgit.lib.Constants.R_HEADS; + +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.ApprovalAttribute; import com.google.gerrit.server.data.ChangeAttribute; import com.google.gerrit.server.data.PatchSetAttribute; public class CommentAddedEvent extends ChangeEvent { - public final String type = "comment-added"; - public ChangeAttribute change; - public PatchSetAttribute patchSet; - public AccountAttribute author; - public ApprovalAttribute[] approvals; - public String comment; + public final String type = "comment-added"; + public ChangeAttribute change; + public PatchSetAttribute patchSet; + public AccountAttribute author; + public ApprovalAttribute[] approvals; + public String comment; + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return new Project.NameKey(change.project); + } + + @Override + public Change.Key getChangeKey() { + return new Change.Key(change.id); + } + + @Override + public String getRefName() { + return R_HEADS + change.branch; + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/CommitReceivedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/CommitReceivedEvent.java index 8dd10847b5..825b5954e8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/CommitReceivedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/CommitReceivedEvent.java @@ -14,6 +14,7 @@ package com.google.gerrit.server.events; +import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.IdentifiedUser; @@ -21,6 +22,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.transport.ReceiveCommand; public class CommitReceivedEvent extends ChangeEvent { + public final String type = "commit-received"; public final ReceiveCommand command; public final Project project; public final String refName; @@ -35,4 +37,24 @@ public class CommitReceivedEvent extends ChangeEvent { this.commit = commit; this.user = user; } + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return project.getNameKey(); + } + + @Override + public Change.Key getChangeKey() { + return null; + } + + @Override + public String getRefName() { + return refName; + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/DraftPublishedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/DraftPublishedEvent.java index 7fd033a15b..a59516533c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/DraftPublishedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/DraftPublishedEvent.java @@ -14,13 +14,37 @@ package com.google.gerrit.server.events; +import static org.eclipse.jgit.lib.Constants.R_HEADS; + +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.ChangeAttribute; import com.google.gerrit.server.data.PatchSetAttribute; public class DraftPublishedEvent extends ChangeEvent { - public final String type = "draft-published"; - public ChangeAttribute change; - public PatchSetAttribute patchSet; - public AccountAttribute uploader; + public final String type = "draft-published"; + public ChangeAttribute change; + public PatchSetAttribute patchSet; + public AccountAttribute uploader; + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return new Project.NameKey(change.project); + } + + @Override + public Change.Key getChangeKey() { + return new Change.Key(change.id); + } + + @Override + public String getRefName() { + return R_HEADS + change.branch; + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/HashtagsChangedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/HashtagsChangedEvent.java index 4b4bbba373..91c14b1f9f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/HashtagsChangedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/HashtagsChangedEvent.java @@ -14,6 +14,10 @@ package com.google.gerrit.server.events; +import static org.eclipse.jgit.lib.Constants.R_HEADS; + +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.ChangeAttribute; @@ -24,4 +28,24 @@ public class HashtagsChangedEvent extends ChangeEvent { public String[] added; public String[] removed; public String[] hashtags; + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return new Project.NameKey(change.project); + } + + @Override + public Change.Key getChangeKey() { + return new Change.Key(change.id); + } + + @Override + public String getRefName() { + return R_HEADS + change.branch; + } } \ No newline at end of file diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/MergeFailedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/MergeFailedEvent.java index 599fe60ea2..4ec6da3030 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/MergeFailedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/MergeFailedEvent.java @@ -14,14 +14,38 @@ package com.google.gerrit.server.events; +import static org.eclipse.jgit.lib.Constants.R_HEADS; + +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.ChangeAttribute; import com.google.gerrit.server.data.PatchSetAttribute; public class MergeFailedEvent extends ChangeEvent { - public final String type = "merge-failed"; - public ChangeAttribute change; - public PatchSetAttribute patchSet; - public AccountAttribute submitter; - public String reason; + public final String type = "merge-failed"; + public ChangeAttribute change; + public PatchSetAttribute patchSet; + public AccountAttribute submitter; + public String reason; + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return new Project.NameKey(change.project); + } + + @Override + public Change.Key getChangeKey() { + return new Change.Key(change.id); + } + + @Override + public String getRefName() { + return R_HEADS + change.branch; + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetCreatedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetCreatedEvent.java index fbaf4ef1ce..830c6cbe36 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetCreatedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetCreatedEvent.java @@ -14,13 +14,37 @@ package com.google.gerrit.server.events; +import static org.eclipse.jgit.lib.Constants.R_HEADS; + +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.ChangeAttribute; import com.google.gerrit.server.data.PatchSetAttribute; public class PatchSetCreatedEvent extends ChangeEvent { - public final String type = "patchset-created"; - public ChangeAttribute change; - public PatchSetAttribute patchSet; - public AccountAttribute uploader; + public final String type = "patchset-created"; + public ChangeAttribute change; + public PatchSetAttribute patchSet; + public AccountAttribute uploader; + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return new Project.NameKey(change.project); + } + + @Override + public Change.Key getChangeKey() { + return new Change.Key(change.id); + } + + @Override + public String getRefName() { + return R_HEADS + change.branch; + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/RefOperationReceivedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/RefOperationReceivedEvent.java index d26632b33c..da3a215b32 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/RefOperationReceivedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/RefOperationReceivedEvent.java @@ -13,6 +13,7 @@ // limitations under the License. package com.google.gerrit.server.events; +import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.IdentifiedUser; @@ -23,4 +24,24 @@ public class RefOperationReceivedEvent extends ChangeEvent { public ReceiveCommand command; public Project project; public IdentifiedUser user; -} \ No newline at end of file + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return project.getNameKey(); + } + + @Override + public Change.Key getChangeKey() { + return null; + } + + @Override + public String getRefName() { + return command.getRefName(); + } +} diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/RefUpdatedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/RefUpdatedEvent.java index 944c9ad65e..4b7244e337 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/RefUpdatedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/RefUpdatedEvent.java @@ -14,6 +14,8 @@ package com.google.gerrit.server.events; +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.RefUpdateAttribute; @@ -21,4 +23,24 @@ public class RefUpdatedEvent extends ChangeEvent { public final String type = "ref-updated"; public AccountAttribute submitter; public RefUpdateAttribute refUpdate; + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return new Project.NameKey(refUpdate.project); + } + + @Override + public Change.Key getChangeKey() { + return null; + } + + @Override + public String getRefName() { + return refUpdate.refName; + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerAddedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerAddedEvent.java index e00cc60417..20eb30b1d2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerAddedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerAddedEvent.java @@ -14,13 +14,37 @@ package com.google.gerrit.server.events; +import static org.eclipse.jgit.lib.Constants.R_HEADS; + +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.ChangeAttribute; import com.google.gerrit.server.data.PatchSetAttribute; public class ReviewerAddedEvent extends ChangeEvent { - public final String type = "reviewer-added"; - public ChangeAttribute change; - public PatchSetAttribute patchSet; - public AccountAttribute reviewer; + public final String type = "reviewer-added"; + public ChangeAttribute change; + public PatchSetAttribute patchSet; + public AccountAttribute reviewer; + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return new Project.NameKey(change.project); + } + + @Override + public Change.Key getChangeKey() { + return new Change.Key(change.id); + } + + @Override + public String getRefName() { + return R_HEADS + change.branch; + } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/TopicChangedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/TopicChangedEvent.java index e725eac3e1..f897dbc759 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/TopicChangedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/TopicChangedEvent.java @@ -14,6 +14,10 @@ package com.google.gerrit.server.events; +import static org.eclipse.jgit.lib.Constants.R_HEADS; + +import com.google.gerrit.reviewdb.client.Change; +import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.data.AccountAttribute; import com.google.gerrit.server.data.ChangeAttribute; @@ -22,4 +26,24 @@ public class TopicChangedEvent extends ChangeEvent { public ChangeAttribute change; public AccountAttribute changer; public String oldTopic; -} \ No newline at end of file + + @Override + public String getType() { + return type; + } + + @Override + public Project.NameKey getProjectNameKey() { + return new Project.NameKey(change.project); + } + + @Override + public Change.Key getChangeKey() { + return new Change.Key(change.id); + } + + @Override + public String getRefName() { + return R_HEADS + change.branch; + } +}