Feedback Update 2 (#30378)

* Feedback Update 2
- Chagned all names into Call Automation (Except namespace)
- CallingServerEventBase -> CallAutomationEventBase
- CallAutomationEventBase to have common properties of ccid, scid, CorrelationId
- CallAutomationEventBase Setter to internal set
- Hangup -> HangUp (Feedback from review)
- ServerCallingModelFactory -> CallAutomationModelFactory
- All Models (Such as FileSource, CallSource, ...Options) required property now have private settter (Guidelines from Azure)
- Updated Samples

* - Added events to model factory
- All model factory method to take default values

* - Hiding AcsEventType

* - Updated APIDoc

Co-authored-by: Min Woo Lee 🧊 <77083090+minwoolee-ms@users.noreply.github.com>

Author: minwoolee-msft

sdk/communication/Azure.Communication.CallingServer/CHANGELOG.md

@@ -23,7 +23,7 @@
 - Downloading a recording from a different region no longer fails authentication
 
 ## 1.0.0-beta.1 (2021-06-24)
-This is the first release of Azure Communication Service Calling Server. For more information, please see the [README][read_me].
+This is the first release of Azure Communication Service Call Automation. For more information, please see the [README][read_me].
 
 This is a Public Preview version, so breaking changes are possible in subsequent releases as we improve the product. To provide feedback, please submit an issue in our [Azure SDK for .NET GitHub repo](https://github.com/Azure/azure-sdk-for-net/issues).
 

sdk/communication/Azure.Communication.CallingServer/README.md

@@ -1,12 +1,12 @@
-# Azure Communication CallingServer client library for .NET
+# Azure Communication CallAutomation client library for .NET
 
-This package contains a C# SDK for Azure Communication Services for Calling.
+This package contains a C# SDK for Azure Communication Call Automation.
 
 [Source code][source] |[Product documentation][product_docs]
 ## Getting started
 
 ### Install the package
-Install the Azure Communication CallingServer client library for .NET with [NuGet][nuget]:
+Install the Azure Communication CallAutomation client library for .NET with [NuGet][nuget]:
 
 ```dotnetcli
 dotnet add package Azure.Communication.CallingServer --prerelease
@@ -18,7 +18,7 @@ You need an [Azure subscription][azure_sub] and a [Communication Service Resourc
 To create a new Communication Service, you can use the [Azure Portal][communication_resource_create_portal], the [Azure PowerShell][communication_resource_create_power_shell], or the [.NET management client library][communication_resource_create_net].
 
 ### Key concepts
-`CallingServerClient` provides the functionality to answer incoming call or initialize an outbound call.
+`CallAutomationClient` provides the functionality to answer incoming call or initialize an outbound call.
 
 ### Using statements
 ```C#
@@ -28,31 +28,31 @@ using Azure.Communication.CallingServer;
 ```
 
 ### Authenticate the client
-Calling server client can be authenticated using the connection string acquired from an Azure Communication Resource in the [Azure Portal][azure_portal].
+Call Automation client can be authenticated using the connection string acquired from an Azure Communication Resource in the [Azure Portal][azure_portal].
 
 ```C#
 var connectionString = "<connection_string>"; // Find your Communication Services resource in the Azure portal
-CallingServerClient callingServerClient = new CallingServerClient(connectionString);
+CallAutomationClient callAutomationClient = new CallAutomationClient(connectionString);
 ```
 
 Or alternatively using a valid Active Directory token.
 ```C#
 var endpoint = new Uri("https://my-resource.communication.azure.com");
 TokenCredential tokenCredential = new DefaultAzureCredential();
-var client = new CallingServerClient(endpoint, tokenCredential);
+var client = new CallAutomationClient(endpoint, tokenCredential);
 ```
 
 ## Examples
 ### Make a call to a phone number recipient
-To make an outbound call, call the `CreateCall` or `CreateCallAsync` function from the `CallingServerClient`.
+To make an outbound call, call the `CreateCall` or `CreateCallAsync` function from the `CallAutomationClient`.
 ```C#
 CallSource callSource = new CallSource(
        new CommunicationUserIdentifier("<source-identifier>"), // Your Azure Communication Resource Guid Id used to make a Call
        );
 callSource.CallerId = new PhoneNumberIdentifier("<caller-id-phonenumber>") // E.164 formatted recipient phone number
 ```
 ```C#
-CreateCallResult createCallResult = await callingServerClient.CreateCallAsync(
+CreateCallResult createCallResult = await callAutomationClient.CreateCallAsync(
     source: callSource,
     targets: new List<CommunicationIdentifier>() { new PhoneNumberIdentifier("<targets-phone-number>") }, // E.164 formatted recipient phone number
     callbackEndpoint: new Uri(TestEnvironment.AppCallbackUrl)

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

@@ -5,22 +5,22 @@ languages:
 products:
 - azure
 - azure-communication-services
-name: Azure Communication CallingServer samples for .NET
+name: Azure Communication CallAutomation samples for .NET
 description: Samples for the Azure.Communication.CallingServer client library
 ---
 
-# Azure Communication CallingServer SDK samples
+# Azure Communication CallAutomation SDK samples
 
-Azure Communication CallingServer is a client library that provides the functionality to make call between user identities.
+Azure Communication CallAutomation is a client library that provides the functionality to make call between user identities.
 To get started you will need to have an Azure Subscription. Once you have this you can go into the Azure portal and create Azure Communication Services resource. The page will give you necessary information to be able to use the sample codes here such as connections string, shared access key, etc.
 
 This client library allows to do following operations:
  - Create a Call from a Azure Communication Resource identity to a phone number
  - Specify request payload for the created call.
 
  #### You can find samples for each of these functions below.
- - CreateCall [synchronously][sample_servercalling] or [asynchronously][sample_servercalling_async]
+ - CreateCall [synchronously][sample_callautomation] or [asynchronously][sample_callautomation_async]
 
 <!-- LINKS -->
-[sample_servercalling]: https://github.com/Azure/azure-sdk-for-net/blob/a20e269162fa88a43e5ba0e5bb28f2e76c74a484/sdk/communication/Azure.Communication.CallingServer/samples/Sample1_CreateCall.md
-[sample_servercalling_async]: https://github.com/Azure/azure-sdk-for-net/blob/a20e269162fa88a43e5ba0e5bb28f2e76c74a484/sdk/communication/Azure.Communication.CallingServer/samples/Sample1_CreateCallAsync.md
+[sample_callautomation]: https://github.com/Azure/azure-sdk-for-net/blob/a20e269162fa88a43e5ba0e5bb28f2e76c74a484/sdk/communication/Azure.Communication.CallingServer/samples/Sample1_CreateCall.md
+[sample_callautomation_async]: https://github.com/Azure/azure-sdk-for-net/blob/a20e269162fa88a43e5ba0e5bb28f2e76c74a484/sdk/communication/Azure.Communication.CallingServer/samples/Sample1_CreateCallAsync.md

sdk/communication/Azure.Communication.CallingServer/samples/README.md

@@ -4,31 +4,31 @@ This sample demonstrates how to make a call to a phone number recipient.
 
 To get started you'll need a Communication Service Resource.  See [README][README] for prerequisites and instructions.
 
-## Creating a `CallingServerClient`
+## Creating a `CallAutomationClient`
 
-CallingServer client can be authenticated using the connection string acquired from an Azure Communication Resource in the Azure Portal.
+CallAutomation client can be authenticated using the connection string acquired from an Azure Communication Resource in the Azure Portal.
 
 ```C#
 var connectionString = "<connection_string>"; // Find your Communication Services resource in the Azure portal
-CallingServerClient callingServerClient = new CallingServerClient(connectionString);
+CallAutomationClient callAutomationClient = new CallAutomationClient(connectionString);
 ```
 
 ## Make a call to a phone number recipient
 
-To make a call, call the `CreateCall` or `CreateCallAsync` function from the `CallClient`. The returned value is `CreateCallResponse` objects that contains the created Call's Id if succeed, else throws a RequestFailedException.
+To make a call, call the `CreateCall` function from the `CallAutomationClient`. The returned value is `CreateCallResult` objects that contains the created Call's Id if succeed, else throws a RequestFailedException.
 ```C#
-var createCallOption = new CreateCallOptions(
-       AlternateCallerId: new PhoneNumberIdentifier("<caller-id-phonenumber>") // E.164 formatted recipient phone number
+CallSource callSource = new CallSource(
+       new CommunicationUserIdentifier("<source-identifier>"), // Your Azure Communication Resource Guid Id used to make a Call
        );
+callSource.CallerId = new PhoneNumberIdentifier("<caller-id-phonenumber>") // E.164 formatted recipient phone number
 ```
 ```C#
-var callConnection = await callingServerClient.CreateCall(
-    source: new CommunicationUserIdentifier("<source-identifier>"), // Your Azure Communication Resource Guid Id used to make a Call
+CreateCallResult createCallResult = callAutomationClient.CreateCall(
+    source: callSource,
     targets: new List<CommunicationIdentifier>() { new PhoneNumberIdentifier("<targets-phone-number>") }, // E.164 formatted recipient phone number
-    callbackEndpoint: new Uri(TestEnvironment.AppCallbackUrl),
-    options: createCallOption // The options for creating a call.
+    callbackEndpoint: new Uri(TestEnvironment.AppCallbackUrl)
     );
-Console.WriteLine($"Call connection id: {callConnection.Value.CallConnectionId}");
+Console.WriteLine($"Call connection id: {createCallResult.CallProperties.CallConnectionId}");
 ```
 
 To see the full example source files, see:

sdk/communication/Azure.Communication.CallingServer/samples/Sample1_CreateCall.md

@@ -4,31 +4,31 @@ This sample demonstrates how to make a call to a recipient phone number.
 
 To get started you'll need a Communication Service Resource.  See [README][README] for prerequisites and instructions.
 
-## Creating a `CallingServerClient`
+## Creating a `CallAutomationClient`
 
-CallingServer client can be authenticated using the connection string acquired from an Azure Communication Resource in the Azure Portal.
+CallAutomation client can be authenticated using the connection string acquired from an Azure Communication Resource in the Azure Portal.
 
 ```C#
 var connectionString = "<connection_string>"; // Find your Communication Services resource in the Azure portal
-CallingServerClient callingServerClient = new CallingServerClient(connectionString);
+CallAutomationClient callAutomationClient = new CallAutomationClient(connectionString);
 ```
 
 ## Make a call to a phone number recipient
 
-To make a Call, call the `CreateCall` or `CreateCallAsync` function from the `CallClient`. The returned value is `CreateCallResponse` objects that contains the created Call's Id if succeed, else throws a RequestFailedException.
+To make a Call, call the `CreateCallAsync` function from the `CallClient`. The returned value is `CreateCallResult` objects that contains the created Call's Id if succeed, else throws a RequestFailedException.
 ```C#
-var createCallOption = new CreateCallOptions(
-       AlternateCallerId: new PhoneNumberIdentifier("<caller-id-phonenumber>") // E.164 formatted recipient phone number
+CallSource callSource = new CallSource(
+       new CommunicationUserIdentifier("<source-identifier>"), // Your Azure Communication Resource Guid Id used to make a Call
        );
+callSource.CallerId = new PhoneNumberIdentifier("<caller-id-phonenumber>") // E.164 formatted recipient phone number
 ```
-```C
-var callConnection = await callingServerClient.CreateCallAsync(
-    source: new CommunicationUserIdentifier("<source-identifier>"), // Your Azure Communication Resource Guid Id used to make a Call
+```C#
+CreateCallResult createCallResult = await callAutomationClient.CreateCallAsync(
+    source: callSource,
     targets: new List<CommunicationIdentifier>() { new PhoneNumberIdentifier("<targets-phone-number>") }, // E.164 formatted recipient phone number
-    callbackEndpoint: new Uri(TestEnvironment.AppCallbackUrl),
-    options: createCallOption // The options for creating a call.
+    callbackEndpoint: new Uri(TestEnvironment.AppCallbackUrl)
     );
-Console.WriteLine($"Call connection id: {callConnection.Value.CallConnectionId}");
+Console.WriteLine($"Call connection id: {createCallResult.CallProperties.CallConnectionId}");
 ```
 
 To see the full example source files, see:

sdk/communication/Azure.Communication.CallingServer/samples/Sample1_CreateCallAsync.md

@@ -13,7 +13,7 @@
 namespace Azure.Communication.CallingServer
 {
     /// <summary>
-    /// The Azure Communication Services Calling Server client.
+    /// The Azure Communication Services Call Automation client.
     /// </summary>
     public class CallAutomationClient
     {
@@ -54,6 +54,17 @@ public CallAutomationClient(Uri endpoint, TokenCredential credential, CallAutoma
                 Argument.CheckNotNull(credential, nameof(credential)),
                 options ?? new CallAutomationClientOptions())
         { }
+
+        /// <summary> Initializes a new instance of <see cref="CallAutomationClient"/> with custom PMA endpoint.</summary>
+        /// <param name="pmaEndpoint">Endpoint for PMA</param>
+        /// <param name="connectionString">Connection string acquired from the Azure Communication Services resource.</param>
+        /// <param name="options">Client option exposing <see cref="ClientOptions.Diagnostics"/>, <see cref="ClientOptions.Retry"/>, <see cref="ClientOptions.Transport"/>, etc.</param>
+        public CallAutomationClient(Uri pmaEndpoint, string connectionString, CallAutomationClientOptions options = default)
+        : this(
+        pmaEndpoint,
+        options ?? new CallAutomationClientOptions(),
+        ConnectionString.Parse(connectionString))
+        { }
         #endregion
 
         #region private constructors

sdk/communication/Azure.Communication.CallingServer/src/CallAutomationClient.cs

@@ -9,12 +9,12 @@
 namespace Azure.Communication.CallingServer
 {
     /// <summary>
-    /// The latest version of the Calling Server.
+    /// The latest version of the Call Automation.
     /// </summary>
     public class CallAutomationClientOptions : ClientOptions
     {
         /// <summary>
-        /// The latest version of the CallingServer service.
+        /// The latest version of the CallAutomation service.
         /// </summary>
         internal const ServiceVersion LatestVersion = ServiceVersion.V2022_04_07_Preview;
 
@@ -33,12 +33,12 @@ public CallAutomationClientOptions(ServiceVersion version = LatestVersion)
         }
 
         /// <summary>
-        /// The CallingServer service version.
+        /// The CallAutomation service version.
         /// </summary>
         public enum ServiceVersion
         {
             /// <summary>
-            /// The Beta of the CallingServer service.
+            /// The Beta of the CallAutomation service.
             /// </summary>
 #pragma warning disable CA1707 // Identifiers should not contain underscores
             V2022_04_07_Preview = 1

sdk/communication/Azure.Communication.CallingServer/src/CallAutomationClientOptions.cs

@@ -87,9 +87,9 @@ public virtual Response<CallConnectionProperties> GetProperties(CancellationToke
         /// <param name="forEveryone"> If true, this will terminate the call and hang up on all participants in this call. </param>
         /// <param name="cancellationToken"> The cancellation token. </param>
         /// <exception cref="RequestFailedException">The server returned an error. See <see cref="Exception.Message"/> for details returned from the server.</exception>
-        public virtual async Task<Response> HangupAsync(bool forEveryone, CancellationToken cancellationToken = default)
+        public virtual async Task<Response> HangUpAsync(bool forEveryone, CancellationToken cancellationToken = default)
         {
-            using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallConnection)}.{nameof(Hangup)}");
+            using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallConnection)}.{nameof(HangUp)}");
             scope.Start();
             try
             {
@@ -119,9 +119,9 @@ public virtual async Task<Response> HangupAsync(bool forEveryone, CancellationTo
         /// <param name="forEveryone"> If true, this will terminate the call and hang up on all participants in this call. </param>
         /// <param name="cancellationToken"> The cancellation token. </param>
         /// <exception cref="RequestFailedException">The server returned an error. See <see cref="Exception.Message"/> for details returned from the server.</exception>
-        public virtual Response Hangup(bool forEveryone, CancellationToken cancellationToken = default)
+        public virtual Response HangUp(bool forEveryone, CancellationToken cancellationToken = default)
         {
-            using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallConnection)}.{nameof(Hangup)}");
+            using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallConnection)}.{nameof(HangUp)}");
             scope.Start();
             try
             {