From 26532ccac47fdc449937109eccb071d09a279f52 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 23 Aug 2016 15:13:35 +0900 Subject: [PATCH] Remove deprecated AccountInfo get... methods from events API In version 2.13 these methods were superseded by the getWho() method in the ChangeEvent super-interface, and marked as deprecated. Change-Id: Id21a3ee72236f033740a2a3513230e434f938653 --- .../gerrit/extensions/events/ChangeAbandonedListener.java | 3 --- .../gerrit/extensions/events/ChangeMergedListener.java | 3 --- .../gerrit/extensions/events/ChangeRestoredListener.java | 3 --- .../gerrit/extensions/events/CommentAddedListener.java | 3 --- .../gerrit/extensions/events/DraftPublishedListener.java | 3 --- .../gerrit/extensions/events/HashtagsEditedListener.java | 3 --- .../gerrit/extensions/events/RevisionCreatedListener.java | 3 --- .../gerrit/extensions/events/TopicEditedListener.java | 3 --- .../gerrit/server/extensions/events/ChangeAbandoned.java | 7 ------- .../gerrit/server/extensions/events/ChangeMerged.java | 7 ------- .../gerrit/server/extensions/events/ChangeRestored.java | 7 ------- .../gerrit/server/extensions/events/CommentAdded.java | 7 ------- .../gerrit/server/extensions/events/DraftPublished.java | 7 ------- .../gerrit/server/extensions/events/HashtagsEdited.java | 7 ------- .../gerrit/server/extensions/events/RevisionCreated.java | 7 ------- .../gerrit/server/extensions/events/TopicEdited.java | 7 ------- 16 files changed, 80 deletions(-) diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeAbandonedListener.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeAbandonedListener.java index 40b84a3e71..d18f3e5c81 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeAbandonedListener.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeAbandonedListener.java @@ -15,14 +15,11 @@ package com.google.gerrit.extensions.events; import com.google.gerrit.extensions.annotations.ExtensionPoint; -import com.google.gerrit.extensions.common.AccountInfo; /** Notified whenever a Change is abandoned. */ @ExtensionPoint public interface ChangeAbandonedListener { interface Event extends RevisionEvent { - @Deprecated - AccountInfo getAbandoner(); String getReason(); } diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeMergedListener.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeMergedListener.java index d0ca6d6fc7..de74a86ba9 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeMergedListener.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeMergedListener.java @@ -15,14 +15,11 @@ package com.google.gerrit.extensions.events; import com.google.gerrit.extensions.annotations.ExtensionPoint; -import com.google.gerrit.extensions.common.AccountInfo; /** Notified whenever a Change is merged. */ @ExtensionPoint public interface ChangeMergedListener { interface Event extends RevisionEvent { - @Deprecated - AccountInfo getMerger(); /** * Represents the merged Revision when the submit strategy is cherry-pick or * rebase-if-necessary. diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeRestoredListener.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeRestoredListener.java index e5f3330715..f5333392c7 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeRestoredListener.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeRestoredListener.java @@ -15,14 +15,11 @@ package com.google.gerrit.extensions.events; import com.google.gerrit.extensions.annotations.ExtensionPoint; -import com.google.gerrit.extensions.common.AccountInfo; /** Notified whenever a Change is restored. */ @ExtensionPoint public interface ChangeRestoredListener { interface Event extends RevisionEvent { - @Deprecated - AccountInfo getRestorer(); String getReason(); } diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/CommentAddedListener.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/CommentAddedListener.java index 6c82034db0..e8388a9876 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/CommentAddedListener.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/CommentAddedListener.java @@ -15,7 +15,6 @@ package com.google.gerrit.extensions.events; import com.google.gerrit.extensions.annotations.ExtensionPoint; -import com.google.gerrit.extensions.common.AccountInfo; import com.google.gerrit.extensions.common.ApprovalInfo; import java.util.Map; @@ -24,8 +23,6 @@ import java.util.Map; @ExtensionPoint public interface CommentAddedListener { interface Event extends RevisionEvent { - @Deprecated - AccountInfo getAuthor(); String getComment(); Map getApprovals(); Map getOldApprovals(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/DraftPublishedListener.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/DraftPublishedListener.java index 3857468b96..1fc574b318 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/DraftPublishedListener.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/DraftPublishedListener.java @@ -15,14 +15,11 @@ package com.google.gerrit.extensions.events; import com.google.gerrit.extensions.annotations.ExtensionPoint; -import com.google.gerrit.extensions.common.AccountInfo; /** Notified whenever a Draft is published. */ @ExtensionPoint public interface DraftPublishedListener { interface Event extends RevisionEvent { - @Deprecated - AccountInfo getPublisher(); } void onDraftPublished(Event event); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/HashtagsEditedListener.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/HashtagsEditedListener.java index c49b0f3bfc..ad132673d3 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/HashtagsEditedListener.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/HashtagsEditedListener.java @@ -15,7 +15,6 @@ package com.google.gerrit.extensions.events; import com.google.gerrit.extensions.annotations.ExtensionPoint; -import com.google.gerrit.extensions.common.AccountInfo; import java.util.Collection; @@ -23,8 +22,6 @@ import java.util.Collection; @ExtensionPoint public interface HashtagsEditedListener { interface Event extends ChangeEvent { - @Deprecated - AccountInfo getEditor(); Collection getHashtags(); Collection getAddedHashtags(); Collection getRemovedHashtags(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/RevisionCreatedListener.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/RevisionCreatedListener.java index 5e4e0959df..8d148b7762 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/RevisionCreatedListener.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/RevisionCreatedListener.java @@ -15,14 +15,11 @@ package com.google.gerrit.extensions.events; import com.google.gerrit.extensions.annotations.ExtensionPoint; -import com.google.gerrit.extensions.common.AccountInfo; /** Notified whenever a Change Revision is created. */ @ExtensionPoint public interface RevisionCreatedListener { interface Event extends RevisionEvent { - @Deprecated - AccountInfo getUploader(); } void onRevisionCreated(Event event); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/TopicEditedListener.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/TopicEditedListener.java index 68ba22cc0a..0c36d9d7da 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/TopicEditedListener.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/TopicEditedListener.java @@ -15,14 +15,11 @@ package com.google.gerrit.extensions.events; import com.google.gerrit.extensions.annotations.ExtensionPoint; -import com.google.gerrit.extensions.common.AccountInfo; /** Notified whenever a Change Topic is changed. */ @ExtensionPoint public interface TopicEditedListener { interface Event extends ChangeEvent { - @Deprecated - AccountInfo getEditor(); String getOldTopic(); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java index dd49272a36..c76e76b0e0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java @@ -83,21 +83,14 @@ public class ChangeAbandoned { private static class Event extends AbstractRevisionEvent implements ChangeAbandonedListener.Event { - private final AccountInfo abandoner; private final String reason; Event(ChangeInfo change, RevisionInfo revision, AccountInfo abandoner, String reason, Timestamp when, NotifyHandling notifyHandling) { super(change, revision, abandoner, when, notifyHandling); - this.abandoner = abandoner; this.reason = reason; } - @Override - public AccountInfo getAbandoner() { - return abandoner; - } - @Override public String getReason() { return reason; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeMerged.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeMerged.java index 94df1d1368..378f2b7be8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeMerged.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeMerged.java @@ -81,21 +81,14 @@ public class ChangeMerged { private static class Event extends AbstractRevisionEvent implements ChangeMergedListener.Event { - private final AccountInfo merger; private final String newRevisionId; Event(ChangeInfo change, RevisionInfo revision, AccountInfo merger, String newRevisionId, Timestamp when) { super(change, revision, merger, when, NotifyHandling.ALL); - this.merger = merger; this.newRevisionId = newRevisionId; } - @Override - public AccountInfo getMerger() { - return merger; - } - @Override public String getNewRevisionId() { return newRevisionId; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeRestored.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeRestored.java index c85360902b..05e0d21854 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeRestored.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeRestored.java @@ -82,21 +82,14 @@ public class ChangeRestored { private static class Event extends AbstractRevisionEvent implements ChangeRestoredListener.Event { - private AccountInfo restorer; private String reason; Event(ChangeInfo change, RevisionInfo revision, AccountInfo restorer, String reason, Timestamp when) { super(change, revision, restorer, when, NotifyHandling.ALL); - this.restorer = restorer; this.reason = reason; } - @Override - public AccountInfo getRestorer() { - return restorer; - } - @Override public String getReason() { return reason; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/CommentAdded.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/CommentAdded.java index 85ad8b6d49..8e27ce9d87 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/CommentAdded.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/CommentAdded.java @@ -90,7 +90,6 @@ public class CommentAdded { private static class Event extends AbstractRevisionEvent implements CommentAddedListener.Event { - private final AccountInfo author; private final String comment; private final Map approvals; private final Map oldApprovals; @@ -99,17 +98,11 @@ public class CommentAdded { String comment, Map approvals, Map oldApprovals, Timestamp when) { super(change, revision, author, when, NotifyHandling.ALL); - this.author = author; this.comment = comment; this.approvals = approvals; this.oldApprovals = oldApprovals; } - @Override - public AccountInfo getAuthor() { - return author; - } - @Override public String getComment() { return comment; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/DraftPublished.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/DraftPublished.java index 0895cb8daa..6b8ce3dbe1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/DraftPublished.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/DraftPublished.java @@ -78,17 +78,10 @@ public class DraftPublished { private static class Event extends AbstractRevisionEvent implements DraftPublishedListener.Event { - private final AccountInfo publisher; Event(ChangeInfo change, RevisionInfo revision, AccountInfo publisher, Timestamp when) { super(change, revision, publisher, when, NotifyHandling.ALL); - this.publisher = publisher; - } - - @Override - public AccountInfo getPublisher() { - return publisher; } } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/HashtagsEdited.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/HashtagsEdited.java index fe42d02f15..f18b963ad8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/HashtagsEdited.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/HashtagsEdited.java @@ -81,7 +81,6 @@ public class HashtagsEdited { private static class Event extends AbstractChangeEvent implements HashtagsEditedListener.Event { - private AccountInfo editor; private Collection updatedHashtags; private Collection addedHashtags; private Collection removedHashtags; @@ -89,17 +88,11 @@ public class HashtagsEdited { Event(ChangeInfo change, AccountInfo editor, Collection updated, Collection added, Collection removed, Timestamp when) { super(change, editor, when, NotifyHandling.ALL); - this.editor = editor; this.updatedHashtags = updated; this.addedHashtags = added; this.removedHashtags = removed; } - @Override - public AccountInfo getEditor() { - return editor; - } - @Override public Collection getHashtags() { return updatedHashtags; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/RevisionCreated.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/RevisionCreated.java index 98fa05ee1b..71bc9ec703 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/RevisionCreated.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/RevisionCreated.java @@ -81,17 +81,10 @@ public class RevisionCreated { private static class Event extends AbstractRevisionEvent implements RevisionCreatedListener.Event { - private final AccountInfo uploader; Event(ChangeInfo change, RevisionInfo revision, AccountInfo uploader, Timestamp when, NotifyHandling notify) { super(change, revision, uploader, when, notify); - this.uploader = uploader; - } - - @Override - public AccountInfo getUploader() { - return uploader; } } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/TopicEdited.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/TopicEdited.java index 0a0a8ca7de..77c1647aad 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/TopicEdited.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/TopicEdited.java @@ -75,21 +75,14 @@ public class TopicEdited { private static class Event extends AbstractChangeEvent implements TopicEditedListener.Event { - private final AccountInfo editor; private final String oldTopic; Event(ChangeInfo change, AccountInfo editor, String oldTopic, Timestamp when) { super(change, editor, when, NotifyHandling.ALL); - this.editor = editor; this.oldTopic = oldTopic; } - @Override - public AccountInfo getEditor() { - return editor; - } - @Override public String getOldTopic() { return oldTopic;