revert evendata back to original name (Azure#36055)

* revert evendata back to original name

* fix event parse

Author: wangrui-msft

sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs

@@ -39,11 +39,11 @@ public void ProcessEvents(IEnumerable<CloudEvent> events)
         /// <summary>
         /// Process incoming events. Pass incoming events to get it processed to have other method like WaitForEventProcessor to function.
         /// </summary>
-        /// <param name="events">Incoming <see cref="CallAutomationEventData"/>.</param>
-        public void ProcessEvents(IEnumerable<CallAutomationEventData> events)
+        /// <param name="events">Incoming <see cref="CallAutomationEventBase"/>.</param>
+        public void ProcessEvents(IEnumerable<CallAutomationEventBase> events)
         {
             // Note: There will always be only 1 event coming from the service
-            CallAutomationEventData receivedEvent = events.FirstOrDefault();
+            CallAutomationEventBase receivedEvent = events.FirstOrDefault();
 
             if (receivedEvent != null)
             {
@@ -63,7 +63,7 @@ public void ProcessEvents(IEnumerable<CallAutomationEventData> events)
                 }
 
                 // If this call is disconnect, remove all related items in memory
-                if (receivedEvent is CallDisconnectedEventData)
+                if (receivedEvent is CallDisconnected)
                 {
                     // remove from eventsbacklog
                     _eventBacklog.TryRemoveEvent(internalEventId);
@@ -80,7 +80,7 @@ public void ProcessEvents(IEnumerable<CallAutomationEventData> events)
         /// <typeparam name="TEvent">Call Automation Event Type.</typeparam>
         /// <param name="callConnectionId">CallConnectionId of the call.</param>
         /// <param name="eventProcessor">EventProcessor to be fired when the specified event arrives.</param>
-        public void AttachOngoingEventProcessor<TEvent>(string callConnectionId, Action<TEvent> eventProcessor) where TEvent : CallAutomationEventData
+        public void AttachOngoingEventProcessor<TEvent>(string callConnectionId, Action<TEvent> eventProcessor) where TEvent : CallAutomationEventBase
         {
             var ongoingAwaiter = new EventAwaiterOngoing<TEvent>(callConnectionId, eventProcessor);
             EventHandler<EventProcessorArgs> handler = (o, arg) => ongoingAwaiter.OnEventReceived(o, arg);
@@ -96,18 +96,18 @@ public void AttachOngoingEventProcessor<TEvent>(string callConnectionId, Action<
         /// </summary>
         /// <typeparam name="TEvent">Call Automation Event Type.</typeparam>
         /// <param name="callConnectionId">CallConnectionId of the call.</param>
-        public void DetachOngoingEventProcessor<TEvent>(string callConnectionId) where TEvent : CallAutomationEventData
+        public void DetachOngoingEventProcessor<TEvent>(string callConnectionId) where TEvent : CallAutomationEventBase
         {
             RemoveFromOngoingEvent(callConnectionId, typeof(TEvent));
         }
 
         /// <summary>
-        /// Wait for matching incoming event. This is blocking Call. Returns the <see cref="CallAutomationEventData"/> once it arrives in ProcessEvent method.
+        /// Wait for matching incoming event. This is blocking Call. Returns the <see cref="CallAutomationEventBase"/> once it arrives in ProcessEvent method.
         /// </summary>
         /// <param name="predicate">Predicate for waiting on event.</param>
         /// <param name="cancellationToken">Cancellation Token can be used to set timeout or cancel this WaitForEventProcessor.</param>
-        /// <returns>Returns <see cref="CallAutomationEventData"/> once matching event arrives.</returns>
-        public CallAutomationEventData WaitForEventProcessor(Func<CallAutomationEventData, bool> predicate, CancellationToken cancellationToken = default)
+        /// <returns>Returns <see cref="CallAutomationEventBase"/> once matching event arrives.</returns>
+        public CallAutomationEventBase WaitForEventProcessor(Func<CallAutomationEventBase, bool> predicate, CancellationToken cancellationToken = default)
         {
             // Initialize awaiter and get event handler of it
             var awaiter = new EventAwaiter(predicate, cancellationToken);
@@ -149,27 +149,27 @@ public CallAutomationEventData WaitForEventProcessor(Func<CallAutomationEventDat
         }
 
         /// <summary>
-        /// Wait for matching incoming event. This is blocking Call. Returns the <see cref="CallAutomationEventData"/> once it arrives in ProcessEvent method.
+        /// Wait for matching incoming event. This is blocking Call. Returns the <see cref="CallAutomationEventBase"/> once it arrives in ProcessEvent method.
         /// </summary>
         /// <typeparam name="TEvent">Matching event type.</typeparam>
         /// <param name="connectionId">CallConnectionId of the call.</param>
         /// <param name="operationContext">OperationContext of the method.</param>
         /// <param name="cancellationToken">Cancellation Token can be used to set timeout or cancel this WaitForEventProcessor.</param>
         /// <returns>Returns the event once matching event arrives.</returns>
-        public TEvent WaitForEventProcessor<TEvent>(string connectionId = default, string operationContext = default, CancellationToken cancellationToken = default) where TEvent : CallAutomationEventData
+        public TEvent WaitForEventProcessor<TEvent>(string connectionId = default, string operationContext = default, CancellationToken cancellationToken = default) where TEvent : CallAutomationEventBase
             => (TEvent)WaitForEventProcessor(predicate
                 => (predicate.CallConnectionId == connectionId || connectionId is null)
                 && (predicate.OperationContext == operationContext || operationContext is null)
                 && predicate is TEvent,
                 cancellationToken);
 
         /// <summary>
-        /// Wait for matching incoming event. Returns the <see cref="CallAutomationEventData"/> once it arrives in ProcessEvent method.
+        /// Wait for matching incoming event. Returns the <see cref="CallAutomationEventBase"/> once it arrives in ProcessEvent method.
         /// </summary>
         /// <param name="predicate">Predicate for waiting on event.</param>
         /// <param name="cancellationToken">Cancellation Token can be used to set timeout or cancel this WaitForEventProcessor.</param>
-        /// <returns>Returns <see cref="CallAutomationEventData"/> once matching event arrives.</returns>
-        public async Task<CallAutomationEventData> WaitForEventProcessorAsync(Func<CallAutomationEventData, bool> predicate, CancellationToken cancellationToken = default)
+        /// <returns>Returns <see cref="CallAutomationEventBase"/> once matching event arrives.</returns>
+        public async Task<CallAutomationEventBase> WaitForEventProcessorAsync(Func<CallAutomationEventBase, bool> predicate, CancellationToken cancellationToken = default)
         {
             // Initialize awaiter and get event handler of it
             var awaiter = new EventAwaiter(predicate, cancellationToken);
@@ -209,14 +209,14 @@ public async Task<CallAutomationEventData> WaitForEventProcessorAsync(Func<CallA
         }
 
         /// <summary>
-        /// Wait for matching incoming event. Returns the <see cref="CallAutomationEventData"/> once it arrives in ProcessEvent method.
+        /// Wait for matching incoming event. Returns the <see cref="CallAutomationEventBase"/> once it arrives in ProcessEvent method.
         /// </summary>
         /// <typeparam name="TEvent">Matching event type.</typeparam>
         /// <param name="connectionId">CallConnectionId of the call.</param>
         /// <param name="operationContext">OperationContext of the method.</param>
         /// <param name="cancellationToken">Cancellation Token can be used to set timeout or cancel this WaitForEventProcessor.</param>
         /// <returns>Returns the event once matching event arrives.</returns>
-        public async Task<TEvent> WaitForEventProcessorAsync<TEvent>(string connectionId = default, string operationContext = default, CancellationToken cancellationToken = default) where TEvent : CallAutomationEventData
+        public async Task<TEvent> WaitForEventProcessorAsync<TEvent>(string connectionId = default, string operationContext = default, CancellationToken cancellationToken = default) where TEvent : CallAutomationEventBase
             => (TEvent)await WaitForEventProcessorAsync(predicate
                 => (predicate.CallConnectionId == connectionId || connectionId is null)
                 && (predicate.OperationContext == operationContext || operationContext is null)

sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationEventProcessor/CallAutomationEventProcessor.cs

@@ -14,14 +14,14 @@ internal class EventAwaiter : IDisposable
         private const int DEFAULT_EVENT_EXPIRATION_SECONDS = 240;
         private readonly CancellationToken _cancellationToken;
 
-        private Func<CallAutomationEventData, bool> _predicate;
+        private Func<CallAutomationEventBase, bool> _predicate;
 
         private bool _disposed;
 
         internal TaskCompletionSource<EventProcessorArgs> taskSource { get; }
         internal Action<object, EventProcessorArgs> OnEventReceived => OnEventsReceived;
 
-        internal EventAwaiter(Func<CallAutomationEventData, bool> predicate, CancellationToken cancellationToken)
+        internal EventAwaiter(Func<CallAutomationEventBase, bool> predicate, CancellationToken cancellationToken)
         {
             // With constructor, define predicate that matches the condition given.
             _predicate = predicate;

sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationEventProcessor/EventAwaiter.cs

@@ -5,7 +5,7 @@
 
 namespace Azure.Communication.CallAutomation
 {
-    internal class EventAwaiterOngoing<TEvent> where TEvent : CallAutomationEventData
+    internal class EventAwaiterOngoing<TEvent> where TEvent : CallAutomationEventBase
     {
         private string _callConnectionId;
         private Action<TEvent> _eventProcessor;

sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationEventProcessor/EventAwaiterOngoing.cs

@@ -19,12 +19,12 @@ internal class EventBacklog
 
         private TimeSpan _expiringTimeout;
 
-        private ConcurrentDictionary<string, (CallAutomationEventData, Timer)> _eventBacklog;
+        private ConcurrentDictionary<string, (CallAutomationEventBase, Timer)> _eventBacklog;
 
         internal EventBacklog(TimeSpan defaultExpiringTimeout = default)
         {
             _expiringTimeout = defaultExpiringTimeout == default ? TimeSpan.FromSeconds(DEFAULT_TIMEOUT) : defaultExpiringTimeout;
-            _eventBacklog = new ConcurrentDictionary<string, (CallAutomationEventData, Timer)>();
+            _eventBacklog = new ConcurrentDictionary<string, (CallAutomationEventBase, Timer)>();
         }
 
         /// <summary>
@@ -33,7 +33,7 @@ internal EventBacklog(TimeSpan defaultExpiringTimeout = default)
         /// <param name="backlogEventId">Internally used id for tracking the saved event.</param>
         /// <param name="eventsToBeSaved">Incoming Event to be saved.</param>
         /// <returns>Returns True if adding event is successful. False otherwise.</returns>
-        internal bool TryAddEvent(string backlogEventId, CallAutomationEventData eventsToBeSaved)
+        internal bool TryAddEvent(string backlogEventId, CallAutomationEventBase eventsToBeSaved)
         {
             if (_eventBacklog.Count < MAXIMUM_EVENTBACKLOGS_AT_ONCE)
             {
@@ -48,15 +48,15 @@ internal bool TryAddEvent(string backlogEventId, CallAutomationEventData eventsT
             }
         }
 
-        internal bool TryGetAndRemoveEvent(Func<CallAutomationEventData, bool> predicate, out KeyValuePair<string, CallAutomationEventData> matchingEvent)
+        internal bool TryGetAndRemoveEvent(Func<CallAutomationEventBase, bool> predicate, out KeyValuePair<string, CallAutomationEventBase> matchingEvent)
         {
             // Match any event that matches in the events backlog
             var matchingKvp = _eventBacklog.FirstOrDefault(kvp => predicate(kvp.Value.Item1));
 
             // Try remove the item - if successful, return it as keyValuePair
             if (matchingKvp.Key != default && _eventBacklog.TryRemove(matchingKvp.Key, out var returnedValue))
             {
-                matchingEvent = new KeyValuePair<string, CallAutomationEventData>(matchingEvent.Key, returnedValue.Item1);
+                matchingEvent = new KeyValuePair<string, CallAutomationEventBase>(matchingEvent.Key, returnedValue.Item1);
                 return true;
             }
             else

sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationEventProcessor/EventBacklog.cs

@@ -9,6 +9,6 @@ internal class EventProcessorArgs : EventArgs
     {
         internal string EventArgsId { get; set; }
 
-        internal CallAutomationEventData CallAutomationEvent { get; set; }
+        internal CallAutomationEventBase CallAutomationEvent { get; set; }
     }
 }

sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationEventProcessor/EventProcessorArgs.cs

@@ -12,21 +12,21 @@ public class AddParticipantEventResult
         public bool IsSuccess { get; internal set; }
 
         /// <summary>
-        /// <see cref="AddParticipantSucceededEventData"/> event will be returned when the participant joined the call successfully.
+        /// <see cref="AddParticipantSucceeded"/> event will be returned when the participant joined the call successfully.
         /// </summary>
-        public AddParticipantSucceededEventData SuccessResult { get; }
+        public AddParticipantSucceeded SuccessResult { get; }
 
         /// <summary>
-        /// <see cref="AddParticipantFailedEventData"/> event will be returned when the participant did not join the call.
+        /// <see cref="AddParticipantFailed"/> event will be returned when the participant did not join the call.
         /// </summary>
-        public AddParticipantFailedEventData FailureResult { get; }
+        public AddParticipantFailed FailureResult { get; }
 
         /// <summary>
         /// <see cref="CommunicationIdentifier"/> Participant that was added or removed from the call.
         /// </summary>
         public CommunicationIdentifier Participant { get; }
 
-        internal AddParticipantEventResult(bool isSuccess, AddParticipantSucceededEventData successResult, AddParticipantFailedEventData failureResult, CommunicationIdentifier participant)
+        internal AddParticipantEventResult(bool isSuccess, AddParticipantSucceeded successResult, AddParticipantFailed failureResult, CommunicationIdentifier participant)
         {
             IsSuccess = isSuccess;
             SuccessResult = successResult;

sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationEventProcessor/EventResult/AddParticipantEventResult.cs

@@ -12,11 +12,11 @@ public class AnswerCallEventResult
         public bool IsSuccess { get; internal set; }
 
         /// <summary>
-        /// <see cref="CallConnectedEventData"/> event will be returned once the call is established with AnswerCall.
+        /// <see cref="CallConnected"/> event will be returned once the call is established with AnswerCall.
         /// </summary>
-        public CallConnectedEventData SuccessResult { get; }
+        public CallConnected SuccessResult { get; }
 
-        internal AnswerCallEventResult(bool isSuccess, CallConnectedEventData successResult)
+        internal AnswerCallEventResult(bool isSuccess, CallConnected successResult)
         {
             IsSuccess = isSuccess;
             SuccessResult = successResult;

sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationEventProcessor/EventResult/AnswerCallEventResult.cs

@@ -12,16 +12,16 @@ public class CancelAllMediaOperationsEventResult
         public bool IsSuccess { get; internal set; }
 
         /// <summary>
-        /// <see cref="PlayCanceledEventData"/> event will be returned when the play is successfully cancelled.
+        /// <see cref="PlayCanceled"/> event will be returned when the play is successfully cancelled.
         /// </summary>
-        public PlayCanceledEventData PlayCanceledSucessEvent { get; }
+        public PlayCanceled PlayCanceledSucessEvent { get; }
 
         /// <summary>
-        /// <see cref="RecognizeCanceledEventData"/> event will be returned when the Recognize is successfully cancelled.
+        /// <see cref="RecognizeCanceled"/> event will be returned when the Recognize is successfully cancelled.
         /// </summary>
-        public RecognizeCanceledEventData RecognizeCanceledSucessEvent { get; }
+        public RecognizeCanceled RecognizeCanceledSucessEvent { get; }
 
-        internal CancelAllMediaOperationsEventResult(bool isSuccess, PlayCanceledEventData playCanceledSucessEvent, RecognizeCanceledEventData recognizeCanceledSucessEvent)
+        internal CancelAllMediaOperationsEventResult(bool isSuccess, PlayCanceled playCanceledSucessEvent, RecognizeCanceled recognizeCanceledSucessEvent)
         {
             IsSuccess = isSuccess;
             PlayCanceledSucessEvent = playCanceledSucessEvent;

sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationEventProcessor/EventResult/CancelAllMediaOperationsEventResult.cs

@@ -12,11 +12,11 @@ public class CreateCallEventResult
         public bool IsSuccess { get; internal set; }
 
         /// <summary>
-        /// <see cref="CallConnectedEventData"/> event will be returned once the call is established with CreateCall.
+        /// <see cref="CallConnected"/> event will be returned once the call is established with CreateCall.
         /// </summary>
-        public CallConnectedEventData SuccessResult { get; }
+        public CallConnected SuccessResult { get; }
 
-        internal CreateCallEventResult(bool isSuccess, CallConnectedEventData successResult)
+        internal CreateCallEventResult(bool isSuccess, CallConnected successResult)
         {
             IsSuccess = isSuccess;
             SuccessResult = successResult;