From 8253dc6f4bcc7afca54c84efff24f77c170b6f38 Mon Sep 17 00:00:00 2001 From: richardcho-msft <95773682+richardcho-msft@users.noreply.github.com> Date: Thu, 16 Feb 2023 08:58:46 -0800 Subject: [PATCH] update based on latest swagger (#34197) * update based on latest swagger * api changes --- .../src/CallAutomationClient.cs | 4 ++-- .../src/CallConnection.cs | 7 ++----- .../Models/AddParticipantRequestInternal.Serialization.cs | 5 ----- .../src/Generated/Models/AddParticipantRequestInternal.cs | 5 ----- .../Azure.Communication.CallAutomation/src/autorest.md | 2 +- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs b/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs index f492b4bf99d4a..6bfcaa17d5472 100644 --- a/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs +++ b/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs @@ -632,7 +632,7 @@ private CreateCallRequestInternal CreateCallRequest(CreateCallOptions options) ? null : new PhoneNumberIdentifierModel(options?.CallInvite?.SourceCallerIdNumber?.PhoneNumber), SourceDisplayName = options?.CallInvite?.SourceDisplayName, - SourceIdentity = CommunicationIdentifierSerializer.Serialize(Source), + SourceIdentity = Source == null ? null : CommunicationIdentifierSerializer.Serialize(Source), }; // Add custom cognitive service domain name if (options.AzureCognitiveServicesEndpointUrl != null) @@ -704,7 +704,7 @@ public virtual CallConnection GetCallConnection(string callConnectionId) scope.Start(); try { - return new CallConnection(callConnectionId, CallConnectionRestClient, CallMediaRestClient, _clientDiagnostics, EventProcessor, Source); + return new CallConnection(callConnectionId, CallConnectionRestClient, CallMediaRestClient, _clientDiagnostics, EventProcessor); } catch (Exception ex) { diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs b/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs index 6b4da8f2c9268..49f19df4af8be 100644 --- a/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs +++ b/sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs @@ -20,21 +20,19 @@ public class CallConnection internal CallConnectionRestClient RestClient { get; } internal CallMediaRestClient CallMediaRestClient { get; } internal EventProcessor EventProcessor { get; } - internal CommunicationUserIdentifier Source { get; } /// /// The call connection id. /// public virtual string CallConnectionId { get; internal set; } - internal CallConnection(string callConnectionId, CallConnectionRestClient callConnectionRestClient, CallMediaRestClient callCallMediaRestClient, ClientDiagnostics clientDiagnostics, EventProcessor eventProcessor, CommunicationUserIdentifier source = null) + internal CallConnection(string callConnectionId, CallConnectionRestClient callConnectionRestClient, CallMediaRestClient callCallMediaRestClient, ClientDiagnostics clientDiagnostics, EventProcessor eventProcessor) { CallConnectionId = callConnectionId; RestClient = callConnectionRestClient; CallMediaRestClient = callCallMediaRestClient; _clientDiagnostics = clientDiagnostics; EventProcessor = eventProcessor; - Source = source; } /// Initializes a new instance of for mocking. @@ -416,7 +414,7 @@ public virtual Response AddParticipant(AddParticipantOptio } } - private AddParticipantRequestInternal CreateAddParticipantRequest(AddParticipantOptions options) + private static AddParticipantRequestInternal CreateAddParticipantRequest(AddParticipantOptions options) { // validate ParticipantToAdd is not null Argument.AssertNotNull(options.ParticipantToAdd, nameof(options.ParticipantToAdd)); @@ -427,7 +425,6 @@ private AddParticipantRequestInternal CreateAddParticipantRequest(AddParticipant ? null : new PhoneNumberIdentifierModel(options.ParticipantToAdd.SourceCallerIdNumber.PhoneNumber), SourceDisplayName = options.ParticipantToAdd.SourceDisplayName, - SourceIdentity = Source == null ? null : CommunicationIdentifierSerializer.Serialize(Source), OperationContext = options.OperationContext == default ? Guid.NewGuid().ToString() : options.OperationContext }; diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/AddParticipantRequestInternal.Serialization.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/AddParticipantRequestInternal.Serialization.cs index 5c45868cdce92..e3e8af2d22aac 100644 --- a/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/AddParticipantRequestInternal.Serialization.cs +++ b/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/AddParticipantRequestInternal.Serialization.cs @@ -25,11 +25,6 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("sourceDisplayName"); writer.WriteStringValue(SourceDisplayName); } - if (Optional.IsDefined(SourceIdentity)) - { - writer.WritePropertyName("sourceIdentity"); - writer.WriteObjectValue(SourceIdentity); - } writer.WritePropertyName("participantToAdd"); writer.WriteObjectValue(ParticipantToAdd); if (Optional.IsDefined(InvitationTimeoutInSeconds)) diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/AddParticipantRequestInternal.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/AddParticipantRequestInternal.cs index 306aad3e12ee1..82fe3f19ef940 100644 --- a/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/AddParticipantRequestInternal.cs +++ b/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/AddParticipantRequestInternal.cs @@ -34,11 +34,6 @@ public AddParticipantRequestInternal(CommunicationIdentifierModel participantToA /// adding a PSTN participant or teams user. Note: Will not update the display name in the roster. /// public string SourceDisplayName { get; set; } - /// - /// (Optional) The identifier of the source of the call for this invite operation. If SourceDisplayName - /// is not set, the display name of the source will be used by default when adding a PSTN participant or teams user. - /// - public CommunicationIdentifierModel SourceIdentity { get; set; } /// The participant to invite. public CommunicationIdentifierModel ParticipantToAdd { get; } /// diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/autorest.md b/sdk/communication/Azure.Communication.CallAutomation/src/autorest.md index 354e9e7343eb0..0a67c84d99d0b 100644 --- a/sdk/communication/Azure.Communication.CallAutomation/src/autorest.md +++ b/sdk/communication/Azure.Communication.CallAutomation/src/autorest.md @@ -10,7 +10,7 @@ tag: package-2023-01-15-preview model-namespace: false require: - - https://github.com/williamzhao87/azure-rest-api-specs/blob/cb2cd38aa4a7258e59a912edbb21a21468fb9c6f/specification/communication/data-plane/CallAutomation/readme.md + - https://github.com/williamzhao87/azure-rest-api-specs/blob/0d0cd5af40aa17af76ce0307ac5512351c38e3bc/specification/communication/data-plane/CallAutomation/readme.md title: Azure Communication Services generation1-convenience-client: true