Skip to content

renamed #34786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juntuchen-msft merged 1 commit into from
May 5, 2023
Merged

renamed #34786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 51 additions & 51 deletions ...ation/src/main/java/com/azure/communication/callautomation/CallAutomationEventParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@

package com.azure.communication.callautomation;

import com.azure.communication.callautomation.models.events.AddParticipantFailedEventData;
import com.azure.communication.callautomation.models.events.AddParticipantSucceededEventData;
import com.azure.communication.callautomation.models.events.CallAutomationEventData;
import com.azure.communication.callautomation.models.events.CallConnectedEventData;
import com.azure.communication.callautomation.models.events.CallDisconnectedEventData;
import com.azure.communication.callautomation.models.events.CallTransferAcceptedEventData;
import com.azure.communication.callautomation.models.events.CallTransferFailedEventData;
import com.azure.communication.callautomation.models.events.ContinuousDtmfRecognitionStoppedEventData;
import com.azure.communication.callautomation.models.events.ContinuousDtmfRecognitionToneFailedEventData;
import com.azure.communication.callautomation.models.events.ContinuousDtmfRecognitionToneReceivedEventData;
import com.azure.communication.callautomation.models.events.ParticipantsUpdatedEventData;
import com.azure.communication.callautomation.models.events.PlayCanceledEventData;
import com.azure.communication.callautomation.models.events.PlayCompletedEventData;
import com.azure.communication.callautomation.models.events.PlayFailedEventData;
import com.azure.communication.callautomation.models.events.RecognizeCanceledEventData;
import com.azure.communication.callautomation.models.events.RecognizeCompletedEventData;
import com.azure.communication.callautomation.models.events.RecognizeFailedEventData;
import com.azure.communication.callautomation.models.events.RecordingStateChangedEventData;
import com.azure.communication.callautomation.models.events.RemoveParticipantFailedEventData;
import com.azure.communication.callautomation.models.events.RemoveParticipantSucceededEventData;
import com.azure.communication.callautomation.models.events.SendDtmfCompletedEventData;
import com.azure.communication.callautomation.models.events.SendDtmfFailedEventData;
import com.azure.communication.callautomation.models.events.AddParticipantFailed;
import com.azure.communication.callautomation.models.events.AddParticipantSucceeded;
import com.azure.communication.callautomation.models.events.CallAutomationEventBase;
import com.azure.communication.callautomation.models.events.CallConnected;
import com.azure.communication.callautomation.models.events.CallDisconnected;
import com.azure.communication.callautomation.models.events.CallTransferAccepted;
import com.azure.communication.callautomation.models.events.CallTransferFailed;
import com.azure.communication.callautomation.models.events.ContinuousDtmfRecognitionStopped;
import com.azure.communication.callautomation.models.events.ContinuousDtmfRecognitionToneFailed;
import com.azure.communication.callautomation.models.events.ContinuousDtmfRecognitionToneReceived;
import com.azure.communication.callautomation.models.events.ParticipantsUpdated;
import com.azure.communication.callautomation.models.events.PlayCanceled;
import com.azure.communication.callautomation.models.events.PlayCompleted;
import com.azure.communication.callautomation.models.events.PlayFailed;
import com.azure.communication.callautomation.models.events.RecognizeCanceled;
import com.azure.communication.callautomation.models.events.RecognizeCompleted;
import com.azure.communication.callautomation.models.events.RecognizeFailed;
import com.azure.communication.callautomation.models.events.RecordingStateChanged;
import com.azure.communication.callautomation.models.events.RemoveParticipantFailed;
import com.azure.communication.callautomation.models.events.RemoveParticipantSucceeded;
import com.azure.communication.callautomation.models.events.SendDtmfCompleted;
import com.azure.communication.callautomation.models.events.SendDtmfFailed;
import com.azure.core.models.CloudEvent;
import com.azure.core.util.logging.ClientLogger;
import com.fasterxml.jackson.core.JsonProcessingException;
Expand All @@ -48,19 +48,19 @@ public final class CallAutomationEventParser {
*
* @param requestBody Body of the event request.
* @throws RuntimeException Any exceptions occurs at runtime.
* @return a list of CallAutomationEventData
* @return a list of CallAutomationEventBase
*/
public static List<CallAutomationEventData> parseEvents(String requestBody) {
List<CallAutomationEventData> callAutomationBaseEvents;
public static List<CallAutomationEventBase> parseEvents(String requestBody) {
List<CallAutomationEventBase> callAutomationBaseEvents;
callAutomationBaseEvents = parseCloudEventList(requestBody);

return callAutomationBaseEvents;
}

private static List<CallAutomationEventData> parseCloudEventList(String requestBody) {
private static List<CallAutomationEventBase> parseCloudEventList(String requestBody) {
try {
List<CloudEvent> cloudEvents;
List<CallAutomationEventData> callAutomationBaseEvents = new ArrayList<>();
List<CallAutomationEventBase> callAutomationBaseEvents = new ArrayList<>();

try {
cloudEvents = CloudEvent.fromString(requestBody);
Expand All @@ -69,7 +69,7 @@ private static List<CallAutomationEventData> parseCloudEventList(String requestB
}

for (CloudEvent cloudEvent : cloudEvents) {
CallAutomationEventData temp = parseSingleCloudEvent(cloudEvent.getData().toString(), cloudEvent.getType());
CallAutomationEventBase temp = parseSingleCloudEvent(cloudEvent.getData().toString(), cloudEvent.getType());
if (temp != null) {
callAutomationBaseEvents.add(temp);
}
Expand All @@ -80,56 +80,56 @@ private static List<CallAutomationEventData> parseCloudEventList(String requestB
}
}

private static CallAutomationEventData parseSingleCloudEvent(String data, String eventType) {
private static CallAutomationEventBase parseSingleCloudEvent(String data, String eventType) {
try {
CallAutomationEventData ret = null;
CallAutomationEventBase ret = null;
ObjectMapper mapper = new ObjectMapper();
mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);

JsonNode eventData = mapper.readTree(data);

if (Objects.equals(eventType, "Microsoft.Communication.CallConnected")) {
ret = mapper.convertValue(eventData, CallConnectedEventData.class);
ret = mapper.convertValue(eventData, CallConnected.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.CallDisconnected")) {
ret = mapper.convertValue(eventData, CallDisconnectedEventData.class);
ret = mapper.convertValue(eventData, CallDisconnected.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.AddParticipantFailed")) {
ret = mapper.convertValue(eventData, AddParticipantFailedEventData.class);
ret = mapper.convertValue(eventData, AddParticipantFailed.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.AddParticipantSucceeded")) {
ret = mapper.convertValue(eventData, AddParticipantSucceededEventData.class);
ret = mapper.convertValue(eventData, AddParticipantSucceeded.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.CallTransferAccepted")) {
ret = mapper.convertValue(eventData, CallTransferAcceptedEventData.class);
ret = mapper.convertValue(eventData, CallTransferAccepted.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.CallTransferFailed")) {
ret = mapper.convertValue(eventData, CallTransferFailedEventData.class);
ret = mapper.convertValue(eventData, CallTransferFailed.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.ParticipantsUpdated")) {
ret = mapper.convertValue(eventData, ParticipantsUpdatedEventData.class);
ret = mapper.convertValue(eventData, ParticipantsUpdated.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.RecordingStateChanged")) {
ret = mapper.convertValue(eventData, RecordingStateChangedEventData.class);
ret = mapper.convertValue(eventData, RecordingStateChanged.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.PlayCompleted")) {
ret = mapper.convertValue(eventData, PlayCompletedEventData.class);
ret = mapper.convertValue(eventData, PlayCompleted.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.PlayFailed")) {
ret = mapper.convertValue(eventData, PlayFailedEventData.class);
ret = mapper.convertValue(eventData, PlayFailed.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.PlayCanceled")) {
ret = mapper.convertValue(eventData, PlayCanceledEventData.class);
ret = mapper.convertValue(eventData, PlayCanceled.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.RecognizeCompleted")) {
ret = mapper.convertValue(eventData, RecognizeCompletedEventData.class);
ret = mapper.convertValue(eventData, RecognizeCompleted.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.RecognizeFailed")) {
ret = mapper.convertValue(eventData, RecognizeFailedEventData.class);
ret = mapper.convertValue(eventData, RecognizeFailed.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.RecognizeCanceled")) {
ret = mapper.convertValue(eventData, RecognizeCanceledEventData.class);
ret = mapper.convertValue(eventData, RecognizeCanceled.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.RemoveParticipantFailed")) {
ret = mapper.convertValue(eventData, RemoveParticipantFailedEventData.class);
ret = mapper.convertValue(eventData, RemoveParticipantFailed.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.RemoveParticipantSucceeded")) {
ret = mapper.convertValue(eventData, RemoveParticipantSucceededEventData.class);
ret = mapper.convertValue(eventData, RemoveParticipantSucceeded.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.ContinuousDtmfRecognitionToneReceived")) {
ret = mapper.convertValue(eventData, ContinuousDtmfRecognitionToneReceivedEventData.class);
ret = mapper.convertValue(eventData, ContinuousDtmfRecognitionToneReceived.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.ContinuousDtmfRecognitionToneFailed")) {
ret = mapper.convertValue(eventData, ContinuousDtmfRecognitionToneFailedEventData.class);
ret = mapper.convertValue(eventData, ContinuousDtmfRecognitionToneFailed.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.ContinuousDtmfRecognitionStopped")) {
ret = mapper.convertValue(eventData, ContinuousDtmfRecognitionStoppedEventData.class);
ret = mapper.convertValue(eventData, ContinuousDtmfRecognitionStopped.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.SendDtmfCompleted")) {
ret = mapper.convertValue(eventData, SendDtmfCompletedEventData.class);
ret = mapper.convertValue(eventData, SendDtmfCompleted.class);
} else if (Objects.equals(eventType, "Microsoft.Communication.SendDtmfFailed")) {
ret = mapper.convertValue(eventData, SendDtmfFailedEventData.class);
ret = mapper.convertValue(eventData, SendDtmfFailed.class);
}
return ret;
} catch (RuntimeException e) {
Expand Down
6 changes: 3 additions & 3 deletions ...events/AddParticipantFailedEventData.java → ...n/models/events/AddParticipantFailed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import java.util.Map;

/** The AddParticipantFailedEventData model. */
/** The AddParticipantFailed model. */
@Immutable
public final class AddParticipantFailedEventData extends CallAutomationEventData {
public final class AddParticipantFailed extends CallAutomationEventBase {
/*
* Participant added
*/
Expand All @@ -32,7 +32,7 @@ public final class AddParticipantFailedEventData extends CallAutomationEventData
private final ResultInformation resultInformation;

@JsonCreator
private AddParticipantFailedEventData(@JsonProperty("participant") Map<String, Object> participant) {
private AddParticipantFailed(@JsonProperty("participant") Map<String, Object> participant) {
this.resultInformation = null;
ObjectMapper mapper = new ObjectMapper();
mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
Expand Down
6 changes: 3 additions & 3 deletions ...nts/AddParticipantSucceededEventData.java → ...odels/events/AddParticipantSucceeded.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

import java.util.Map;

/** The AddParticipantSucceededEventData model. */
/** The AddParticipantSucceeded model. */
@Immutable
public final class AddParticipantSucceededEventData extends CallAutomationEventData {
public final class AddParticipantSucceeded extends CallAutomationEventBase {
/*
* Participant added
*/
Expand All @@ -31,7 +31,7 @@ public final class AddParticipantSucceededEventData extends CallAutomationEventD
private final ResultInformation resultInformation;

@JsonCreator
private AddParticipantSucceededEventData(@JsonProperty("participant") Map<String, Object> participant) {
private AddParticipantSucceeded(@JsonProperty("participant") Map<String, Object> participant) {
this.resultInformation = null;
ObjectMapper mapper = new ObjectMapper();
mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
Expand Down
4 changes: 2 additions & 2 deletions ...odels/events/CallAutomationEventData.java → ...odels/events/CallAutomationEventBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;

/** The base event interface. */
public abstract class CallAutomationEventData {
public abstract class CallAutomationEventBase {
/*
* Call connection ID.
*/
Expand All @@ -32,7 +32,7 @@ public abstract class CallAutomationEventData {
@JsonProperty(value = "operationContext")
private final String operationContext;

CallAutomationEventData() {
CallAutomationEventBase() {
this.serverCallId = null;
this.callConnectionId = null;
this.correlationId = null;
Expand Down
4 changes: 2 additions & 2 deletions ...allAutomationEventDataWithReasonCode.java → ...allAutomationEventBaseWithReasonCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
/**
* The base event interface with ReasonCode added.
*/
public abstract class CallAutomationEventDataWithReasonCode extends CallAutomationEventData {
public abstract class CallAutomationEventBaseWithReasonCode extends CallAutomationEventBase {
/*
* Contains the resulting SIP code/sub-code and message from NGC services.
*/
@JsonProperty(value = "resultInformation")
private final ResultInformation resultInformation;

CallAutomationEventDataWithReasonCode() {
CallAutomationEventBaseWithReasonCode() {
this.resultInformation = null;
}

Expand Down
6 changes: 3 additions & 3 deletions ...models/events/CallConnectedEventData.java → ...tomation/models/events/CallConnected.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

import com.azure.core.annotation.Immutable;

/** The CallConnectedEventData model. */
/** The CallConnected model. */
@Immutable
public final class CallConnectedEventData extends CallAutomationEventData {
private CallConnectedEventData() {
public final class CallConnected extends CallAutomationEventBase {
private CallConnected() {
}
}
6 changes: 3 additions & 3 deletions ...els/events/CallDisconnectedEventData.java → ...ation/models/events/CallDisconnected.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

import com.azure.core.annotation.Immutable;

/** The CallDisconnectedEventData model. */
/** The CallDisconnected model. */
@Immutable
public final class CallDisconnectedEventData extends CallAutomationEventData {
private CallDisconnectedEventData() {
public final class CallDisconnected extends CallAutomationEventBase {
private CallDisconnected() {
}
}
6 changes: 3 additions & 3 deletions ...on/models/events/PlayFailedEventData.java → ...n/models/events/CallTransferAccepted.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
import com.azure.core.annotation.Immutable;
import com.fasterxml.jackson.annotation.JsonProperty;

/** The PlayFailedEventData model. */
/** The CallTransferAccepted model. */
@Immutable
public final class PlayFailedEventData extends CallAutomationEventDataWithReasonCode {
public final class CallTransferAccepted extends CallAutomationEventBase {
/*
* Contains the resulting SIP code/sub-code and message from NGC services.
*/
@JsonProperty(value = "resultInformation")
private final ResultInformation resultInformation;

private PlayFailedEventData() {
private CallTransferAccepted() {
this.resultInformation = null;
}

Expand Down
6 changes: 3 additions & 3 deletions ...models/events/PlayCompletedEventData.java → ...ion/models/events/CallTransferFailed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
import com.azure.core.annotation.Immutable;
import com.fasterxml.jackson.annotation.JsonProperty;

/** The PlayCompletedEventData model. */
/** The CallTransferFailed model. */
@Immutable
public final class PlayCompletedEventData extends CallAutomationEventDataWithReasonCode {
public final class CallTransferFailed extends CallAutomationEventBase {
/*
* Contains the resulting SIP code/sub-code and message from NGC services.
*/
@JsonProperty(value = "resultInformation")
private final ResultInformation resultInformation;

private PlayCompletedEventData() {
private CallTransferFailed() {
this.resultInformation = null;
}

Expand Down
4 changes: 2 additions & 2 deletions ...nuousDtmfRecognitionStoppedEventData.java → ...nts/ContinuousDtmfRecognitionStopped.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/** The ContinuousDtmfRecognitionStopped model. */
@Immutable
public final class ContinuousDtmfRecognitionStoppedEventData extends CallAutomationEventData {
public final class ContinuousDtmfRecognitionStopped extends CallAutomationEventBase {

/*
* Contains the resulting SIP code/sub-code and message from NGC services.
Expand All @@ -19,7 +19,7 @@ public final class ContinuousDtmfRecognitionStoppedEventData extends CallAutomat
/**
* Constructor for ContinuousDtmfRecognitionToneReceived
*/
public ContinuousDtmfRecognitionStoppedEventData() {
public ContinuousDtmfRecognitionStopped() {
resultInformation = null;
}

Expand Down
4 changes: 2 additions & 2 deletions ...usDtmfRecognitionToneFailedEventData.java → .../ContinuousDtmfRecognitionToneFailed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/** The ContinuousDtmfRecognitionToneFailed model. */
@Immutable
public final class ContinuousDtmfRecognitionToneFailedEventData extends CallAutomationEventData {
public final class ContinuousDtmfRecognitionToneFailed extends CallAutomationEventBase {

/*
* Contains the resulting SIP code/sub-code and message from NGC services.
Expand All @@ -19,7 +19,7 @@ public final class ContinuousDtmfRecognitionToneFailedEventData extends CallAuto
/**
* Constructor for ContinuousDtmfRecognitionToneReceived
*/
public ContinuousDtmfRecognitionToneFailedEventData() {
public ContinuousDtmfRecognitionToneFailed() {
resultInformation = null;
}

Expand Down
4 changes: 2 additions & 2 deletions ...DtmfRecognitionToneReceivedEventData.java → ...ontinuousDtmfRecognitionToneReceived.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/** The ContinuousDtmfRecognitionToneReceived model. */
@Immutable
public final class ContinuousDtmfRecognitionToneReceivedEventData extends CallAutomationEventData {
public final class ContinuousDtmfRecognitionToneReceived extends CallAutomationEventBase {

/*
* Information about Tone.
Expand All @@ -26,7 +26,7 @@ public final class ContinuousDtmfRecognitionToneReceivedEventData extends CallAu
/**
* Constructor for ContinuousDtmfRecognitionToneReceived
*/
public ContinuousDtmfRecognitionToneReceivedEventData() {
public ContinuousDtmfRecognitionToneReceived() {
toneInfo = null;
resultInformation = null;
}
Expand Down
Loading