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 5c36aeefc8b6..a4e369fbdf5e 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
@@ -90,7 +90,7 @@ public CallingServerClientBuilder pipeline(HttpPipeline pipeline) {
      * @return The updated {@link CallingServerClientBuilder} object.
      * @throws NullPointerException If {@code tokenCredential} is null.
      */
-    public CallingServerClientBuilder credential(TokenCredential tokenCredential) {
+    CallingServerClientBuilder credential(TokenCredential tokenCredential) {
         this.tokenCredential = Objects.requireNonNull(tokenCredential, "'tokenCredential' cannot be null.");
         return this;
     }
@@ -103,7 +103,7 @@ public CallingServerClientBuilder credential(TokenCredential tokenCredential) {
      * @return The updated {@link CallingServerClientBuilder} object.
      * @throws NullPointerException If {@code keyCredential} is null.
      */
-    public CallingServerClientBuilder credential(AzureKeyCredential keyCredential) {
+    CallingServerClientBuilder credential(AzureKeyCredential keyCredential) {
         this.azureKeyCredential = Objects.requireNonNull(keyCredential, "'keyCredential' cannot be null.");
         return this;
     }
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantResultEventInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantResultEventInternal.java
index b4e95f3ea95d..db5b23f241c5 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantResultEventInternal.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantResultEventInternal.java
@@ -26,7 +26,7 @@ public final class AddParticipantResultEventInternal {
     /*
      * The status of the operation
      */
-    @JsonProperty(value = "status")
+    @JsonProperty(value = "status", required = true)
     private OperationStatus status;
 
     /**
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallConnectionStateChangedEventInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallConnectionStateChangedEventInternal.java
index 3e29101ece8f..a9fc9dde843b 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallConnectionStateChangedEventInternal.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallConnectionStateChangedEventInternal.java
@@ -26,7 +26,7 @@ public final class CallConnectionStateChangedEventInternal {
     /*
      * The call connection state.
      */
-    @JsonProperty(value = "callConnectionState")
+    @JsonProperty(value = "callConnectionState", required = true)
     private CallConnectionState callConnectionState;
 
     /**
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallParticipantInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallParticipantInternal.java
index 77f6cf0adbc7..f6bc1a7fa0ee 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallParticipantInternal.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallParticipantInternal.java
@@ -25,8 +25,8 @@ public final class CallParticipantInternal {
     /*
      * Is participant muted
      */
-    @JsonProperty(value = "isMuted")
-    private Boolean isMuted;
+    @JsonProperty(value = "isMuted", required = true)
+    private boolean isMuted;
 
     /**
      * Get the identifier property: Communication identifier of the participant.
@@ -73,7 +73,7 @@ public CallParticipantInternal setParticipantId(String participantId) {
      *
      * @return the isMuted value.
      */
-    public Boolean isMuted() {
+    public boolean isMuted() {
         return this.isMuted;
     }
 
@@ -83,7 +83,7 @@ public Boolean isMuted() {
      * @param isMuted the isMuted value to set.
      * @return the CallParticipantInternal object itself.
      */
-    public CallParticipantInternal setIsMuted(Boolean isMuted) {
+    public CallParticipantInternal setIsMuted(boolean isMuted) {
         this.isMuted = isMuted;
         return this;
     }
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingPropertiesInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingPropertiesInternal.java
index be47d9b17f41..d84362e0a54a 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingPropertiesInternal.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingPropertiesInternal.java
@@ -14,7 +14,7 @@ public final class CallRecordingPropertiesInternal {
     /*
      * The state of the recording
      */
-    @JsonProperty(value = "recordingState")
+    @JsonProperty(value = "recordingState", required = true)
     private CallRecordingState recordingState;
 
     /**
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingStateChangeEventInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingStateChangeEventInternal.java
index 8501c53e647b..3c0d36fc080e 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingStateChangeEventInternal.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingStateChangeEventInternal.java
@@ -21,13 +21,13 @@ public final class CallRecordingStateChangeEventInternal {
     /*
      * The state of the recording
      */
-    @JsonProperty(value = "state")
+    @JsonProperty(value = "state", required = true)
     private CallRecordingState state;
 
     /*
      * The time of the recording started
      */
-    @JsonProperty(value = "startDateTime")
+    @JsonProperty(value = "startDateTime", required = true)
     private OffsetDateTime startDateTime;
 
     /*
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CancelAllMediaOperationsResultInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CancelAllMediaOperationsResultInternal.java
index 5b2abaceebda..316a9f1ed1dc 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CancelAllMediaOperationsResultInternal.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CancelAllMediaOperationsResultInternal.java
@@ -20,7 +20,7 @@ public final class CancelAllMediaOperationsResultInternal {
     /*
      * The status of the operation
      */
-    @JsonProperty(value = "status")
+    @JsonProperty(value = "status", required = true)
     private OperationStatus status;
 
     /*
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultEventInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultEventInternal.java
index 9a93fe0027d6..4b5ff93656fb 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultEventInternal.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultEventInternal.java
@@ -26,7 +26,7 @@ public final class PlayAudioResultEventInternal {
     /*
      * The status of the operation
      */
-    @JsonProperty(value = "status")
+    @JsonProperty(value = "status", required = true)
     private OperationStatus status;
 
     /**
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultInternal.java
index 186ef3c6dbc6..47e2a20ccccd 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultInternal.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultInternal.java
@@ -20,7 +20,7 @@ public final class PlayAudioResultInternal {
     /*
      * The status of the operation
      */
-    @JsonProperty(value = "status")
+    @JsonProperty(value = "status", required = true)
     private OperationStatus status;
 
     /*
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ResultInfoInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ResultInfoInternal.java
index d44a25479867..b6a69a059951 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ResultInfoInternal.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ResultInfoInternal.java
@@ -11,71 +11,65 @@
 @Fluent
 public final class ResultInfoInternal {
     /*
-     * Gets or sets the result code
-     * For synchronous failures, this maps one-to-one with HTTP responses. For
-     * asynchronous failures or messages, it is contextual.
+     * The result code associated with the operation.
      */
-    @JsonProperty(value = "code")
-    private Integer code;
+    @JsonProperty(value = "code", required = true)
+    private int code;
 
     /*
-     * Gets or sets the result subcode.
-     * The subcode further classifies a failure. For example.
+     * The subcode that further classifies the result.
      */
-    @JsonProperty(value = "subcode")
-    private Integer subcode;
+    @JsonProperty(value = "subcode", required = true)
+    private int subcode;
 
     /*
-     * Gets or sets the message
      * The message is a detail explanation of subcode.
      */
     @JsonProperty(value = "message")
     private String message;
 
     /**
-     * Get the code property: Gets or sets the result code For synchronous failures, this maps one-to-one with HTTP
-     * responses. For asynchronous failures or messages, it is contextual.
+     * Get the code property: The result code associated with the operation.
      *
      * @return the code value.
      */
-    public Integer getCode() {
+    public int getCode() {
         return this.code;
     }
 
     /**
-     * Set the code property: Gets or sets the result code For synchronous failures, this maps one-to-one with HTTP
-     * responses. For asynchronous failures or messages, it is contextual.
+     * Set the code property: The result code associated with the operation.
      *
      * @param code the code value to set.
      * @return the ResultInfoInternal object itself.
      */
-    public ResultInfoInternal setCode(Integer code) {
+    public ResultInfoInternal setCode(int code) {
         this.code = code;
         return this;
     }
 
     /**
-     * Get the subcode property: Gets or sets the result subcode. The subcode further classifies a failure. For example.
+     * Get the subcode property: The subcode that further classifies the result.
      *
      * @return the subcode value.
      */
-    public Integer getSubcode() {
+    public int getSubcode() {
         return this.subcode;
     }
 
     /**
-     * Set the subcode property: Gets or sets the result subcode. The subcode further classifies a failure. For example.
+     * Set the subcode property: The subcode that further classifies the result.
      *
      * @param subcode the subcode value to set.
      * @return the ResultInfoInternal object itself.
      */
-    public ResultInfoInternal setSubcode(Integer subcode) {
+    public ResultInfoInternal setSubcode(int subcode) {
         this.subcode = subcode;
         return this;
     }
 
     /**
-     * Get the message property: Gets or sets the message The message is a detail explanation of subcode.
+     * Get the message property: The message is a detail explanation of subcode.
      *
      * @return the message value.
      */
@@ -84,7 +78,7 @@ public String getMessage() {
     }
 
     /**
-     * Set the message property: Gets or sets the message The message is a detail explanation of subcode.
+     * Set the message property: The message is a detail explanation of subcode.
      *
      * @param message the message value to set.
      * @return the ResultInfoInternal object itself.
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ToneInfoInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ToneInfoInternal.java
index a3d17cd58efc..95f9daec5334 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ToneInfoInternal.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ToneInfoInternal.java
@@ -8,47 +8,46 @@
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-/** Gets or sets the tone info. */
+/** The information about the tone. */
 @Fluent
 public final class ToneInfoInternal {
     /*
-     * Gets or sets the sequence id. This id can be used to determine if the
-     * same tone
-     * was played multiple times or if any tones were missed.
+     * The sequence id which can be used to determine if the same tone was
+     * played multiple times or if any tones were missed.
      */
-    @JsonProperty(value = "sequenceId")
-    private Integer sequenceId;
+    @JsonProperty(value = "sequenceId", required = true)
+    private int sequenceId;
 
     /*
-     * Gets or sets the tone detected.
+     * The tone value.
      */
-    @JsonProperty(value = "tone")
+    @JsonProperty(value = "tone", required = true)
     private ToneValue tone;
 
     /**
-     * Get the sequenceId property: Gets or sets the sequence id. This id can be used to determine if the same tone was
-     * played multiple times or if any tones were missed.
+     * Get the sequenceId property: The sequence id which can be used to determine if the same tone was played multiple
+     * times or if any tones were missed.
      *
      * @return the sequenceId value.
      */
-    public Integer getSequenceId() {
+    public int getSequenceId() {
         return this.sequenceId;
     }
 
     /**
-     * Set the sequenceId property: Gets or sets the sequence id. This id can be used to determine if the same tone was
-     * played multiple times or if any tones were missed.
+     * Set the sequenceId property: The sequence id which can be used to determine if the same tone was played multiple
+     * times or if any tones were missed.
      *
      * @param sequenceId the sequenceId value to set.
      * @return the ToneInfoInternal object itself.
      */
-    public ToneInfoInternal setSequenceId(Integer sequenceId) {
+    public ToneInfoInternal setSequenceId(int sequenceId) {
         this.sequenceId = sequenceId;
         return this;
     }
 
     /**
-     * Get the tone property: Gets or sets the tone detected.
+     * Get the tone property: The tone value.
      *
      * @return the tone value.
      */
@@ -57,7 +56,7 @@ public ToneValue getTone() {
     }
 
     /**
-     * Set the tone property: Gets or sets the tone detected.
+     * Set the tone property: The tone value.
      *
      * @param tone the tone value to set.
      * @return the ToneInfoInternal object itself.
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ToneReceivedEventInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ToneReceivedEventInternal.java
index cc0f5897123a..ebb63e9288b5 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ToneReceivedEventInternal.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ToneReceivedEventInternal.java
@@ -13,7 +13,7 @@ public final class ToneReceivedEventInternal {
     /*
      * The tone info.
      */
-    @JsonProperty(value = "toneInfo")
+    @JsonProperty(value = "toneInfo", required = true)
     private ToneInfoInternal toneInfo;
 
     /*
diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/AddParticipantResultEvent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/AddParticipantResultEvent.java
index f3e2758ba268..cca79cedacb1 100644
--- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/AddParticipantResultEvent.java
+++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/AddParticipantResultEvent.java
@@ -63,7 +63,7 @@ public OperationStatus getStatus() {
      *                         communications related to this operation
      * @param status the status value.
      */
-    public AddParticipantResultEvent(ResultInfo resultInfo, String operationContext, OperationStatus status) {
+    AddParticipantResultEvent(ResultInfo resultInfo, String operationContext, OperationStatus status) {
         this.resultInfo = resultInfo;
         this.operationContext = operationContext;
         this.status = status;
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 16c0658e2900..58567398f598 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
@@ -60,7 +60,7 @@ public CallConnectionState getCallConnectionState() {
      * @param callConnectionId the callConnectionId value.
      * @param callConnectionState the callConnectionState value.
      */
-    public CallConnectionStateChangedEvent(
+    CallConnectionStateChangedEvent(
         String serverCallId,
         String callConnectionId,
         CallConnectionState callConnectionState) {
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 317b7db464b3..dc541cac5d5d 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
@@ -77,7 +77,7 @@ public String getServerCallId() {
      * @param startDateTime the startDateTime value.
      * @param serverCallId the serverCallId value.
      */
-    public CallRecordingStateChangeEvent(
+    CallRecordingStateChangeEvent(
         String recordingId,
         CallRecordingState state,
         OffsetDateTime startDateTime,
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 0029e0b26b33..0e1a2003f6d5 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
@@ -54,7 +54,7 @@ public List<CallParticipant> getParticipants() {
      * @param participants The participants
      * @throws IllegalArgumentException if any parameter is null or empty.
      */
-    public ParticipantsUpdatedEvent(String callConnectionId, List<CallParticipant> participants) {
+    ParticipantsUpdatedEvent(String callConnectionId, List<CallParticipant> participants) {
         if (callConnectionId == null || callConnectionId.isEmpty()) {
             throw new IllegalArgumentException("object callConnectionId cannot be null or empty");
         }
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 7f4149dc5409..02041c8dad6c 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
@@ -63,7 +63,7 @@ public OperationStatus getStatus() {
      *                         communications related to this operation
      * @param status the status value.
      */
-    public PlayAudioResultEvent(ResultInfo resultInfo, String operationContext, OperationStatus status) {
+    PlayAudioResultEvent(ResultInfo resultInfo, String operationContext, OperationStatus status) {
         this.resultInfo = resultInfo;
         this.operationContext = operationContext;
         this.status = status;
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 866fbcc4e0ae..c5075b016fe5 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
@@ -45,7 +45,7 @@ public String getCallConnectionId() {
      * @param toneInfo the toneInfo value.
      * @param callConnectionId the callConnectionId value.
      */
-    public ToneReceivedEvent(ToneInfo toneInfo, String callConnectionId) {
+    ToneReceivedEvent(ToneInfo toneInfo, String callConnectionId) {
         this.toneInfo = toneInfo;
         this.callConnectionId = callConnectionId;
     }
diff --git a/sdk/communication/azure-communication-callingserver/swagger/README.md b/sdk/communication/azure-communication-callingserver/swagger/README.md
index b72eccc6f802..88e65c445522 100644
--- a/sdk/communication/azure-communication-callingserver/swagger/README.md
+++ b/sdk/communication/azure-communication-callingserver/swagger/README.md
@@ -33,7 +33,7 @@ To update generated files for calling service, run the following command
 ``` yaml
 tag: package-2021-06-15-preview
 require:
-    - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5ffa6f90f1916423bd09855f1bfe32d2bd78ecab/specification/communication/data-plane/CallingServer/readme.md
+    - https://github.com/Azure/azure-rest-api-specs/blob/b4b5fa5ee23f8cce9e1ade4a82076b4c34b25651/specification/communication/data-plane/CallingServer/readme.md
 java: true
 output-folder: ..\
 license-header: MICROSOFT_MIT_SMALL