diff --git a/sdk/communication/azure-communication-callingserver/pom.xml b/sdk/communication/azure-communication-callingserver/pom.xml
index 869426072694..e452b3940a8e 100644
--- a/sdk/communication/azure-communication-callingserver/pom.xml
+++ b/sdk/communication/azure-communication-callingserver/pom.xml
@@ -59,7 +59,7 @@
com.azure
azure-communication-identity
- 1.1.1
+ 1.1.1
test
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java
index 27532e939d9b..f7e0f9b929f5 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java
@@ -316,12 +316,12 @@ private HttpPipeline createHttpPipeline(HttpClient httpClient) {
}
// Add required policies
- policyList.add(createHttpPipelineAuthPolicy());
String clientName = properties.getOrDefault(SDK_NAME, "UnknownName");
String clientVersion = properties.getOrDefault(SDK_VERSION, "UnknownVersion");
policyList.add(new UserAgentPolicy(applicationId, clientName, clientVersion, configuration));
policyList.add(new RequestIdPolicy());
policyList.add((retryPolicy == null) ? new RetryPolicy() : retryPolicy);
+ policyList.add(createHttpPipelineAuthPolicy());
policyList.add(new CookiePolicy());
// Add additional policies
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallParticipant.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallParticipant.java
index e7f87717f780..8d67860d7681 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallParticipant.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallParticipant.java
@@ -4,10 +4,12 @@
package com.azure.communication.callingserver.models;
import com.azure.communication.common.CommunicationIdentifier;
+import com.azure.core.annotation.Immutable;
/**
* The participant in a call.
*/
+@Immutable
public final class CallParticipant {
/**
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallRecordingStateResult.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallRecordingStateResult.java
index e27a78fdcc1c..1b02780805f1 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallRecordingStateResult.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallRecordingStateResult.java
@@ -3,11 +3,11 @@
package com.azure.communication.callingserver.models;
-import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Immutable;
import com.fasterxml.jackson.annotation.JsonProperty;
/** The result payload of get call recording state operation. */
-@Fluent
+@Immutable
public final class CallRecordingStateResult {
/*
* The state of the recording
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallingServerError.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallingServerError.java
index e888ff044c0d..8d2259cde82d 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallingServerError.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallingServerError.java
@@ -3,9 +3,12 @@
package com.azure.communication.callingserver.models;
+import com.azure.core.annotation.Immutable;
+
import java.util.List;
/** The Calling Server error. */
+@Immutable
public final class CallingServerError {
/*
* The error code.
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallingServerErrorException.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallingServerErrorException.java
index c7e0f62752f3..5b4732d65716 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallingServerErrorException.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallingServerErrorException.java
@@ -3,12 +3,14 @@
package com.azure.communication.callingserver.models;
+import com.azure.core.annotation.Immutable;
import com.azure.core.exception.HttpResponseException;
import com.azure.core.http.HttpResponse;
/**
* Exception thrown for an invalid response with {@link CallingServerError} information.
**/
+@Immutable
public final class CallingServerErrorException extends HttpResponseException {
/**
* Initializes a new instance of the CallingServerResponseException class.
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CancelAllMediaOperationsResult.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CancelAllMediaOperationsResult.java
index bb9c06d99170..0d19b25f77c2 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CancelAllMediaOperationsResult.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CancelAllMediaOperationsResult.java
@@ -3,7 +3,10 @@
package com.azure.communication.callingserver.models;
+import com.azure.core.annotation.Immutable;
+
/** The response payload of the cancel all media operations. */
+@Immutable
public final class CancelAllMediaOperationsResult {
/*
* The identifier.
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/JoinCallResult.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/JoinCallResult.java
index 513cd16ff638..2e57e3b3c898 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/JoinCallResult.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/JoinCallResult.java
@@ -3,7 +3,10 @@
package com.azure.communication.callingserver.models;
+import com.azure.core.annotation.Immutable;
+
/** The response payload of the join call operation. */
+@Immutable
public final class JoinCallResult {
/*
* The call connection id.
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/PlayAudioResult.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/PlayAudioResult.java
index f1c9b98fa4e5..a898dd168d30 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/PlayAudioResult.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/PlayAudioResult.java
@@ -3,7 +3,10 @@
package com.azure.communication.callingserver.models;
+import com.azure.core.annotation.Immutable;
+
/** The response payload for play audio operation. */
+@Immutable
public final class PlayAudioResult {
/*
* The identifier.
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/ResultInfo.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/ResultInfo.java
index 7f682c7c4601..6e65263260e4 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/ResultInfo.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/ResultInfo.java
@@ -3,7 +3,10 @@
package com.azure.communication.callingserver.models;
+import com.azure.core.annotation.Immutable;
+
/** Result info class to be used to report result status for actions/operations. */
+@Immutable
public final class ResultInfo {
/*
* The result code
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/StartCallRecordingResult.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/StartCallRecordingResult.java
index c77fd998a516..73acc2b978e1 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/StartCallRecordingResult.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/StartCallRecordingResult.java
@@ -3,7 +3,10 @@
package com.azure.communication.callingserver.models;
+import com.azure.core.annotation.Immutable;
+
/** The response payload of start call recording operation. */
+@Immutable
public final class StartCallRecordingResult {
/*
* The recording id
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/ToneInfo.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/ToneInfo.java
index 9c6889bceeb3..e15bd5949bed 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/ToneInfo.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/ToneInfo.java
@@ -3,7 +3,10 @@
package com.azure.communication.callingserver.models;
+import com.azure.core.annotation.Immutable;
+
/** The class to represent Tone info detail. */
+@Immutable
public final class ToneInfo {
/*
* The sequence id. This id can be used to determine if the same tone
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallConnectionStateChangedEvent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallConnectionStateChangedEvent.java
index f0caae6ba5e7..16c0658e2900 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallConnectionStateChangedEvent.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallConnectionStateChangedEvent.java
@@ -5,10 +5,12 @@
import com.azure.communication.callingserver.implementation.models.CallConnectionStateChangedEventInternal;
import com.azure.communication.callingserver.models.CallConnectionState;
+import com.azure.core.annotation.Immutable;
import com.azure.core.util.BinaryData;
/** The call connection state changed event. */
-public final class CallConnectionStateChangedEvent {
+@Immutable
+public final class CallConnectionStateChangedEvent extends CallingServerEventBase {
/*
* The server call id.
*/
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallRecordingStateChangeEvent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallRecordingStateChangeEvent.java
index ff057c1fedbb..317b7db464b3 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallRecordingStateChangeEvent.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallRecordingStateChangeEvent.java
@@ -5,12 +5,14 @@
import com.azure.communication.callingserver.implementation.models.CallRecordingStateChangeEventInternal;
import com.azure.communication.callingserver.models.CallRecordingState;
+import com.azure.core.annotation.Immutable;
import com.azure.core.util.BinaryData;
import java.time.OffsetDateTime;
/** The call recording state change event. */
-public final class CallRecordingStateChangeEvent {
+@Immutable
+public final class CallRecordingStateChangeEvent extends CallingServerEventBase {
/*
* The call recording id
*/
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java
index 9c8d68bfdd01..d054b8f7a795 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java
@@ -3,12 +3,14 @@
package com.azure.communication.callingserver.models.events;
+import com.azure.core.annotation.Immutable;
import com.azure.core.util.ExpandableStringEnum;
import com.fasterxml.jackson.annotation.JsonCreator;
import java.util.Collection;
/** Defines values for CallingServerEventType. */
+@Immutable
public final class CallingServerEventType extends ExpandableStringEnum {
/** The call connection state change event type. */
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/InviteParticipantResultEvent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/InviteParticipantResultEvent.java
index 21d4e00d597a..1b7b05a5c54b 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/InviteParticipantResultEvent.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/InviteParticipantResultEvent.java
@@ -7,10 +7,12 @@
import com.azure.communication.callingserver.implementation.models.InviteParticipantsResultEventInternal;
import com.azure.communication.callingserver.models.OperationStatus;
import com.azure.communication.callingserver.models.ResultInfo;
+import com.azure.core.annotation.Immutable;
import com.azure.core.util.BinaryData;
/** The invite participant result event. */
-public final class InviteParticipantResultEvent {
+@Immutable
+public final class InviteParticipantResultEvent extends CallingServerEventBase {
/*
* The result details.
*/
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ParticipantsUpdatedEvent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ParticipantsUpdatedEvent.java
index fca9c6c3bc3d..f7fffde2d5d5 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ParticipantsUpdatedEvent.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ParticipantsUpdatedEvent.java
@@ -7,6 +7,7 @@
import com.azure.communication.callingserver.implementation.models.CommunicationParticipantInternal;
import com.azure.communication.callingserver.implementation.models.ParticipantsUpdatedEventInternal;
import com.azure.communication.callingserver.models.CallParticipant;
+import com.azure.core.annotation.Immutable;
import com.azure.core.util.BinaryData;
import java.util.LinkedList;
@@ -15,6 +16,7 @@
/**
* The participants updated event.
*/
+@Immutable
public final class ParticipantsUpdatedEvent extends CallingServerEventBase {
/**
* The call connection id.
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/PlayAudioResultEvent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/PlayAudioResultEvent.java
index 9876a0967a0e..7f4149dc5409 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/PlayAudioResultEvent.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/PlayAudioResultEvent.java
@@ -7,10 +7,12 @@
import com.azure.communication.callingserver.implementation.models.PlayAudioResultEventInternal;
import com.azure.communication.callingserver.models.OperationStatus;
import com.azure.communication.callingserver.models.ResultInfo;
+import com.azure.core.annotation.Immutable;
import com.azure.core.util.BinaryData;
/** The play audio result event. */
-public final class PlayAudioResultEvent {
+@Immutable
+public final class PlayAudioResultEvent extends CallingServerEventBase {
/*
* The result details.
*/
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ToneReceivedEvent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ToneReceivedEvent.java
index 821a09140cb2..866fbcc4e0ae 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ToneReceivedEvent.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ToneReceivedEvent.java
@@ -5,10 +5,12 @@
import com.azure.communication.callingserver.implementation.models.ToneReceivedEventInternal;
import com.azure.communication.callingserver.models.ToneInfo;
+import com.azure.core.annotation.Immutable;
import com.azure.core.util.BinaryData;
/** The subscribe to tone event. */
-public final class ToneReceivedEvent {
+@Immutable
+public final class ToneReceivedEvent extends CallingServerEventBase {
/*
* The tone info.
*/
diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java
index bb1e1a5cf248..72213f806f30 100644
--- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java
+++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java
@@ -39,7 +39,7 @@ public class CallingServerTestBase extends TestBase {
protected static final String CONNECTION_STRING = Configuration.getGlobalConfiguration()
.get("COMMUNICATION_LIVETEST_STATIC_CONNECTION_STRING",
- "endpoint=https://acstestbot1.communication.azure.com/;accesskey=E0Oy7HRSLiMFyuXHQA/9nOYZu2Fc0ia9DxhHtsGhtHuc2RTan24ZAmTjxl5etgZW/+O3pGrXiEpazT81u3quzg==");
+ "endpoint=https://REDACTED.communication.azure.com/;accesskey=QWNjZXNzS2V5");
protected static final String RESOURCE_IDENTIFIER = Configuration.getGlobalConfiguration()
.get("COMMUNICATION_LIVETEST_STATIC_RESOURCE_IDENTIFIER",