From cf4eac8509a92a85b91a28498035f84c7b3e351f Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Wed, 3 Dec 2025 11:08:17 -0500 Subject: [PATCH] MeetMeTalkingRequestEvent.java: Use `@AsteriskMapping` instead of creating a new event class --- .../manager/AbstractManagerEventListener.java | 3 -- .../manager/event/MeetMeTalkRequestEvent.java | 50 ------------------- .../event/MeetMeTalkingRequestEvent.java | 40 ++++++++++----- 3 files changed, 28 insertions(+), 65 deletions(-) delete mode 100644 src/main/java/org/asteriskjava/manager/event/MeetMeTalkRequestEvent.java diff --git a/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java b/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java index 1c636630b..1f977a1ae 100644 --- a/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java +++ b/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java @@ -171,9 +171,6 @@ public void handleEvent(MeetMeTalkingEvent event) { public void handleEvent(MeetMeTalkingRequestEvent event) { } - public void handleEvent(MeetMeTalkRequestEvent event) { - } - public void handleEvent(MonitorStartEvent event) { } diff --git a/src/main/java/org/asteriskjava/manager/event/MeetMeTalkRequestEvent.java b/src/main/java/org/asteriskjava/manager/event/MeetMeTalkRequestEvent.java deleted file mode 100644 index 55571bc6d..000000000 --- a/src/main/java/org/asteriskjava/manager/event/MeetMeTalkRequestEvent.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.asteriskjava.manager.event; - -/** - * A MeetMeTalkRequestEvent is triggered when a muted user requests talking in - * a MeetMe conference. - */ -public class MeetMeTalkRequestEvent extends AbstractMeetMeEvent { - private static final long serialVersionUID = 0L; - - private Boolean status; - private Integer duration; - - /** - * Constructs a MeetMeTalkRequestEvent. - * - * @param source The object on which the Event initially occurred. - * @throws IllegalArgumentException if source is null. - */ - public MeetMeTalkRequestEvent(Object source) { - super(source); - } - - /** - * The length of time (in seconds) that the MeetMe user has been in the - * conference at the time of this event. - * - * @return the number of seconds this user has been in the conference. - */ - public Integer getDuration() { - return duration; - } - - public void setDuration(Integer duration) { - this.duration = duration; - } - - /** - * Returns whether the user has started or stopped requesting talking. - * - * @return {@code true} if the user has started requesting talking, - * {@code false} if the user has stopped requesting talking. - */ - public Boolean getStatus() { - return status; - } - - public void setStatus(Boolean status) { - this.status = status; - } -} diff --git a/src/main/java/org/asteriskjava/manager/event/MeetMeTalkingRequestEvent.java b/src/main/java/org/asteriskjava/manager/event/MeetMeTalkingRequestEvent.java index 68a8f31ad..95729b194 100644 --- a/src/main/java/org/asteriskjava/manager/event/MeetMeTalkingRequestEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/MeetMeTalkingRequestEvent.java @@ -16,29 +16,31 @@ */ package org.asteriskjava.manager.event; +import org.asteriskjava.manager.AsteriskMapping; + /** - * A MeetMeTalkingEvent is triggered when a muted user requests talking in a meet me - * conference.

- * To enable talker detection you must pass the option 'T' to the MeetMe application.

- * It is implemented in apps/app_meetme.c

- * Available since Asterisk 1.6 - * - * @deprecated You want {@link MeetMeTalkRequestEvent} instead. + * A MeetMeTalkRequestEvent is triggered when a muted user requests talking in + * a MeetMe conference. * * @author srt * @version $Id$ * @since 1.0.0 */ +@AsteriskMapping("MeetMeTalkRequest") public class MeetMeTalkingRequestEvent extends AbstractMeetMeEvent { /** * Serializable version identifier. */ - private static final long serialVersionUID = 0L; + private static final long serialVersionUID = 1L; private Boolean status; + private Integer duration; /** - * @param source + * Constructs a MeetMeTalkingRequestEvent + * + * @param source The object on which the Event initially occurred. + * @throws IllegalArgumentException if source is null. */ public MeetMeTalkingRequestEvent(Object source) { super(source); @@ -47,10 +49,24 @@ public MeetMeTalkingRequestEvent(Object source) { // see http://bugs.digium.com/view.php?id=9418 /** - * Returns whether the user has started or stopped requesting talking. + * The length of time (in seconds) that the MeetMe user has been in the + * conference at the time of this event + * + * @return the number of seconds this user has been in the conference. + */ + public Integer getDuration() { + return duration; + } + + public void setDuration(Integer duration) { + this.duration = duration; + } + + /** + * Returns whether the user has started or stopped requesting talking * - * @return true if ther user has started requesting talking, - * false if the user has stopped requesting talking. + * @return {@code true} if the user has started requesting talking, + * {@code false} if the user has stopped requesting talking. */ public Boolean getStatus() { return status;