diff --git a/sdk/signalr/azure-resourcemanager-signalr/CHANGELOG.md b/sdk/signalr/azure-resourcemanager-signalr/CHANGELOG.md
index 5f391c3d5003..01a10c5e6a79 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/CHANGELOG.md
+++ b/sdk/signalr/azure-resourcemanager-signalr/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Release History
 
-## 1.0.0-beta.4 (Unreleased)
+## 1.0.0-beta.1 (2022-02-22)
+
+- Azure Resource Manager SignalR client library for Java. This package contains Microsoft Azure SDK for SignalR Management SDK. REST API for Azure SignalR Service. Package tag package-2021-10-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ### Features Added
 
diff --git a/sdk/signalr/azure-resourcemanager-signalr/README.md b/sdk/signalr/azure-resourcemanager-signalr/README.md
index d2438293701e..c4acb117c3ea 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/README.md
+++ b/sdk/signalr/azure-resourcemanager-signalr/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-signalr</artifactId>
-    <version>1.0.0-beta.3</version>
+    <version>1.0.0-beta.4</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/SignalRManager.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/SignalRManager.java
index ece20bd022b0..411f7325cdc7 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/SignalRManager.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/SignalRManager.java
@@ -192,7 +192,7 @@ public SignalRManager authenticate(TokenCredential credential, AzureProfile prof
                 .append("-")
                 .append("com.azure.resourcemanager.signalr")
                 .append("/")
-                .append("1.0.0-beta.3");
+                .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/OperationsClient.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/OperationsClient.java
index a54c9407234d..de7d5c12fab9 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/OperationsClient.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/OperationsClient.java
@@ -17,7 +17,7 @@ public interface OperationsClient {
      *
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<OperationInner> list();
@@ -29,7 +29,7 @@ public interface OperationsClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<OperationInner> list(Context context);
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRPrivateEndpointConnectionsClient.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRPrivateEndpointConnectionsClient.java
index 6e41b9466be9..a3380552b956 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRPrivateEndpointConnectionsClient.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRPrivateEndpointConnectionsClient.java
@@ -26,7 +26,7 @@ public interface SignalRPrivateEndpointConnectionsClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<PrivateEndpointConnectionInner> list(String resourceGroupName, String resourceName);
@@ -41,7 +41,7 @@ public interface SignalRPrivateEndpointConnectionsClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<PrivateEndpointConnectionInner> list(String resourceGroupName, String resourceName, Context context);
@@ -73,7 +73,7 @@ PrivateEndpointConnectionInner get(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified private endpoint connection.
+     * @return the specified private endpoint connection along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<PrivateEndpointConnectionInner> getWithResponse(
@@ -111,7 +111,7 @@ PrivateEndpointConnectionInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a private endpoint connection to an azure resource.
+     * @return a private endpoint connection to an azure resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<PrivateEndpointConnectionInner> updateWithResponse(
@@ -131,7 +131,7 @@ Response<PrivateEndpointConnectionInner> updateWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -148,7 +148,7 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRPrivateLinkResourcesClient.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRPrivateLinkResourcesClient.java
index 2498aacd9f08..cf37f7046317 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRPrivateLinkResourcesClient.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRPrivateLinkResourcesClient.java
@@ -21,7 +21,8 @@ public interface SignalRPrivateLinkResourcesClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a resource.
+     * @return the private link resources that need to be created for a resource as paginated response with {@link
+     *     PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<PrivateLinkResourceInner> list(String resourceGroupName, String resourceName);
@@ -36,7 +37,8 @@ public interface SignalRPrivateLinkResourcesClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a resource.
+     * @return the private link resources that need to be created for a resource as paginated response with {@link
+     *     PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<PrivateLinkResourceInner> list(String resourceGroupName, String resourceName, Context context);
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRSharedPrivateLinkResourcesClient.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRSharedPrivateLinkResourcesClient.java
index 1ba24dbe00c1..5302ecd373b5 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRSharedPrivateLinkResourcesClient.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRSharedPrivateLinkResourcesClient.java
@@ -26,7 +26,7 @@ public interface SignalRSharedPrivateLinkResourcesClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<SharedPrivateLinkResourceInner> list(String resourceGroupName, String resourceName);
@@ -41,7 +41,7 @@ public interface SignalRSharedPrivateLinkResourcesClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<SharedPrivateLinkResourceInner> list(String resourceGroupName, String resourceName, Context context);
@@ -73,7 +73,7 @@ SharedPrivateLinkResourceInner get(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified shared private link resource.
+     * @return the specified shared private link resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<SharedPrivateLinkResourceInner> getWithResponse(
@@ -90,7 +90,7 @@ Response<SharedPrivateLinkResourceInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a Shared Private Link Resource.
+     * @return the {@link SyncPoller} for polling of describes a Shared Private Link Resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner> beginCreateOrUpdate(
@@ -111,7 +111,7 @@ SyncPoller<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResource
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a Shared Private Link Resource.
+     * @return the {@link SyncPoller} for polling of describes a Shared Private Link Resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner> beginCreateOrUpdate(
@@ -173,7 +173,7 @@ SharedPrivateLinkResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -190,7 +190,7 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRsClient.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRsClient.java
index f268fec36e7e..e5a66ddef57c 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRsClient.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/SignalRsClient.java
@@ -42,7 +42,7 @@ public interface SignalRsClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to check name availability.
+     * @return result of the request to check name availability along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<NameAvailabilityInner> checkNameAvailabilityWithResponse(
@@ -53,7 +53,8 @@ Response<NameAvailabilityInner> checkNameAvailabilityWithResponse(
      *
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<SignalRResourceInner> list();
@@ -65,7 +66,8 @@ Response<NameAvailabilityInner> checkNameAvailabilityWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<SignalRResourceInner> list(Context context);
@@ -78,7 +80,8 @@ Response<NameAvailabilityInner> checkNameAvailabilityWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<SignalRResourceInner> listByResourceGroup(String resourceGroupName);
@@ -92,7 +95,8 @@ Response<NameAvailabilityInner> checkNameAvailabilityWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<SignalRResourceInner> listByResourceGroup(String resourceGroupName, Context context);
@@ -121,7 +125,7 @@ Response<NameAvailabilityInner> checkNameAvailabilityWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the resource and its properties.
+     * @return the resource and its properties along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<SignalRResourceInner> getByResourceGroupWithResponse(
@@ -137,7 +141,7 @@ Response<SignalRResourceInner> getByResourceGroupWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link SyncPoller} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginCreateOrUpdate(
@@ -154,7 +158,7 @@ SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginCreateOr
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link SyncPoller} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginCreateOrUpdate(
@@ -201,7 +205,7 @@ SignalRResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName);
@@ -216,7 +220,7 @@ SignalRResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName, Context context);
@@ -258,7 +262,7 @@ SignalRResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link SyncPoller} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginUpdate(
@@ -275,7 +279,7 @@ SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link SyncPoller} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginUpdate(
@@ -337,7 +341,7 @@ SignalRResourceInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the access keys of the resource.
+     * @return the access keys of the resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<SignalRKeysInner> listKeysWithResponse(String resourceGroupName, String resourceName, Context context);
@@ -352,7 +356,7 @@ SignalRResourceInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represents the access keys of the resource.
+     * @return the {@link SyncPoller} for polling of a class represents the access keys of the resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenerateKey(
@@ -369,7 +373,7 @@ SyncPoller<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenerateKey(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represents the access keys of the resource.
+     * @return the {@link SyncPoller} for polling of a class represents the access keys of the resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenerateKey(
@@ -416,7 +420,7 @@ SignalRKeysInner regenerateKey(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginRestart(String resourceGroupName, String resourceName);
@@ -431,7 +435,7 @@ SignalRKeysInner regenerateKey(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginRestart(String resourceGroupName, String resourceName, Context context);
@@ -487,7 +491,7 @@ SignalRKeysInner regenerateKey(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list skus operation response.
+     * @return the list skus operation response along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<SkuListInner> listSkusWithResponse(String resourceGroupName, String resourceName, Context context);
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/UsagesClient.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/UsagesClient.java
index 99667f184883..a336c0857d10 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/UsagesClient.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/UsagesClient.java
@@ -19,7 +19,8 @@ public interface UsagesClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set as paginated
+     *     response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<SignalRUsageInner> list(String location);
@@ -32,7 +33,8 @@ public interface UsagesClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set as paginated
+     *     response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<SignalRUsageInner> list(String location, Context context);
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/OperationInner.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/OperationInner.java
index bb9370a352a6..4ca6e462b140 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/OperationInner.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/OperationInner.java
@@ -29,7 +29,7 @@ public final class OperationInner {
     private Boolean isDataAction;
 
     /*
-     * The object that describes the operation.
+     * The object that describes a operation.
      */
     @JsonProperty(value = "display")
     private OperationDisplay display;
@@ -42,7 +42,7 @@ public final class OperationInner {
     private String origin;
 
     /*
-     * Extra properties for the operation.
+     * Extra Operation properties.
      */
     @JsonProperty(value = "properties")
     private OperationProperties properties;
@@ -88,7 +88,7 @@ public OperationInner withIsDataAction(Boolean isDataAction) {
     }
 
     /**
-     * Get the display property: The object that describes the operation.
+     * Get the display property: The object that describes a operation.
      *
      * @return the display value.
      */
@@ -97,7 +97,7 @@ public OperationDisplay display() {
     }
 
     /**
-     * Set the display property: The object that describes the operation.
+     * Set the display property: The object that describes a operation.
      *
      * @param display the display value to set.
      * @return the OperationInner object itself.
@@ -130,7 +130,7 @@ public OperationInner withOrigin(String origin) {
     }
 
     /**
-     * Get the properties property: Extra properties for the operation.
+     * Get the properties property: Extra Operation properties.
      *
      * @return the properties value.
      */
@@ -139,7 +139,7 @@ public OperationProperties properties() {
     }
 
     /**
-     * Set the properties property: Extra properties for the operation.
+     * Set the properties property: Extra Operation properties.
      *
      * @param properties the properties value to set.
      * @return the OperationInner object itself.
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateEndpointConnectionInner.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateEndpointConnectionInner.java
index 0e4fe613b454..150a43736218 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateEndpointConnectionInner.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateEndpointConnectionInner.java
@@ -27,7 +27,7 @@ public final class PrivateEndpointConnectionInner extends ProxyResource {
     private SystemData systemData;
 
     /*
-     * Properties of the private endpoint connection
+     * Private endpoint connection properties
      */
     @JsonProperty(value = "properties")
     private PrivateEndpointConnectionProperties innerProperties;
@@ -42,7 +42,7 @@ public SystemData systemData() {
     }
 
     /**
-     * Get the innerProperties property: Properties of the private endpoint connection.
+     * Get the innerProperties property: Private endpoint connection properties.
      *
      * @return the innerProperties value.
      */
@@ -51,7 +51,7 @@ private PrivateEndpointConnectionProperties innerProperties() {
     }
 
     /**
-     * Get the provisioningState property: Provisioning state of the private endpoint connection.
+     * Get the provisioningState property: Provisioning state of the resource.
      *
      * @return the provisioningState value.
      */
@@ -60,7 +60,7 @@ public ProvisioningState provisioningState() {
     }
 
     /**
-     * Get the privateEndpoint property: Private endpoint associated with the private endpoint connection.
+     * Get the privateEndpoint property: Private endpoint.
      *
      * @return the privateEndpoint value.
      */
@@ -69,7 +69,7 @@ public PrivateEndpoint privateEndpoint() {
     }
 
     /**
-     * Set the privateEndpoint property: Private endpoint associated with the private endpoint connection.
+     * Set the privateEndpoint property: Private endpoint.
      *
      * @param privateEndpoint the privateEndpoint value to set.
      * @return the PrivateEndpointConnectionInner object itself.
@@ -92,7 +92,7 @@ public List<String> groupIds() {
     }
 
     /**
-     * Get the privateLinkServiceConnectionState property: Connection state.
+     * Get the privateLinkServiceConnectionState property: Connection state of the private endpoint connection.
      *
      * @return the privateLinkServiceConnectionState value.
      */
@@ -101,7 +101,7 @@ public PrivateLinkServiceConnectionState privateLinkServiceConnectionState() {
     }
 
     /**
-     * Set the privateLinkServiceConnectionState property: Connection state.
+     * Set the privateLinkServiceConnectionState property: Connection state of the private endpoint connection.
      *
      * @param privateLinkServiceConnectionState the privateLinkServiceConnectionState value to set.
      * @return the PrivateEndpointConnectionInner object itself.
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateEndpointConnectionProperties.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateEndpointConnectionProperties.java
index e6909603fb5d..9d9a06694c2a 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateEndpointConnectionProperties.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateEndpointConnectionProperties.java
@@ -19,13 +19,13 @@ public final class PrivateEndpointConnectionProperties {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(PrivateEndpointConnectionProperties.class);
 
     /*
-     * Provisioning state of the private endpoint connection
+     * Provisioning state of the resource.
      */
     @JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY)
     private ProvisioningState provisioningState;
 
     /*
-     * Private endpoint associated with the private endpoint connection
+     * Private endpoint
      */
     @JsonProperty(value = "privateEndpoint")
     private PrivateEndpoint privateEndpoint;
@@ -37,13 +37,13 @@ public final class PrivateEndpointConnectionProperties {
     private List<String> groupIds;
 
     /*
-     * Connection state
+     * Connection state of the private endpoint connection
      */
     @JsonProperty(value = "privateLinkServiceConnectionState")
     private PrivateLinkServiceConnectionState privateLinkServiceConnectionState;
 
     /**
-     * Get the provisioningState property: Provisioning state of the private endpoint connection.
+     * Get the provisioningState property: Provisioning state of the resource.
      *
      * @return the provisioningState value.
      */
@@ -52,7 +52,7 @@ public ProvisioningState provisioningState() {
     }
 
     /**
-     * Get the privateEndpoint property: Private endpoint associated with the private endpoint connection.
+     * Get the privateEndpoint property: Private endpoint.
      *
      * @return the privateEndpoint value.
      */
@@ -61,7 +61,7 @@ public PrivateEndpoint privateEndpoint() {
     }
 
     /**
-     * Set the privateEndpoint property: Private endpoint associated with the private endpoint connection.
+     * Set the privateEndpoint property: Private endpoint.
      *
      * @param privateEndpoint the privateEndpoint value to set.
      * @return the PrivateEndpointConnectionProperties object itself.
@@ -81,7 +81,7 @@ public List<String> groupIds() {
     }
 
     /**
-     * Get the privateLinkServiceConnectionState property: Connection state.
+     * Get the privateLinkServiceConnectionState property: Connection state of the private endpoint connection.
      *
      * @return the privateLinkServiceConnectionState value.
      */
@@ -90,7 +90,7 @@ public PrivateLinkServiceConnectionState privateLinkServiceConnectionState() {
     }
 
     /**
-     * Set the privateLinkServiceConnectionState property: Connection state.
+     * Set the privateLinkServiceConnectionState property: Connection state of the private endpoint connection.
      *
      * @param privateLinkServiceConnectionState the privateLinkServiceConnectionState value to set.
      * @return the PrivateEndpointConnectionProperties object itself.
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateLinkResourceInner.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateLinkResourceInner.java
index e1e61c43f7a4..336da464b411 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateLinkResourceInner.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/PrivateLinkResourceInner.java
@@ -18,13 +18,13 @@ public final class PrivateLinkResourceInner extends ProxyResource {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(PrivateLinkResourceInner.class);
 
     /*
-     * Properties of a private link resource
+     * Private link resource properties
      */
     @JsonProperty(value = "properties")
     private PrivateLinkResourceProperties innerProperties;
 
     /**
-     * Get the innerProperties property: Properties of a private link resource.
+     * Get the innerProperties property: Private link resource properties.
      *
      * @return the innerProperties value.
      */
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SharedPrivateLinkResourceInner.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SharedPrivateLinkResourceInner.java
index a9aacb971056..706131ddab52 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SharedPrivateLinkResourceInner.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SharedPrivateLinkResourceInner.java
@@ -25,7 +25,7 @@ public final class SharedPrivateLinkResourceInner extends ProxyResource {
     private SystemData systemData;
 
     /*
-     * Describes the properties of a Shared Private Link Resource
+     * Describes the properties of an existing Shared Private Link Resource
      */
     @JsonProperty(value = "properties")
     private SharedPrivateLinkResourceProperties innerProperties;
@@ -40,7 +40,7 @@ public SystemData systemData() {
     }
 
     /**
-     * Get the innerProperties property: Describes the properties of a Shared Private Link Resource.
+     * Get the innerProperties property: Describes the properties of an existing Shared Private Link Resource.
      *
      * @return the innerProperties value.
      */
@@ -95,7 +95,7 @@ public SharedPrivateLinkResourceInner withPrivateLinkResourceId(String privateLi
     }
 
     /**
-     * Get the provisioningState property: Provisioning state of the shared private link resource.
+     * Get the provisioningState property: Provisioning state of the resource.
      *
      * @return the provisioningState value.
      */
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SharedPrivateLinkResourceProperties.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SharedPrivateLinkResourceProperties.java
index b4f70972dae8..ebba45342f13 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SharedPrivateLinkResourceProperties.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SharedPrivateLinkResourceProperties.java
@@ -30,7 +30,7 @@ public final class SharedPrivateLinkResourceProperties {
     private String privateLinkResourceId;
 
     /*
-     * Provisioning state of the shared private link resource
+     * Provisioning state of the resource.
      */
     @JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY)
     private ProvisioningState provisioningState;
@@ -89,7 +89,7 @@ public SharedPrivateLinkResourceProperties withPrivateLinkResourceId(String priv
     }
 
     /**
-     * Get the provisioningState property: Provisioning state of the shared private link resource.
+     * Get the provisioningState property: Provisioning state of the resource.
      *
      * @return the provisioningState value.
      */
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SignalRProperties.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SignalRProperties.java
index 05e1572ddceb..64b6ceb711fd 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SignalRProperties.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SignalRProperties.java
@@ -74,7 +74,7 @@ public final class SignalRProperties {
     private List<SharedPrivateLinkResourceInner> sharedPrivateLinkResources;
 
     /*
-     * TLS settings.
+     * TLS settings for the resource
      */
     @JsonProperty(value = "tls")
     private SignalRTlsSettings tls;
@@ -101,10 +101,6 @@ public final class SignalRProperties {
 
     /*
      * Resource log configuration of a Microsoft.SignalRService resource.
-     * If resourceLogConfiguration isn't null or empty, it will override
-     * options "EnableConnectivityLog" and "EnableMessagingLogs" in features.
-     * Otherwise, use options "EnableConnectivityLog" and "EnableMessagingLogs"
-     * in features.
      */
     @JsonProperty(value = "resourceLogConfiguration")
     private ResourceLogConfiguration resourceLogConfiguration;
@@ -116,13 +112,13 @@ public final class SignalRProperties {
     private SignalRCorsSettings cors;
 
     /*
-     * Upstream settings when the service is in server-less mode.
+     * The settings for the Upstream when the service is in server-less mode.
      */
     @JsonProperty(value = "upstream")
     private ServerlessUpstreamSettings upstream;
 
     /*
-     * Network ACLs
+     * Network ACLs for the resource
      */
     @JsonProperty(value = "networkACLs")
     private SignalRNetworkACLs networkACLs;
@@ -227,7 +223,7 @@ public List<SharedPrivateLinkResourceInner> sharedPrivateLinkResources() {
     }
 
     /**
-     * Get the tls property: TLS settings.
+     * Get the tls property: TLS settings for the resource.
      *
      * @return the tls value.
      */
@@ -236,7 +232,7 @@ public SignalRTlsSettings tls() {
     }
 
     /**
-     * Set the tls property: TLS settings.
+     * Set the tls property: TLS settings for the resource.
      *
      * @param tls the tls value to set.
      * @return the SignalRProperties object itself.
@@ -286,10 +282,7 @@ public SignalRProperties withFeatures(List<SignalRFeature> features) {
     }
 
     /**
-     * Get the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService resource. If
-     * resourceLogConfiguration isn't null or empty, it will override options "EnableConnectivityLog" and
-     * "EnableMessagingLogs" in features. Otherwise, use options "EnableConnectivityLog" and "EnableMessagingLogs" in
-     * features.
+     * Get the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService resource.
      *
      * @return the resourceLogConfiguration value.
      */
@@ -298,10 +291,7 @@ public ResourceLogConfiguration resourceLogConfiguration() {
     }
 
     /**
-     * Set the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService resource. If
-     * resourceLogConfiguration isn't null or empty, it will override options "EnableConnectivityLog" and
-     * "EnableMessagingLogs" in features. Otherwise, use options "EnableConnectivityLog" and "EnableMessagingLogs" in
-     * features.
+     * Set the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService resource.
      *
      * @param resourceLogConfiguration the resourceLogConfiguration value to set.
      * @return the SignalRProperties object itself.
@@ -332,7 +322,7 @@ public SignalRProperties withCors(SignalRCorsSettings cors) {
     }
 
     /**
-     * Get the upstream property: Upstream settings when the service is in server-less mode.
+     * Get the upstream property: The settings for the Upstream when the service is in server-less mode.
      *
      * @return the upstream value.
      */
@@ -341,7 +331,7 @@ public ServerlessUpstreamSettings upstream() {
     }
 
     /**
-     * Set the upstream property: Upstream settings when the service is in server-less mode.
+     * Set the upstream property: The settings for the Upstream when the service is in server-less mode.
      *
      * @param upstream the upstream value to set.
      * @return the SignalRProperties object itself.
@@ -352,7 +342,7 @@ public SignalRProperties withUpstream(ServerlessUpstreamSettings upstream) {
     }
 
     /**
-     * Get the networkACLs property: Network ACLs.
+     * Get the networkACLs property: Network ACLs for the resource.
      *
      * @return the networkACLs value.
      */
@@ -361,7 +351,7 @@ public SignalRNetworkACLs networkACLs() {
     }
 
     /**
-     * Set the networkACLs property: Network ACLs.
+     * Set the networkACLs property: Network ACLs for the resource.
      *
      * @param networkACLs the networkACLs value to set.
      * @return the SignalRProperties object itself.
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SignalRResourceInner.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SignalRResourceInner.java
index 5f3b3703823e..adea65838d48 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SignalRResourceInner.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SignalRResourceInner.java
@@ -29,26 +29,25 @@ public final class SignalRResourceInner extends Resource {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(SignalRResourceInner.class);
 
     /*
-     * The billing information of the resource.(e.g. Free, Standard)
+     * The billing information of the resource.
      */
     @JsonProperty(value = "sku")
     private ResourceSku sku;
 
     /*
-     * Settings used to provision or configure the resource
+     * A class that describes the properties of the resource
      */
     @JsonProperty(value = "properties")
     private SignalRProperties innerProperties;
 
     /*
-     * The kind of the service - e.g. "SignalR" for
-     * "Microsoft.SignalRService/SignalR"
+     * The kind of the service, it can be SignalR or RawWebSockets
      */
     @JsonProperty(value = "kind")
     private ServiceKind kind;
 
     /*
-     * The managed identity response
+     * A class represent managed identities used for request and response
      */
     @JsonProperty(value = "identity")
     private ManagedIdentity identity;
@@ -60,7 +59,7 @@ public final class SignalRResourceInner extends Resource {
     private SystemData systemData;
 
     /**
-     * Get the sku property: The billing information of the resource.(e.g. Free, Standard).
+     * Get the sku property: The billing information of the resource.
      *
      * @return the sku value.
      */
@@ -69,7 +68,7 @@ public ResourceSku sku() {
     }
 
     /**
-     * Set the sku property: The billing information of the resource.(e.g. Free, Standard).
+     * Set the sku property: The billing information of the resource.
      *
      * @param sku the sku value to set.
      * @return the SignalRResourceInner object itself.
@@ -80,7 +79,7 @@ public SignalRResourceInner withSku(ResourceSku sku) {
     }
 
     /**
-     * Get the innerProperties property: Settings used to provision or configure the resource.
+     * Get the innerProperties property: A class that describes the properties of the resource.
      *
      * @return the innerProperties value.
      */
@@ -89,7 +88,7 @@ private SignalRProperties innerProperties() {
     }
 
     /**
-     * Get the kind property: The kind of the service - e.g. "SignalR" for "Microsoft.SignalRService/SignalR".
+     * Get the kind property: The kind of the service, it can be SignalR or RawWebSockets.
      *
      * @return the kind value.
      */
@@ -98,7 +97,7 @@ public ServiceKind kind() {
     }
 
     /**
-     * Set the kind property: The kind of the service - e.g. "SignalR" for "Microsoft.SignalRService/SignalR".
+     * Set the kind property: The kind of the service, it can be SignalR or RawWebSockets.
      *
      * @param kind the kind value to set.
      * @return the SignalRResourceInner object itself.
@@ -109,7 +108,7 @@ public SignalRResourceInner withKind(ServiceKind kind) {
     }
 
     /**
-     * Get the identity property: The managed identity response.
+     * Get the identity property: A class represent managed identities used for request and response.
      *
      * @return the identity value.
      */
@@ -118,7 +117,7 @@ public ManagedIdentity identity() {
     }
 
     /**
-     * Set the identity property: The managed identity response.
+     * Set the identity property: A class represent managed identities used for request and response.
      *
      * @param identity the identity value to set.
      * @return the SignalRResourceInner object itself.
@@ -226,7 +225,7 @@ public List<SharedPrivateLinkResourceInner> sharedPrivateLinkResources() {
     }
 
     /**
-     * Get the tls property: TLS settings.
+     * Get the tls property: TLS settings for the resource.
      *
      * @return the tls value.
      */
@@ -235,7 +234,7 @@ public SignalRTlsSettings tls() {
     }
 
     /**
-     * Set the tls property: TLS settings.
+     * Set the tls property: TLS settings for the resource.
      *
      * @param tls the tls value to set.
      * @return the SignalRResourceInner object itself.
@@ -291,10 +290,7 @@ public SignalRResourceInner withFeatures(List<SignalRFeature> features) {
     }
 
     /**
-     * Get the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService resource. If
-     * resourceLogConfiguration isn't null or empty, it will override options "EnableConnectivityLog" and
-     * "EnableMessagingLogs" in features. Otherwise, use options "EnableConnectivityLog" and "EnableMessagingLogs" in
-     * features.
+     * Get the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService resource.
      *
      * @return the resourceLogConfiguration value.
      */
@@ -303,10 +299,7 @@ public ResourceLogConfiguration resourceLogConfiguration() {
     }
 
     /**
-     * Set the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService resource. If
-     * resourceLogConfiguration isn't null or empty, it will override options "EnableConnectivityLog" and
-     * "EnableMessagingLogs" in features. Otherwise, use options "EnableConnectivityLog" and "EnableMessagingLogs" in
-     * features.
+     * Set the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService resource.
      *
      * @param resourceLogConfiguration the resourceLogConfiguration value to set.
      * @return the SignalRResourceInner object itself.
@@ -343,7 +336,7 @@ public SignalRResourceInner withCors(SignalRCorsSettings cors) {
     }
 
     /**
-     * Get the upstream property: Upstream settings when the service is in server-less mode.
+     * Get the upstream property: The settings for the Upstream when the service is in server-less mode.
      *
      * @return the upstream value.
      */
@@ -352,7 +345,7 @@ public ServerlessUpstreamSettings upstream() {
     }
 
     /**
-     * Set the upstream property: Upstream settings when the service is in server-less mode.
+     * Set the upstream property: The settings for the Upstream when the service is in server-less mode.
      *
      * @param upstream the upstream value to set.
      * @return the SignalRResourceInner object itself.
@@ -366,7 +359,7 @@ public SignalRResourceInner withUpstream(ServerlessUpstreamSettings upstream) {
     }
 
     /**
-     * Get the networkACLs property: Network ACLs.
+     * Get the networkACLs property: Network ACLs for the resource.
      *
      * @return the networkACLs value.
      */
@@ -375,7 +368,7 @@ public SignalRNetworkACLs networkACLs() {
     }
 
     /**
-     * Set the networkACLs property: Network ACLs.
+     * Set the networkACLs property: Network ACLs for the resource.
      *
      * @param networkACLs the networkACLs value to set.
      * @return the SignalRResourceInner object itself.
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/OperationsClientImpl.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/OperationsClientImpl.java
index a06a66759e71..8d3dae464795 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/OperationsClientImpl.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/OperationsClientImpl.java
@@ -85,7 +85,8 @@ Mono<Response<OperationList>> listNext(
      *
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations along with {@link PagedResponse} on successful
+     *     completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<OperationInner>> listSinglePageAsync() {
@@ -118,7 +119,8 @@ private Mono<PagedResponse<OperationInner>> listSinglePageAsync() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations along with {@link PagedResponse} on successful
+     *     completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<OperationInner>> listSinglePageAsync(Context context) {
@@ -148,7 +150,7 @@ private Mono<PagedResponse<OperationInner>> listSinglePageAsync(Context context)
      *
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations as paginated response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<OperationInner> listAsync() {
@@ -162,7 +164,7 @@ private PagedFlux<OperationInner> listAsync() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations as paginated response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<OperationInner> listAsync(Context context) {
@@ -175,7 +177,7 @@ private PagedFlux<OperationInner> listAsync(Context context) {
      *
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<OperationInner> list() {
@@ -189,7 +191,7 @@ public PagedIterable<OperationInner> list() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<OperationInner> list(Context context) {
@@ -203,7 +205,8 @@ public PagedIterable<OperationInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations along with {@link PagedResponse} on successful
+     *     completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<OperationInner>> listNextSinglePageAsync(String nextLink) {
@@ -239,7 +242,8 @@ private Mono<PagedResponse<OperationInner>> listNextSinglePageAsync(String nextL
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations along with {@link PagedResponse} on successful
+     *     completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<OperationInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRPrivateEndpointConnectionsClientImpl.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRPrivateEndpointConnectionsClientImpl.java
index f827a95dce59..863cf3d32fff 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRPrivateEndpointConnectionsClientImpl.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRPrivateEndpointConnectionsClientImpl.java
@@ -157,7 +157,8 @@ Mono<Response<PrivateEndpointConnectionList>> listNext(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections along with {@link PagedResponse} on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateEndpointConnectionInner>> listSinglePageAsync(
@@ -216,7 +217,8 @@ private Mono<PagedResponse<PrivateEndpointConnectionInner>> listSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections along with {@link PagedResponse} on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateEndpointConnectionInner>> listSinglePageAsync(
@@ -271,7 +273,7 @@ private Mono<PagedResponse<PrivateEndpointConnectionInner>> listSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections as paginated response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<PrivateEndpointConnectionInner> listAsync(String resourceGroupName, String resourceName) {
@@ -289,7 +291,7 @@ private PagedFlux<PrivateEndpointConnectionInner> listAsync(String resourceGroup
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections as paginated response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<PrivateEndpointConnectionInner> listAsync(
@@ -308,7 +310,7 @@ private PagedFlux<PrivateEndpointConnectionInner> listAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<PrivateEndpointConnectionInner> list(String resourceGroupName, String resourceName) {
@@ -325,7 +327,7 @@ public PagedIterable<PrivateEndpointConnectionInner> list(String resourceGroupNa
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<PrivateEndpointConnectionInner> list(
@@ -343,7 +345,8 @@ public PagedIterable<PrivateEndpointConnectionInner> list(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified private endpoint connection.
+     * @return the specified private endpoint connection along with {@link Response} on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(
@@ -401,7 +404,8 @@ private Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified private endpoint connection.
+     * @return the specified private endpoint connection along with {@link Response} on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(
@@ -455,7 +459,7 @@ private Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified private endpoint connection.
+     * @return the specified private endpoint connection on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PrivateEndpointConnectionInner> getAsync(
@@ -500,7 +504,7 @@ public PrivateEndpointConnectionInner get(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified private endpoint connection.
+     * @return the specified private endpoint connection along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<PrivateEndpointConnectionInner> getWithResponse(
@@ -519,7 +523,8 @@ public Response<PrivateEndpointConnectionInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a private endpoint connection to an azure resource.
+     * @return a private endpoint connection to an azure resource along with {@link Response} on successful completion
+     *     of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<PrivateEndpointConnectionInner>> updateWithResponseAsync(
@@ -587,7 +592,8 @@ private Mono<Response<PrivateEndpointConnectionInner>> updateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a private endpoint connection to an azure resource.
+     * @return a private endpoint connection to an azure resource along with {@link Response} on successful completion
+     *     of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<PrivateEndpointConnectionInner>> updateWithResponseAsync(
@@ -652,7 +658,7 @@ private Mono<Response<PrivateEndpointConnectionInner>> updateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a private endpoint connection to an azure resource.
+     * @return a private endpoint connection to an azure resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PrivateEndpointConnectionInner> updateAsync(
@@ -705,7 +711,7 @@ public PrivateEndpointConnectionInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a private endpoint connection to an azure resource.
+     * @return a private endpoint connection to an azure resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<PrivateEndpointConnectionInner> updateWithResponse(
@@ -729,7 +735,7 @@ public Response<PrivateEndpointConnectionInner> updateWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -787,7 +793,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -841,7 +847,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
@@ -850,7 +856,8 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
             deleteWithResponseAsync(privateEndpointConnectionName, resourceGroupName, resourceName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
@@ -864,7 +871,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
@@ -887,7 +894,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -906,7 +913,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -925,7 +932,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(
@@ -946,7 +953,7 @@ private Mono<Void> deleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(
@@ -997,7 +1004,8 @@ public void delete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections along with {@link PagedResponse} on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateEndpointConnectionInner>> listNextSinglePageAsync(String nextLink) {
@@ -1033,7 +1041,8 @@ private Mono<PagedResponse<PrivateEndpointConnectionInner>> listNextSinglePageAs
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections along with {@link PagedResponse} on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateEndpointConnectionInner>> listNextSinglePageAsync(
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRPrivateLinkResourcesClientImpl.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRPrivateLinkResourcesClientImpl.java
index 4741ed21e877..bb1da71a0b98 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRPrivateLinkResourcesClientImpl.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRPrivateLinkResourcesClientImpl.java
@@ -96,7 +96,8 @@ Mono<Response<PrivateLinkResourceList>> listNext(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a resource.
+     * @return the private link resources that need to be created for a resource along with {@link PagedResponse} on
+     *     successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateLinkResourceInner>> listSinglePageAsync(
@@ -155,7 +156,8 @@ private Mono<PagedResponse<PrivateLinkResourceInner>> listSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a resource.
+     * @return the private link resources that need to be created for a resource along with {@link PagedResponse} on
+     *     successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateLinkResourceInner>> listSinglePageAsync(
@@ -210,7 +212,8 @@ private Mono<PagedResponse<PrivateLinkResourceInner>> listSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a resource.
+     * @return the private link resources that need to be created for a resource as paginated response with {@link
+     *     PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<PrivateLinkResourceInner> listAsync(String resourceGroupName, String resourceName) {
@@ -228,7 +231,8 @@ private PagedFlux<PrivateLinkResourceInner> listAsync(String resourceGroupName,
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a resource.
+     * @return the private link resources that need to be created for a resource as paginated response with {@link
+     *     PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<PrivateLinkResourceInner> listAsync(
@@ -247,7 +251,8 @@ private PagedFlux<PrivateLinkResourceInner> listAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a resource.
+     * @return the private link resources that need to be created for a resource as paginated response with {@link
+     *     PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<PrivateLinkResourceInner> list(String resourceGroupName, String resourceName) {
@@ -264,7 +269,8 @@ public PagedIterable<PrivateLinkResourceInner> list(String resourceGroupName, St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a resource.
+     * @return the private link resources that need to be created for a resource as paginated response with {@link
+     *     PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<PrivateLinkResourceInner> list(
@@ -279,7 +285,8 @@ public PagedIterable<PrivateLinkResourceInner> list(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return contains a list of PrivateLinkResource and a possible link to query more results.
+     * @return contains a list of PrivateLinkResource and a possible link to query more results along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateLinkResourceInner>> listNextSinglePageAsync(String nextLink) {
@@ -315,7 +322,8 @@ private Mono<PagedResponse<PrivateLinkResourceInner>> listNextSinglePageAsync(St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return contains a list of PrivateLinkResource and a possible link to query more results.
+     * @return contains a list of PrivateLinkResource and a possible link to query more results along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateLinkResourceInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRSharedPrivateLinkResourcesClientImpl.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRSharedPrivateLinkResourcesClientImpl.java
index 6dd28baad06b..4ecfebfcad8b 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRSharedPrivateLinkResourcesClientImpl.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRSharedPrivateLinkResourcesClientImpl.java
@@ -157,7 +157,8 @@ Mono<Response<SharedPrivateLinkResourceList>> listNext(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources along with {@link PagedResponse} on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SharedPrivateLinkResourceInner>> listSinglePageAsync(
@@ -216,7 +217,8 @@ private Mono<PagedResponse<SharedPrivateLinkResourceInner>> listSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources along with {@link PagedResponse} on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SharedPrivateLinkResourceInner>> listSinglePageAsync(
@@ -271,7 +273,7 @@ private Mono<PagedResponse<SharedPrivateLinkResourceInner>> listSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources as paginated response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<SharedPrivateLinkResourceInner> listAsync(String resourceGroupName, String resourceName) {
@@ -289,7 +291,7 @@ private PagedFlux<SharedPrivateLinkResourceInner> listAsync(String resourceGroup
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources as paginated response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<SharedPrivateLinkResourceInner> listAsync(
@@ -308,7 +310,7 @@ private PagedFlux<SharedPrivateLinkResourceInner> listAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<SharedPrivateLinkResourceInner> list(String resourceGroupName, String resourceName) {
@@ -325,7 +327,7 @@ public PagedIterable<SharedPrivateLinkResourceInner> list(String resourceGroupNa
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<SharedPrivateLinkResourceInner> list(
@@ -343,7 +345,8 @@ public PagedIterable<SharedPrivateLinkResourceInner> list(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified shared private link resource.
+     * @return the specified shared private link resource along with {@link Response} on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<SharedPrivateLinkResourceInner>> getWithResponseAsync(
@@ -401,7 +404,8 @@ private Mono<Response<SharedPrivateLinkResourceInner>> getWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified shared private link resource.
+     * @return the specified shared private link resource along with {@link Response} on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<SharedPrivateLinkResourceInner>> getWithResponseAsync(
@@ -455,7 +459,7 @@ private Mono<Response<SharedPrivateLinkResourceInner>> getWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified shared private link resource.
+     * @return the specified shared private link resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SharedPrivateLinkResourceInner> getAsync(
@@ -500,7 +504,7 @@ public SharedPrivateLinkResourceInner get(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified shared private link resource.
+     * @return the specified shared private link resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<SharedPrivateLinkResourceInner> getWithResponse(
@@ -519,7 +523,8 @@ public Response<SharedPrivateLinkResourceInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a Shared Private Link Resource.
+     * @return describes a Shared Private Link Resource along with {@link Response} on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -587,7 +592,8 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a Shared Private Link Resource.
+     * @return describes a Shared Private Link Resource along with {@link Response} on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -652,7 +658,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a Shared Private Link Resource.
+     * @return the {@link PollerFlux} for polling of describes a Shared Private Link Resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner>
@@ -670,7 +676,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
                 this.client.getHttpPipeline(),
                 SharedPrivateLinkResourceInner.class,
                 SharedPrivateLinkResourceInner.class,
-                Context.NONE);
+                this.client.getContext());
     }
 
     /**
@@ -685,7 +691,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a Shared Private Link Resource.
+     * @return the {@link PollerFlux} for polling of describes a Shared Private Link Resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner>
@@ -720,7 +726,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a Shared Private Link Resource.
+     * @return the {@link SyncPoller} for polling of describes a Shared Private Link Resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner> beginCreateOrUpdate(
@@ -744,7 +750,7 @@ public SyncPoller<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkR
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a Shared Private Link Resource.
+     * @return the {@link SyncPoller} for polling of describes a Shared Private Link Resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner> beginCreateOrUpdate(
@@ -769,7 +775,7 @@ public SyncPoller<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkR
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a Shared Private Link Resource.
+     * @return describes a Shared Private Link Resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SharedPrivateLinkResourceInner> createOrUpdateAsync(
@@ -794,7 +800,7 @@ private Mono<SharedPrivateLinkResourceInner> createOrUpdateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a Shared Private Link Resource.
+     * @return describes a Shared Private Link Resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SharedPrivateLinkResourceInner> createOrUpdateAsync(
@@ -866,7 +872,7 @@ public SharedPrivateLinkResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -924,7 +930,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -978,7 +984,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
@@ -987,7 +993,8 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
             deleteWithResponseAsync(sharedPrivateLinkResourceName, resourceGroupName, resourceName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
@@ -1001,7 +1008,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
@@ -1024,7 +1031,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -1043,7 +1050,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -1062,7 +1069,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(
@@ -1083,7 +1090,7 @@ private Mono<Void> deleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(
@@ -1134,7 +1141,8 @@ public void delete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources along with {@link PagedResponse} on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SharedPrivateLinkResourceInner>> listNextSinglePageAsync(String nextLink) {
@@ -1170,7 +1178,8 @@ private Mono<PagedResponse<SharedPrivateLinkResourceInner>> listNextSinglePageAs
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources along with {@link PagedResponse} on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SharedPrivateLinkResourceInner>> listNextSinglePageAsync(
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRsClientImpl.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRsClientImpl.java
index b20cee750b5b..167d10cfc13b 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRsClientImpl.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRsClientImpl.java
@@ -265,7 +265,8 @@ Mono<Response<SignalRResourceList>> listByResourceGroupNext(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to check name availability.
+     * @return result of the request to check name availability along with {@link Response} on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<NameAvailabilityInner>> checkNameAvailabilityWithResponseAsync(
@@ -315,7 +316,8 @@ private Mono<Response<NameAvailabilityInner>> checkNameAvailabilityWithResponseA
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to check name availability.
+     * @return result of the request to check name availability along with {@link Response} on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<NameAvailabilityInner>> checkNameAvailabilityWithResponseAsync(
@@ -361,7 +363,7 @@ private Mono<Response<NameAvailabilityInner>> checkNameAvailabilityWithResponseA
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to check name availability.
+     * @return result of the request to check name availability on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<NameAvailabilityInner> checkNameAvailabilityAsync(
@@ -401,7 +403,7 @@ public NameAvailabilityInner checkNameAvailability(String location, NameAvailabi
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to check name availability.
+     * @return result of the request to check name availability along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<NameAvailabilityInner> checkNameAvailabilityWithResponse(
@@ -414,7 +416,8 @@ public Response<NameAvailabilityInner> checkNameAvailabilityWithResponse(
      *
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRResourceInner>> listSinglePageAsync() {
@@ -460,7 +463,8 @@ private Mono<PagedResponse<SignalRResourceInner>> listSinglePageAsync() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRResourceInner>> listSinglePageAsync(Context context) {
@@ -501,7 +505,8 @@ private Mono<PagedResponse<SignalRResourceInner>> listSinglePageAsync(Context co
      *
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<SignalRResourceInner> listAsync() {
@@ -516,7 +521,8 @@ private PagedFlux<SignalRResourceInner> listAsync() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<SignalRResourceInner> listAsync(Context context) {
@@ -529,7 +535,8 @@ private PagedFlux<SignalRResourceInner> listAsync(Context context) {
      *
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<SignalRResourceInner> list() {
@@ -543,7 +550,8 @@ public PagedIterable<SignalRResourceInner> list() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<SignalRResourceInner> list(Context context) {
@@ -558,7 +566,8 @@ public PagedIterable<SignalRResourceInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRResourceInner>> listByResourceGroupSinglePageAsync(String resourceGroupName) {
@@ -611,7 +620,8 @@ private Mono<PagedResponse<SignalRResourceInner>> listByResourceGroupSinglePageA
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRResourceInner>> listByResourceGroupSinglePageAsync(
@@ -661,7 +671,8 @@ private Mono<PagedResponse<SignalRResourceInner>> listByResourceGroupSinglePageA
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<SignalRResourceInner> listByResourceGroupAsync(String resourceGroupName) {
@@ -679,7 +690,8 @@ private PagedFlux<SignalRResourceInner> listByResourceGroupAsync(String resource
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<SignalRResourceInner> listByResourceGroupAsync(String resourceGroupName, Context context) {
@@ -696,7 +708,8 @@ private PagedFlux<SignalRResourceInner> listByResourceGroupAsync(String resource
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<SignalRResourceInner> listByResourceGroup(String resourceGroupName) {
@@ -712,7 +725,8 @@ public PagedIterable<SignalRResourceInner> listByResourceGroup(String resourceGr
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<SignalRResourceInner> listByResourceGroup(String resourceGroupName, Context context) {
@@ -728,7 +742,7 @@ public PagedIterable<SignalRResourceInner> listByResourceGroup(String resourceGr
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the resource and its properties.
+     * @return the resource and its properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<SignalRResourceInner>> getByResourceGroupWithResponseAsync(
@@ -778,7 +792,7 @@ private Mono<Response<SignalRResourceInner>> getByResourceGroupWithResponseAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the resource and its properties.
+     * @return the resource and its properties along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<SignalRResourceInner>> getByResourceGroupWithResponseAsync(
@@ -824,7 +838,7 @@ private Mono<Response<SignalRResourceInner>> getByResourceGroupWithResponseAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the resource and its properties.
+     * @return the resource and its properties on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SignalRResourceInner> getByResourceGroupAsync(String resourceGroupName, String resourceName) {
@@ -865,7 +879,7 @@ public SignalRResourceInner getByResourceGroup(String resourceGroupName, String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the resource and its properties.
+     * @return the resource and its properties along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<SignalRResourceInner> getByResourceGroupWithResponse(
@@ -883,7 +897,7 @@ public Response<SignalRResourceInner> getByResourceGroupWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return a class represent a resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -940,7 +954,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return a class represent a resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -993,7 +1007,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link PollerFlux} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<SignalRResourceInner>, SignalRResourceInner> beginCreateOrUpdateAsync(
@@ -1007,7 +1021,7 @@ private PollerFlux<PollResult<SignalRResourceInner>, SignalRResourceInner> begin
                 this.client.getHttpPipeline(),
                 SignalRResourceInner.class,
                 SignalRResourceInner.class,
-                Context.NONE);
+                this.client.getContext());
     }
 
     /**
@@ -1021,7 +1035,7 @@ private PollerFlux<PollResult<SignalRResourceInner>, SignalRResourceInner> begin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link PollerFlux} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<SignalRResourceInner>, SignalRResourceInner> beginCreateOrUpdateAsync(
@@ -1045,7 +1059,7 @@ private PollerFlux<PollResult<SignalRResourceInner>, SignalRResourceInner> begin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link SyncPoller} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginCreateOrUpdate(
@@ -1064,7 +1078,7 @@ public SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginC
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link SyncPoller} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginCreateOrUpdate(
@@ -1082,7 +1096,7 @@ public SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginC
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return a class represent a resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SignalRResourceInner> createOrUpdateAsync(
@@ -1103,7 +1117,7 @@ private Mono<SignalRResourceInner> createOrUpdateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return a class represent a resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SignalRResourceInner> createOrUpdateAsync(
@@ -1159,7 +1173,7 @@ public SignalRResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName) {
@@ -1208,7 +1222,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -1254,14 +1268,15 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName) {
         Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, resourceName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
@@ -1274,7 +1289,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
@@ -1295,7 +1310,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName) {
@@ -1312,7 +1327,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -1329,7 +1344,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(String resourceGroupName, String resourceName) {
@@ -1346,7 +1361,7 @@ private Mono<Void> deleteAsync(String resourceGroupName, String resourceName) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(String resourceGroupName, String resourceName, Context context) {
@@ -1396,7 +1411,7 @@ public void delete(String resourceGroupName, String resourceName, Context contex
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return a class represent a resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
@@ -1453,7 +1468,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return a class represent a resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
@@ -1506,7 +1521,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link PollerFlux} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<SignalRResourceInner>, SignalRResourceInner> beginUpdateAsync(
@@ -1519,7 +1534,7 @@ private PollerFlux<PollResult<SignalRResourceInner>, SignalRResourceInner> begin
                 this.client.getHttpPipeline(),
                 SignalRResourceInner.class,
                 SignalRResourceInner.class,
-                Context.NONE);
+                this.client.getContext());
     }
 
     /**
@@ -1533,7 +1548,7 @@ private PollerFlux<PollResult<SignalRResourceInner>, SignalRResourceInner> begin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link PollerFlux} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<SignalRResourceInner>, SignalRResourceInner> beginUpdateAsync(
@@ -1557,7 +1572,7 @@ private PollerFlux<PollResult<SignalRResourceInner>, SignalRResourceInner> begin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link SyncPoller} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginUpdate(
@@ -1576,7 +1591,7 @@ public SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginU
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return the {@link SyncPoller} for polling of a class represent a resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginUpdate(
@@ -1594,7 +1609,7 @@ public SyncPoller<PollResult<SignalRResourceInner>, SignalRResourceInner> beginU
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return a class represent a resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SignalRResourceInner> updateAsync(
@@ -1615,7 +1630,7 @@ private Mono<SignalRResourceInner> updateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represent a resource.
+     * @return a class represent a resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SignalRResourceInner> updateAsync(
@@ -1670,7 +1685,7 @@ public SignalRResourceInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the access keys of the resource.
+     * @return the access keys of the resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<SignalRKeysInner>> listKeysWithResponseAsync(String resourceGroupName, String resourceName) {
@@ -1719,7 +1734,7 @@ private Mono<Response<SignalRKeysInner>> listKeysWithResponseAsync(String resour
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the access keys of the resource.
+     * @return the access keys of the resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<SignalRKeysInner>> listKeysWithResponseAsync(
@@ -1765,7 +1780,7 @@ private Mono<Response<SignalRKeysInner>> listKeysWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the access keys of the resource.
+     * @return the access keys of the resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SignalRKeysInner> listKeysAsync(String resourceGroupName, String resourceName) {
@@ -1806,7 +1821,7 @@ public SignalRKeysInner listKeys(String resourceGroupName, String resourceName)
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the access keys of the resource.
+     * @return the access keys of the resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<SignalRKeysInner> listKeysWithResponse(
@@ -1824,7 +1839,8 @@ public Response<SignalRKeysInner> listKeysWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represents the access keys of the resource.
+     * @return a class represents the access keys of the resource along with {@link Response} on successful completion
+     *     of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> regenerateKeyWithResponseAsync(
@@ -1881,7 +1897,8 @@ private Mono<Response<Flux<ByteBuffer>>> regenerateKeyWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represents the access keys of the resource.
+     * @return a class represents the access keys of the resource along with {@link Response} on successful completion
+     *     of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> regenerateKeyWithResponseAsync(
@@ -1934,7 +1951,7 @@ private Mono<Response<Flux<ByteBuffer>>> regenerateKeyWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represents the access keys of the resource.
+     * @return the {@link PollerFlux} for polling of a class represents the access keys of the resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenerateKeyAsync(
@@ -1944,7 +1961,11 @@ private PollerFlux<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenera
         return this
             .client
             .<SignalRKeysInner, SignalRKeysInner>getLroResult(
-                mono, this.client.getHttpPipeline(), SignalRKeysInner.class, SignalRKeysInner.class, Context.NONE);
+                mono,
+                this.client.getHttpPipeline(),
+                SignalRKeysInner.class,
+                SignalRKeysInner.class,
+                this.client.getContext());
     }
 
     /**
@@ -1958,7 +1979,7 @@ private PollerFlux<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenera
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represents the access keys of the resource.
+     * @return the {@link PollerFlux} for polling of a class represents the access keys of the resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenerateKeyAsync(
@@ -1982,7 +2003,7 @@ private PollerFlux<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenera
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represents the access keys of the resource.
+     * @return the {@link SyncPoller} for polling of a class represents the access keys of the resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenerateKey(
@@ -2001,7 +2022,7 @@ public SyncPoller<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenerat
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represents the access keys of the resource.
+     * @return the {@link SyncPoller} for polling of a class represents the access keys of the resource.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenerateKey(
@@ -2019,7 +2040,7 @@ public SyncPoller<PollResult<SignalRKeysInner>, SignalRKeysInner> beginRegenerat
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represents the access keys of the resource.
+     * @return a class represents the access keys of the resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SignalRKeysInner> regenerateKeyAsync(
@@ -2040,7 +2061,7 @@ private Mono<SignalRKeysInner> regenerateKeyAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a class represents the access keys of the resource.
+     * @return a class represents the access keys of the resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SignalRKeysInner> regenerateKeyAsync(
@@ -2096,7 +2117,7 @@ public SignalRKeysInner regenerateKey(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> restartWithResponseAsync(String resourceGroupName, String resourceName) {
@@ -2145,7 +2166,7 @@ private Mono<Response<Flux<ByteBuffer>>> restartWithResponseAsync(String resourc
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> restartWithResponseAsync(
@@ -2191,14 +2212,15 @@ private Mono<Response<Flux<ByteBuffer>>> restartWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginRestartAsync(String resourceGroupName, String resourceName) {
         Mono<Response<Flux<ByteBuffer>>> mono = restartWithResponseAsync(resourceGroupName, resourceName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
@@ -2211,7 +2233,7 @@ private PollerFlux<PollResult<Void>, Void> beginRestartAsync(String resourceGrou
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginRestartAsync(
@@ -2232,7 +2254,7 @@ private PollerFlux<PollResult<Void>, Void> beginRestartAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginRestart(String resourceGroupName, String resourceName) {
@@ -2249,7 +2271,7 @@ public SyncPoller<PollResult<Void>, Void> beginRestart(String resourceGroupName,
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginRestart(
@@ -2266,7 +2288,7 @@ public SyncPoller<PollResult<Void>, Void> beginRestart(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> restartAsync(String resourceGroupName, String resourceName) {
@@ -2283,7 +2305,7 @@ private Mono<Void> restartAsync(String resourceGroupName, String resourceName) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> restartAsync(String resourceGroupName, String resourceName, Context context) {
@@ -2332,7 +2354,7 @@ public void restart(String resourceGroupName, String resourceName, Context conte
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list skus operation response.
+     * @return the list skus operation response along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<SkuListInner>> listSkusWithResponseAsync(String resourceGroupName, String resourceName) {
@@ -2381,7 +2403,7 @@ private Mono<Response<SkuListInner>> listSkusWithResponseAsync(String resourceGr
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list skus operation response.
+     * @return the list skus operation response along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<SkuListInner>> listSkusWithResponseAsync(
@@ -2427,7 +2449,7 @@ private Mono<Response<SkuListInner>> listSkusWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list skus operation response.
+     * @return the list skus operation response on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<SkuListInner> listSkusAsync(String resourceGroupName, String resourceName) {
@@ -2468,7 +2490,7 @@ public SkuListInner listSkus(String resourceGroupName, String resourceName) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list skus operation response.
+     * @return the list skus operation response along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<SkuListInner> listSkusWithResponse(String resourceGroupName, String resourceName, Context context) {
@@ -2482,7 +2504,8 @@ public Response<SkuListInner> listSkusWithResponse(String resourceGroupName, Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRResourceInner>> listBySubscriptionNextSinglePageAsync(String nextLink) {
@@ -2519,7 +2542,8 @@ private Mono<PagedResponse<SignalRResourceInner>> listBySubscriptionNextSinglePa
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRResourceInner>> listBySubscriptionNextSinglePageAsync(
@@ -2555,7 +2579,8 @@ private Mono<PagedResponse<SignalRResourceInner>> listBySubscriptionNextSinglePa
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRResourceInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
@@ -2592,7 +2617,8 @@ private Mono<PagedResponse<SignalRResourceInner>> listByResourceGroupNextSingleP
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRResourceInner>> listByResourceGroupNextSinglePageAsync(
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/UsagesClientImpl.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/UsagesClientImpl.java
index f4e20dc35212..52b57e04daf6 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/UsagesClientImpl.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/UsagesClientImpl.java
@@ -88,7 +88,8 @@ Mono<Response<SignalRUsageList>> listNext(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRUsageInner>> listSinglePageAsync(String location) {
@@ -139,7 +140,8 @@ private Mono<PagedResponse<SignalRUsageInner>> listSinglePageAsync(String locati
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRUsageInner>> listSinglePageAsync(String location, Context context) {
@@ -186,7 +188,8 @@ private Mono<PagedResponse<SignalRUsageInner>> listSinglePageAsync(String locati
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set as paginated
+     *     response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<SignalRUsageInner> listAsync(String location) {
@@ -201,7 +204,8 @@ private PagedFlux<SignalRUsageInner> listAsync(String location) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set as paginated
+     *     response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<SignalRUsageInner> listAsync(String location, Context context) {
@@ -216,7 +220,8 @@ private PagedFlux<SignalRUsageInner> listAsync(String location, Context context)
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set as paginated
+     *     response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<SignalRUsageInner> list(String location) {
@@ -231,7 +236,8 @@ public PagedIterable<SignalRUsageInner> list(String location) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set as paginated
+     *     response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<SignalRUsageInner> list(String location, Context context) {
@@ -245,7 +251,8 @@ public PagedIterable<SignalRUsageInner> list(String location, Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRUsageInner>> listNextSinglePageAsync(String nextLink) {
@@ -281,7 +288,8 @@ private Mono<PagedResponse<SignalRUsageInner>> listNextSinglePageAsync(String ne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SignalRUsageInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/ManagedIdentity.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/ManagedIdentity.java
index 64d5efa4d002..c77b3c72fd6f 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/ManagedIdentity.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/ManagedIdentity.java
@@ -17,7 +17,7 @@ public class ManagedIdentity {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(ManagedIdentity.class);
 
     /*
-     * Represent the identity type: systemAssigned, userAssigned, None
+     * Represents the identity type: systemAssigned, userAssigned, None
      */
     @JsonProperty(value = "type")
     private ManagedIdentityType type;
@@ -44,7 +44,7 @@ public class ManagedIdentity {
     private String tenantId;
 
     /**
-     * Get the type property: Represent the identity type: systemAssigned, userAssigned, None.
+     * Get the type property: Represents the identity type: systemAssigned, userAssigned, None.
      *
      * @return the type value.
      */
@@ -53,7 +53,7 @@ public ManagedIdentityType type() {
     }
 
     /**
-     * Set the type property: Represent the identity type: systemAssigned, userAssigned, None.
+     * Set the type property: Represents the identity type: systemAssigned, userAssigned, None.
      *
      * @param type the type value to set.
      * @return the ManagedIdentity object itself.
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Operation.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Operation.java
index f450dba11b80..674598c0f631 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Operation.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Operation.java
@@ -23,7 +23,7 @@ public interface Operation {
     Boolean isDataAction();
 
     /**
-     * Gets the display property: The object that describes the operation.
+     * Gets the display property: The object that describes a operation.
      *
      * @return the display value.
      */
@@ -38,7 +38,7 @@ public interface Operation {
     String origin();
 
     /**
-     * Gets the properties property: Extra properties for the operation.
+     * Gets the properties property: Extra Operation properties.
      *
      * @return the properties value.
      */
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/OperationProperties.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/OperationProperties.java
index 8d5fb2a74040..e6643117242c 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/OperationProperties.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/OperationProperties.java
@@ -15,13 +15,13 @@ public final class OperationProperties {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(OperationProperties.class);
 
     /*
-     * The service specifications.
+     * An object that describes a specification.
      */
     @JsonProperty(value = "serviceSpecification")
     private ServiceSpecification serviceSpecification;
 
     /**
-     * Get the serviceSpecification property: The service specifications.
+     * Get the serviceSpecification property: An object that describes a specification.
      *
      * @return the serviceSpecification value.
      */
@@ -30,7 +30,7 @@ public ServiceSpecification serviceSpecification() {
     }
 
     /**
-     * Set the serviceSpecification property: The service specifications.
+     * Set the serviceSpecification property: An object that describes a specification.
      *
      * @param serviceSpecification the serviceSpecification value to set.
      * @return the OperationProperties object itself.
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Operations.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Operations.java
index 76c7091bf237..860853c575bc 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Operations.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Operations.java
@@ -14,7 +14,7 @@ public interface Operations {
      *
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations as paginated response with {@link PagedIterable}.
      */
     PagedIterable<Operation> list();
 
@@ -25,7 +25,7 @@ public interface Operations {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list REST API operations.
+     * @return result of the request to list REST API operations as paginated response with {@link PagedIterable}.
      */
     PagedIterable<Operation> list(Context context);
 }
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/PrivateEndpointConnection.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/PrivateEndpointConnection.java
index 70dc93f31acf..1b548248aca6 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/PrivateEndpointConnection.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/PrivateEndpointConnection.java
@@ -39,14 +39,14 @@ public interface PrivateEndpointConnection {
     SystemData systemData();
 
     /**
-     * Gets the provisioningState property: Provisioning state of the private endpoint connection.
+     * Gets the provisioningState property: Provisioning state of the resource.
      *
      * @return the provisioningState value.
      */
     ProvisioningState provisioningState();
 
     /**
-     * Gets the privateEndpoint property: Private endpoint associated with the private endpoint connection.
+     * Gets the privateEndpoint property: Private endpoint.
      *
      * @return the privateEndpoint value.
      */
@@ -60,7 +60,7 @@ public interface PrivateEndpointConnection {
     List<String> groupIds();
 
     /**
-     * Gets the privateLinkServiceConnectionState property: Connection state.
+     * Gets the privateLinkServiceConnectionState property: Connection state of the private endpoint connection.
      *
      * @return the privateLinkServiceConnectionState value.
      */
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/RegenerateKeyParameters.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/RegenerateKeyParameters.java
index 026ab55c3175..47730469375d 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/RegenerateKeyParameters.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/RegenerateKeyParameters.java
@@ -15,14 +15,13 @@ public final class RegenerateKeyParameters {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(RegenerateKeyParameters.class);
 
     /*
-     * The keyType to regenerate. Must be either 'primary' or
-     * 'secondary'(case-insensitive).
+     * The type of access key.
      */
     @JsonProperty(value = "keyType")
     private KeyType keyType;
 
     /**
-     * Get the keyType property: The keyType to regenerate. Must be either 'primary' or 'secondary'(case-insensitive).
+     * Get the keyType property: The type of access key.
      *
      * @return the keyType value.
      */
@@ -31,7 +30,7 @@ public KeyType keyType() {
     }
 
     /**
-     * Set the keyType property: The keyType to regenerate. Must be either 'primary' or 'secondary'(case-insensitive).
+     * Set the keyType property: The type of access key.
      *
      * @param keyType the keyType value to set.
      * @return the RegenerateKeyParameters object itself.
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SharedPrivateLinkResource.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SharedPrivateLinkResource.java
index abae80602e18..d4469ed205c9 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SharedPrivateLinkResource.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SharedPrivateLinkResource.java
@@ -53,7 +53,7 @@ public interface SharedPrivateLinkResource {
     String privateLinkResourceId();
 
     /**
-     * Gets the provisioningState property: Provisioning state of the shared private link resource.
+     * Gets the provisioningState property: Provisioning state of the resource.
      *
      * @return the provisioningState value.
      */
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRNetworkACLs.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRNetworkACLs.java
index 30ada44a6ec1..7e094a4cd7a6 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRNetworkACLs.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRNetworkACLs.java
@@ -16,13 +16,13 @@ public final class SignalRNetworkACLs {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(SignalRNetworkACLs.class);
 
     /*
-     * Default action when no other rule matches
+     * Azure Networking ACL Action.
      */
     @JsonProperty(value = "defaultAction")
     private AclAction defaultAction;
 
     /*
-     * ACL for requests from public network
+     * Network ACL
      */
     @JsonProperty(value = "publicNetwork")
     private NetworkAcl publicNetwork;
@@ -34,7 +34,7 @@ public final class SignalRNetworkACLs {
     private List<PrivateEndpointAcl> privateEndpoints;
 
     /**
-     * Get the defaultAction property: Default action when no other rule matches.
+     * Get the defaultAction property: Azure Networking ACL Action.
      *
      * @return the defaultAction value.
      */
@@ -43,7 +43,7 @@ public AclAction defaultAction() {
     }
 
     /**
-     * Set the defaultAction property: Default action when no other rule matches.
+     * Set the defaultAction property: Azure Networking ACL Action.
      *
      * @param defaultAction the defaultAction value to set.
      * @return the SignalRNetworkACLs object itself.
@@ -54,7 +54,7 @@ public SignalRNetworkACLs withDefaultAction(AclAction defaultAction) {
     }
 
     /**
-     * Get the publicNetwork property: ACL for requests from public network.
+     * Get the publicNetwork property: Network ACL.
      *
      * @return the publicNetwork value.
      */
@@ -63,7 +63,7 @@ public NetworkAcl publicNetwork() {
     }
 
     /**
-     * Set the publicNetwork property: ACL for requests from public network.
+     * Set the publicNetwork property: Network ACL.
      *
      * @param publicNetwork the publicNetwork value to set.
      * @return the SignalRNetworkACLs object itself.
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRPrivateEndpointConnections.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRPrivateEndpointConnections.java
index 105d7e0b7b42..c116e513e7ea 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRPrivateEndpointConnections.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRPrivateEndpointConnections.java
@@ -20,7 +20,7 @@ public interface SignalRPrivateEndpointConnections {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections as paginated response with {@link PagedIterable}.
      */
     PagedIterable<PrivateEndpointConnection> list(String resourceGroupName, String resourceName);
 
@@ -34,7 +34,7 @@ public interface SignalRPrivateEndpointConnections {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private endpoint connections.
+     * @return a list of private endpoint connections as paginated response with {@link PagedIterable}.
      */
     PagedIterable<PrivateEndpointConnection> list(String resourceGroupName, String resourceName, Context context);
 
@@ -63,7 +63,7 @@ public interface SignalRPrivateEndpointConnections {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified private endpoint connection.
+     * @return the specified private endpoint connection along with {@link Response}.
      */
     Response<PrivateEndpointConnection> getWithResponse(
         String privateEndpointConnectionName, String resourceGroupName, String resourceName, Context context);
@@ -99,7 +99,7 @@ PrivateEndpointConnection update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a private endpoint connection to an azure resource.
+     * @return a private endpoint connection to an azure resource along with {@link Response}.
      */
     Response<PrivateEndpointConnection> updateWithResponse(
         String privateEndpointConnectionName,
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRPrivateLinkResources.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRPrivateLinkResources.java
index 65f10864dd4b..f58670322d1d 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRPrivateLinkResources.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRPrivateLinkResources.java
@@ -18,7 +18,8 @@ public interface SignalRPrivateLinkResources {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a resource.
+     * @return the private link resources that need to be created for a resource as paginated response with {@link
+     *     PagedIterable}.
      */
     PagedIterable<PrivateLinkResource> list(String resourceGroupName, String resourceName);
 
@@ -32,7 +33,8 @@ public interface SignalRPrivateLinkResources {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a resource.
+     * @return the private link resources that need to be created for a resource as paginated response with {@link
+     *     PagedIterable}.
      */
     PagedIterable<PrivateLinkResource> list(String resourceGroupName, String resourceName, Context context);
 }
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRResource.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRResource.java
index 9ebc5850bfe9..b02cb0f12d22 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRResource.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRResource.java
@@ -50,21 +50,21 @@ public interface SignalRResource {
     Map<String, String> tags();
 
     /**
-     * Gets the sku property: The billing information of the resource.(e.g. Free, Standard).
+     * Gets the sku property: The billing information of the resource.
      *
      * @return the sku value.
      */
     ResourceSku sku();
 
     /**
-     * Gets the kind property: The kind of the service - e.g. "SignalR" for "Microsoft.SignalRService/SignalR".
+     * Gets the kind property: The kind of the service, it can be SignalR or RawWebSockets.
      *
      * @return the kind value.
      */
     ServiceKind kind();
 
     /**
-     * Gets the identity property: The managed identity response.
+     * Gets the identity property: A class represent managed identities used for request and response.
      *
      * @return the identity value.
      */
@@ -136,7 +136,7 @@ public interface SignalRResource {
     List<SharedPrivateLinkResource> sharedPrivateLinkResources();
 
     /**
-     * Gets the tls property: TLS settings.
+     * Gets the tls property: TLS settings for the resource.
      *
      * @return the tls value.
      */
@@ -162,10 +162,7 @@ public interface SignalRResource {
     List<SignalRFeature> features();
 
     /**
-     * Gets the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService resource. If
-     * resourceLogConfiguration isn't null or empty, it will override options "EnableConnectivityLog" and
-     * "EnableMessagingLogs" in features. Otherwise, use options "EnableConnectivityLog" and "EnableMessagingLogs" in
-     * features.
+     * Gets the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService resource.
      *
      * @return the resourceLogConfiguration value.
      */
@@ -179,14 +176,14 @@ public interface SignalRResource {
     SignalRCorsSettings cors();
 
     /**
-     * Gets the upstream property: Upstream settings when the service is in server-less mode.
+     * Gets the upstream property: The settings for the Upstream when the service is in server-less mode.
      *
      * @return the upstream value.
      */
     ServerlessUpstreamSettings upstream();
 
     /**
-     * Gets the networkACLs property: Network ACLs.
+     * Gets the networkACLs property: Network ACLs for the resource.
      *
      * @return the networkACLs value.
      */
@@ -325,9 +322,9 @@ interface WithTags {
         /** The stage of the SignalRResource definition allowing to specify sku. */
         interface WithSku {
             /**
-             * Specifies the sku property: The billing information of the resource.(e.g. Free, Standard).
+             * Specifies the sku property: The billing information of the resource..
              *
-             * @param sku The billing information of the resource.(e.g. Free, Standard).
+             * @param sku The billing information of the resource.
              * @return the next definition stage.
              */
             WithCreate withSku(ResourceSku sku);
@@ -335,10 +332,9 @@ interface WithSku {
         /** The stage of the SignalRResource definition allowing to specify kind. */
         interface WithKind {
             /**
-             * Specifies the kind property: The kind of the service - e.g. "SignalR" for
-             * "Microsoft.SignalRService/SignalR".
+             * Specifies the kind property: The kind of the service, it can be SignalR or RawWebSockets.
              *
-             * @param kind The kind of the service - e.g. "SignalR" for "Microsoft.SignalRService/SignalR".
+             * @param kind The kind of the service, it can be SignalR or RawWebSockets.
              * @return the next definition stage.
              */
             WithCreate withKind(ServiceKind kind);
@@ -346,9 +342,9 @@ interface WithKind {
         /** The stage of the SignalRResource definition allowing to specify identity. */
         interface WithIdentity {
             /**
-             * Specifies the identity property: The managed identity response.
+             * Specifies the identity property: A class represent managed identities used for request and response.
              *
-             * @param identity The managed identity response.
+             * @param identity A class represent managed identities used for request and response.
              * @return the next definition stage.
              */
             WithCreate withIdentity(ManagedIdentity identity);
@@ -356,9 +352,9 @@ interface WithIdentity {
         /** The stage of the SignalRResource definition allowing to specify tls. */
         interface WithTls {
             /**
-             * Specifies the tls property: TLS settings..
+             * Specifies the tls property: TLS settings for the resource.
              *
-             * @param tls TLS settings.
+             * @param tls TLS settings for the resource.
              * @return the next definition stage.
              */
             WithCreate withTls(SignalRTlsSettings tls);
@@ -386,14 +382,9 @@ interface WithFeatures {
         interface WithResourceLogConfiguration {
             /**
              * Specifies the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService
-             * resource. If resourceLogConfiguration isn't null or empty, it will override options
-             * "EnableConnectivityLog" and "EnableMessagingLogs" in features. Otherwise, use options
-             * "EnableConnectivityLog" and "EnableMessagingLogs" in features..
-             *
-             * @param resourceLogConfiguration Resource log configuration of a Microsoft.SignalRService resource. If
-             *     resourceLogConfiguration isn't null or empty, it will override options "EnableConnectivityLog" and
-             *     "EnableMessagingLogs" in features. Otherwise, use options "EnableConnectivityLog" and
-             *     "EnableMessagingLogs" in features.
+             * resource..
+             *
+             * @param resourceLogConfiguration Resource log configuration of a Microsoft.SignalRService resource.
              * @return the next definition stage.
              */
             WithCreate withResourceLogConfiguration(ResourceLogConfiguration resourceLogConfiguration);
@@ -411,9 +402,9 @@ interface WithCors {
         /** The stage of the SignalRResource definition allowing to specify upstream. */
         interface WithUpstream {
             /**
-             * Specifies the upstream property: Upstream settings when the service is in server-less mode..
+             * Specifies the upstream property: The settings for the Upstream when the service is in server-less mode..
              *
-             * @param upstream Upstream settings when the service is in server-less mode.
+             * @param upstream The settings for the Upstream when the service is in server-less mode.
              * @return the next definition stage.
              */
             WithCreate withUpstream(ServerlessUpstreamSettings upstream);
@@ -421,9 +412,9 @@ interface WithUpstream {
         /** The stage of the SignalRResource definition allowing to specify networkACLs. */
         interface WithNetworkACLs {
             /**
-             * Specifies the networkACLs property: Network ACLs.
+             * Specifies the networkACLs property: Network ACLs for the resource.
              *
-             * @param networkACLs Network ACLs.
+             * @param networkACLs Network ACLs for the resource.
              * @return the next definition stage.
              */
             WithCreate withNetworkACLs(SignalRNetworkACLs networkACLs);
@@ -518,9 +509,9 @@ interface WithTags {
         /** The stage of the SignalRResource update allowing to specify sku. */
         interface WithSku {
             /**
-             * Specifies the sku property: The billing information of the resource.(e.g. Free, Standard).
+             * Specifies the sku property: The billing information of the resource..
              *
-             * @param sku The billing information of the resource.(e.g. Free, Standard).
+             * @param sku The billing information of the resource.
              * @return the next definition stage.
              */
             Update withSku(ResourceSku sku);
@@ -528,9 +519,9 @@ interface WithSku {
         /** The stage of the SignalRResource update allowing to specify identity. */
         interface WithIdentity {
             /**
-             * Specifies the identity property: The managed identity response.
+             * Specifies the identity property: A class represent managed identities used for request and response.
              *
-             * @param identity The managed identity response.
+             * @param identity A class represent managed identities used for request and response.
              * @return the next definition stage.
              */
             Update withIdentity(ManagedIdentity identity);
@@ -538,9 +529,9 @@ interface WithIdentity {
         /** The stage of the SignalRResource update allowing to specify tls. */
         interface WithTls {
             /**
-             * Specifies the tls property: TLS settings..
+             * Specifies the tls property: TLS settings for the resource.
              *
-             * @param tls TLS settings.
+             * @param tls TLS settings for the resource.
              * @return the next definition stage.
              */
             Update withTls(SignalRTlsSettings tls);
@@ -568,14 +559,9 @@ interface WithFeatures {
         interface WithResourceLogConfiguration {
             /**
              * Specifies the resourceLogConfiguration property: Resource log configuration of a Microsoft.SignalRService
-             * resource. If resourceLogConfiguration isn't null or empty, it will override options
-             * "EnableConnectivityLog" and "EnableMessagingLogs" in features. Otherwise, use options
-             * "EnableConnectivityLog" and "EnableMessagingLogs" in features..
-             *
-             * @param resourceLogConfiguration Resource log configuration of a Microsoft.SignalRService resource. If
-             *     resourceLogConfiguration isn't null or empty, it will override options "EnableConnectivityLog" and
-             *     "EnableMessagingLogs" in features. Otherwise, use options "EnableConnectivityLog" and
-             *     "EnableMessagingLogs" in features.
+             * resource..
+             *
+             * @param resourceLogConfiguration Resource log configuration of a Microsoft.SignalRService resource.
              * @return the next definition stage.
              */
             Update withResourceLogConfiguration(ResourceLogConfiguration resourceLogConfiguration);
@@ -593,9 +579,9 @@ interface WithCors {
         /** The stage of the SignalRResource update allowing to specify upstream. */
         interface WithUpstream {
             /**
-             * Specifies the upstream property: Upstream settings when the service is in server-less mode..
+             * Specifies the upstream property: The settings for the Upstream when the service is in server-less mode..
              *
-             * @param upstream Upstream settings when the service is in server-less mode.
+             * @param upstream The settings for the Upstream when the service is in server-less mode.
              * @return the next definition stage.
              */
             Update withUpstream(ServerlessUpstreamSettings upstream);
@@ -603,9 +589,9 @@ interface WithUpstream {
         /** The stage of the SignalRResource update allowing to specify networkACLs. */
         interface WithNetworkACLs {
             /**
-             * Specifies the networkACLs property: Network ACLs.
+             * Specifies the networkACLs property: Network ACLs for the resource.
              *
-             * @param networkACLs Network ACLs.
+             * @param networkACLs Network ACLs for the resource.
              * @return the next definition stage.
              */
             Update withNetworkACLs(SignalRNetworkACLs networkACLs);
@@ -680,7 +666,7 @@ interface WithDisableAadAuth {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the access keys of the resource.
+     * @return the access keys of the resource along with {@link Response}.
      */
     Response<SignalRKeys> listKeysWithResponse(Context context);
 
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRSharedPrivateLinkResources.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRSharedPrivateLinkResources.java
index 6a25e4623b2d..6a4d4e5f41f1 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRSharedPrivateLinkResources.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRSharedPrivateLinkResources.java
@@ -19,7 +19,7 @@ public interface SignalRSharedPrivateLinkResources {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources as paginated response with {@link PagedIterable}.
      */
     PagedIterable<SharedPrivateLinkResource> list(String resourceGroupName, String resourceName);
 
@@ -33,7 +33,7 @@ public interface SignalRSharedPrivateLinkResources {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of shared private link resources.
+     * @return a list of shared private link resources as paginated response with {@link PagedIterable}.
      */
     PagedIterable<SharedPrivateLinkResource> list(String resourceGroupName, String resourceName, Context context);
 
@@ -62,7 +62,7 @@ public interface SignalRSharedPrivateLinkResources {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified shared private link resource.
+     * @return the specified shared private link resource along with {@link Response}.
      */
     Response<SharedPrivateLinkResource> getWithResponse(
         String sharedPrivateLinkResourceName, String resourceGroupName, String resourceName, Context context);
@@ -101,7 +101,7 @@ Response<SharedPrivateLinkResource> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified shared private link resource.
+     * @return the specified shared private link resource along with {@link Response}.
      */
     SharedPrivateLinkResource getById(String id);
 
@@ -113,7 +113,7 @@ Response<SharedPrivateLinkResource> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified shared private link resource.
+     * @return the specified shared private link resource along with {@link Response}.
      */
     Response<SharedPrivateLinkResource> getByIdWithResponse(String id, Context context);
 
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRs.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRs.java
index 1d6825c774e6..939737530741 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRs.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRs.java
@@ -31,7 +31,7 @@ public interface SignalRs {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to check name availability.
+     * @return result of the request to check name availability along with {@link Response}.
      */
     Response<NameAvailability> checkNameAvailabilityWithResponse(
         String location, NameAvailabilityParameters parameters, Context context);
@@ -41,7 +41,8 @@ Response<NameAvailability> checkNameAvailabilityWithResponse(
      *
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     PagedIterable<SignalRResource> list();
 
@@ -52,7 +53,8 @@ Response<NameAvailability> checkNameAvailabilityWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     PagedIterable<SignalRResource> list(Context context);
 
@@ -64,7 +66,8 @@ Response<NameAvailability> checkNameAvailabilityWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     PagedIterable<SignalRResource> listByResourceGroup(String resourceGroupName);
 
@@ -77,7 +80,8 @@ Response<NameAvailability> checkNameAvailabilityWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of resources and a possible link for next set.
+     * @return object that includes an array of resources and a possible link for next set as paginated response with
+     *     {@link PagedIterable}.
      */
     PagedIterable<SignalRResource> listByResourceGroup(String resourceGroupName, Context context);
 
@@ -104,7 +108,7 @@ Response<NameAvailability> checkNameAvailabilityWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the resource and its properties.
+     * @return the resource and its properties along with {@link Response}.
      */
     Response<SignalRResource> getByResourceGroupWithResponse(
         String resourceGroupName, String resourceName, Context context);
@@ -157,7 +161,7 @@ Response<SignalRResource> getByResourceGroupWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the access keys of the resource.
+     * @return the access keys of the resource along with {@link Response}.
      */
     Response<SignalRKeys> listKeysWithResponse(String resourceGroupName, String resourceName, Context context);
 
@@ -239,7 +243,7 @@ SignalRKeys regenerateKey(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list skus operation response.
+     * @return the list skus operation response along with {@link Response}.
      */
     Response<SkuList> listSkusWithResponse(String resourceGroupName, String resourceName, Context context);
 
@@ -250,7 +254,7 @@ SignalRKeys regenerateKey(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the resource and its properties.
+     * @return the resource and its properties along with {@link Response}.
      */
     SignalRResource getById(String id);
 
@@ -262,7 +266,7 @@ SignalRKeys regenerateKey(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the resource and its properties.
+     * @return the resource and its properties along with {@link Response}.
      */
     Response<SignalRResource> getByIdWithResponse(String id, Context context);
 
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Sku.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Sku.java
index 9f07763e5a26..33a52c7a8f9c 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Sku.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Sku.java
@@ -21,13 +21,13 @@ public final class Sku {
     private String resourceType;
 
     /*
-     * The exact set of keys that define this sku.
+     * The billing information of the resource.
      */
     @JsonProperty(value = "sku", access = JsonProperty.Access.WRITE_ONLY)
     private ResourceSku sku;
 
     /*
-     * Specifies the unit of the resource.
+     * Describes scaling information of a sku.
      */
     @JsonProperty(value = "capacity", access = JsonProperty.Access.WRITE_ONLY)
     private SkuCapacity capacity;
@@ -42,7 +42,7 @@ public String resourceType() {
     }
 
     /**
-     * Get the sku property: The exact set of keys that define this sku.
+     * Get the sku property: The billing information of the resource.
      *
      * @return the sku value.
      */
@@ -51,7 +51,7 @@ public ResourceSku sku() {
     }
 
     /**
-     * Get the capacity property: Specifies the unit of the resource.
+     * Get the capacity property: Describes scaling information of a sku.
      *
      * @return the capacity value.
      */
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/UpstreamAuthSettings.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/UpstreamAuthSettings.java
index 0ccdf1f3282e..995344cde6a1 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/UpstreamAuthSettings.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/UpstreamAuthSettings.java
@@ -9,26 +9,25 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-/** Upstream auth settings. */
+/** Upstream auth settings. If not set, no auth is used for upstream messages. */
 @Fluent
 public final class UpstreamAuthSettings {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(UpstreamAuthSettings.class);
 
     /*
-     * Gets or sets the type of auth. None or ManagedIdentity is supported now.
+     * Upstream auth type enum.
      */
     @JsonProperty(value = "type")
     private UpstreamAuthType type;
 
     /*
-     * Gets or sets the managed identity settings. It's required if the auth
-     * type is set to ManagedIdentity.
+     * Managed identity settings for upstream.
      */
     @JsonProperty(value = "managedIdentity")
     private ManagedIdentitySettings managedIdentity;
 
     /**
-     * Get the type property: Gets or sets the type of auth. None or ManagedIdentity is supported now.
+     * Get the type property: Upstream auth type enum.
      *
      * @return the type value.
      */
@@ -37,7 +36,7 @@ public UpstreamAuthType type() {
     }
 
     /**
-     * Set the type property: Gets or sets the type of auth. None or ManagedIdentity is supported now.
+     * Set the type property: Upstream auth type enum.
      *
      * @param type the type value to set.
      * @return the UpstreamAuthSettings object itself.
@@ -48,8 +47,7 @@ public UpstreamAuthSettings withType(UpstreamAuthType type) {
     }
 
     /**
-     * Get the managedIdentity property: Gets or sets the managed identity settings. It's required if the auth type is
-     * set to ManagedIdentity.
+     * Get the managedIdentity property: Managed identity settings for upstream.
      *
      * @return the managedIdentity value.
      */
@@ -58,8 +56,7 @@ public ManagedIdentitySettings managedIdentity() {
     }
 
     /**
-     * Set the managedIdentity property: Gets or sets the managed identity settings. It's required if the auth type is
-     * set to ManagedIdentity.
+     * Set the managedIdentity property: Managed identity settings for upstream.
      *
      * @param managedIdentity the managedIdentity value to set.
      * @return the UpstreamAuthSettings object itself.
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/UpstreamTemplate.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/UpstreamTemplate.java
index 9f2b8b5cdd72..a7c6695f2632 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/UpstreamTemplate.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/UpstreamTemplate.java
@@ -68,8 +68,8 @@ public final class UpstreamTemplate {
     private String urlTemplate;
 
     /*
-     * Gets or sets the auth settings for an upstream. If not set, no auth is
-     * used for upstream messages.
+     * Upstream auth settings. If not set, no auth is used for upstream
+     * messages.
      */
     @JsonProperty(value = "auth")
     private UpstreamAuthSettings auth;
@@ -177,8 +177,7 @@ public UpstreamTemplate withUrlTemplate(String urlTemplate) {
     }
 
     /**
-     * Get the auth property: Gets or sets the auth settings for an upstream. If not set, no auth is used for upstream
-     * messages.
+     * Get the auth property: Upstream auth settings. If not set, no auth is used for upstream messages.
      *
      * @return the auth value.
      */
@@ -187,8 +186,7 @@ public UpstreamAuthSettings auth() {
     }
 
     /**
-     * Set the auth property: Gets or sets the auth settings for an upstream. If not set, no auth is used for upstream
-     * messages.
+     * Set the auth property: Upstream auth settings. If not set, no auth is used for upstream messages.
      *
      * @param auth the auth value to set.
      * @return the UpstreamTemplate object itself.
diff --git a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Usages.java b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Usages.java
index 9a7c9bb01627..bbe902ae7122 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Usages.java
+++ b/sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/Usages.java
@@ -16,7 +16,8 @@ public interface Usages {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set as paginated
+     *     response with {@link PagedIterable}.
      */
     PagedIterable<SignalRUsage> list(String location);
 
@@ -28,7 +29,8 @@ public interface Usages {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return object that includes an array of the resource usages and a possible link for next set.
+     * @return object that includes an array of the resource usages and a possible link for next set as paginated
+     *     response with {@link PagedIterable}.
      */
     PagedIterable<SignalRUsage> list(String location, Context context);
 }