diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/CHANGELOG.md b/sdk/webpubsub/azure-resourcemanager-webpubsub/CHANGELOG.md
index c422efb6998e..02fd7818bcdb 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/CHANGELOG.md
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Release History
 
-## 1.0.0-beta.3 (Unreleased)
+## 1.0.0-beta.1 (2022-02-11)
+
+- Azure Resource Manager WebPubSub client library for Java. This package contains Microsoft Azure SDK for WebPubSub Management SDK. REST API for Azure WebPubSub 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/webpubsub/azure-resourcemanager-webpubsub/README.md b/sdk/webpubsub/azure-resourcemanager-webpubsub/README.md
index aed73f4e1fd9..22d6e16e903a 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/README.md
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-webpubsub</artifactId>
-    <version>1.0.0-beta.2</version>
+    <version>1.0.0-beta.3</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/WebPubSubManager.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/WebPubSubManager.java
index 26f61ee4e121..ff92d3b8014a 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/WebPubSubManager.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/WebPubSubManager.java
@@ -8,6 +8,7 @@
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelineBuilder;
+import com.azure.core.http.HttpPipelinePosition;
 import com.azure.core.http.policy.AddDatePolicy;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.http.policy.HttpLoggingPolicy;
@@ -41,6 +42,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /** Entry point to WebPubSubManager. REST API for Azure WebPubSub Service. */
 public final class WebPubSubManager {
@@ -194,7 +196,7 @@ public WebPubSubManager authenticate(TokenCredential credential, AzureProfile pr
                 .append("-")
                 .append("com.azure.resourcemanager.webpubsub")
                 .append("/")
-                .append("1.0.0-beta.2");
+                .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")
@@ -217,11 +219,24 @@ public WebPubSubManager authenticate(TokenCredential credential, AzureProfile pr
             List<HttpPipelinePolicy> policies = new ArrayList<>();
             policies.add(new UserAgentPolicy(userAgentBuilder.toString()));
             policies.add(new RequestIdPolicy());
+            policies
+                .addAll(
+                    this
+                        .policies
+                        .stream()
+                        .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL)
+                        .collect(Collectors.toList()));
             HttpPolicyProviders.addBeforeRetryPolicies(policies);
             policies.add(retryPolicy);
             policies.add(new AddDatePolicy());
             policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
-            policies.addAll(this.policies);
+            policies
+                .addAll(
+                    this
+                        .policies
+                        .stream()
+                        .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
+                        .collect(Collectors.toList()));
             HttpPolicyProviders.addAfterRetryPolicies(policies);
             policies.add(new HttpLoggingPolicy(httpLogOptions));
             HttpPipeline httpPipeline =
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubHubsClient.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubHubsClient.java
index f8e7854da67d..f00574e25e9d 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubHubsClient.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubHubsClient.java
@@ -12,6 +12,7 @@
 import com.azure.core.util.Context;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.webpubsub.fluent.models.WebPubSubHubInner;
+import reactor.core.publisher.Mono;
 
 /** An instance of this class provides access to all the operations defined in WebPubSubHubsClient. */
 public interface WebPubSubHubsClient {
@@ -70,7 +71,7 @@ public interface WebPubSubHubsClient {
      * @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 hub setting.
+     * @return a hub setting along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<WebPubSubHubInner> getWithResponse(
@@ -87,7 +88,7 @@ Response<WebPubSubHubInner> 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 a hub setting.
+     * @return a hub setting along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreateOrUpdate(
@@ -105,7 +106,7 @@ SyncPoller<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreateOrUpdate
      * @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 hub setting.
+     * @return a hub setting along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreateOrUpdate(
@@ -156,7 +157,7 @@ WebPubSubHubInner 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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(String hubName, String resourceGroupName, String resourceName);
@@ -172,7 +173,7 @@ WebPubSubHubInner 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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubPrivateEndpointConnectionsClient.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubPrivateEndpointConnectionsClient.java
index 90c7bd4627bc..47e4e3031254 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubPrivateEndpointConnectionsClient.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubPrivateEndpointConnectionsClient.java
@@ -12,6 +12,7 @@
 import com.azure.core.util.Context;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.webpubsub.fluent.models.PrivateEndpointConnectionInner;
+import reactor.core.publisher.Mono;
 
 /**
  * An instance of this class provides access to all the operations defined in WebPubSubPrivateEndpointConnectionsClient.
@@ -73,7 +74,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 +112,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 +132,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -148,7 +149,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubSharedPrivateLinkResourcesClient.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubSharedPrivateLinkResourcesClient.java
index c4cf4da62d89..4e522fbe4611 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubSharedPrivateLinkResourcesClient.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubSharedPrivateLinkResourcesClient.java
@@ -12,6 +12,7 @@
 import com.azure.core.util.Context;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.webpubsub.fluent.models.SharedPrivateLinkResourceInner;
+import reactor.core.publisher.Mono;
 
 /**
  * An instance of this class provides access to all the operations defined in WebPubSubSharedPrivateLinkResourcesClient.
@@ -73,7 +74,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 +91,8 @@ 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 describes a Shared Private Link Resource along with {@link Response} on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner> beginCreateOrUpdate(
@@ -111,7 +113,8 @@ 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 describes a Shared Private Link Resource along with {@link Response} on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner> beginCreateOrUpdate(
@@ -173,7 +176,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -190,7 +193,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubsClient.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubsClient.java
index 85eafd680a71..5c173524a6e6 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubsClient.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/WebPubSubsClient.java
@@ -17,6 +17,7 @@
 import com.azure.resourcemanager.webpubsub.fluent.models.WebPubSubResourceInner;
 import com.azure.resourcemanager.webpubsub.models.NameAvailabilityParameters;
 import com.azure.resourcemanager.webpubsub.models.RegenerateKeyParameters;
+import reactor.core.publisher.Mono;
 
 /** An instance of this class provides access to all the operations defined in WebPubSubsClient. */
 public interface WebPubSubsClient {
@@ -42,7 +43,7 @@ public interface WebPubSubsClient {
      * @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(
@@ -121,7 +122,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<WebPubSubResourceInner> getByResourceGroupWithResponse(
@@ -137,7 +138,7 @@ Response<WebPubSubResourceInner> 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 a class represent a resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginCreateOrUpdate(
@@ -154,7 +155,7 @@ SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginCrea
      * @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 a class represent a resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginCreateOrUpdate(
@@ -202,7 +203,7 @@ WebPubSubResourceInner 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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName);
@@ -217,7 +218,7 @@ WebPubSubResourceInner 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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName, Context context);
@@ -259,7 +260,7 @@ WebPubSubResourceInner 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 a class represent a resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginUpdate(
@@ -276,7 +277,7 @@ SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginUpda
      * @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 a class represent a resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginUpdate(
@@ -338,7 +339,7 @@ WebPubSubResourceInner 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<WebPubSubKeysInner> listKeysWithResponse(String resourceGroupName, String resourceName, Context context);
@@ -353,7 +354,8 @@ WebPubSubResourceInner 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 a class represents the access keys of the resource along with {@link Response} on successful completion
+     *     of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRegenerateKey(
@@ -370,7 +372,8 @@ SyncPoller<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRegenerateKe
      * @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 a class represents the access keys of the resource along with {@link Response} on successful completion
+     *     of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRegenerateKey(
@@ -417,7 +420,7 @@ WebPubSubKeysInner 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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginRestart(String resourceGroupName, String resourceName);
@@ -432,7 +435,7 @@ WebPubSubKeysInner 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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginRestart(String resourceGroupName, String resourceName, Context context);
@@ -488,7 +491,7 @@ WebPubSubKeysInner 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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/OperationInner.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/OperationInner.java
index 279b6ec5c29a..bc9fb8e1e6b8 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/OperationInner.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/PrivateEndpointConnectionInner.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/PrivateEndpointConnectionInner.java
index 2a5cd55fba9c..81f4ebd6e213 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/PrivateEndpointConnectionInner.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/PrivateEndpointConnectionProperties.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/PrivateEndpointConnectionProperties.java
index 26300d518a99..4be9fd53af89 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/PrivateEndpointConnectionProperties.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/PrivateLinkResourceInner.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/PrivateLinkResourceInner.java
index e3d4589d8af4..ae74ef342341 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/PrivateLinkResourceInner.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/SharedPrivateLinkResourceInner.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/SharedPrivateLinkResourceInner.java
index 1e92d03b4f19..f56a3e684530 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/SharedPrivateLinkResourceInner.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/SharedPrivateLinkResourceProperties.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/SharedPrivateLinkResourceProperties.java
index 34fe5dbcbdfd..d48f8524c956 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/SharedPrivateLinkResourceProperties.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubHubInner.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubHubInner.java
index b215c9b9132f..f4476fa308b9 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubHubInner.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubHubInner.java
@@ -24,7 +24,7 @@ public final class WebPubSubHubInner extends ProxyResource {
     private SystemData systemData;
 
     /*
-     * Properties of the hub setting.
+     * Properties of a hub.
      */
     @JsonProperty(value = "properties", required = true)
     private WebPubSubHubProperties properties;
@@ -39,7 +39,7 @@ public SystemData systemData() {
     }
 
     /**
-     * Get the properties property: Properties of the hub setting.
+     * Get the properties property: Properties of a hub.
      *
      * @return the properties value.
      */
@@ -48,7 +48,7 @@ public WebPubSubHubProperties properties() {
     }
 
     /**
-     * Set the properties property: Properties of the hub setting.
+     * Set the properties property: Properties of a hub.
      *
      * @param properties the properties value to set.
      * @return the WebPubSubHubInner object itself.
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubProperties.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubProperties.java
index a814d7ef99a2..9b950026564d 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubProperties.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubProperties.java
@@ -72,7 +72,7 @@ public final class WebPubSubProperties {
     private List<SharedPrivateLinkResourceInner> sharedPrivateLinkResources;
 
     /*
-     * TLS settings.
+     * TLS settings for the resource
      */
     @JsonProperty(value = "tls")
     private WebPubSubTlsSettings tls;
@@ -91,16 +91,12 @@ public final class WebPubSubProperties {
 
     /*
      * 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;
 
     /*
-     * Network ACLs
+     * Network ACLs for the resource
      */
     @JsonProperty(value = "networkACLs")
     private WebPubSubNetworkACLs networkACLs;
@@ -205,7 +201,7 @@ public List<SharedPrivateLinkResourceInner> sharedPrivateLinkResources() {
     }
 
     /**
-     * Get the tls property: TLS settings.
+     * Get the tls property: TLS settings for the resource.
      *
      * @return the tls value.
      */
@@ -214,7 +210,7 @@ public WebPubSubTlsSettings 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 WebPubSubProperties object itself.
@@ -254,10 +250,7 @@ public WebPubSubProperties withLiveTraceConfiguration(LiveTraceConfiguration liv
     }
 
     /**
-     * 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.
      */
@@ -266,10 +259,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 WebPubSubProperties object itself.
@@ -280,7 +270,7 @@ public WebPubSubProperties withResourceLogConfiguration(ResourceLogConfiguration
     }
 
     /**
-     * Get the networkACLs property: Network ACLs.
+     * Get the networkACLs property: Network ACLs for the resource.
      *
      * @return the networkACLs value.
      */
@@ -289,7 +279,7 @@ public WebPubSubNetworkACLs 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 WebPubSubProperties object itself.
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubResourceInner.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubResourceInner.java
index 484195d25907..f74738c1eaec 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubResourceInner.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/fluent/models/WebPubSubResourceInner.java
@@ -26,19 +26,19 @@ public final class WebPubSubResourceInner extends Resource {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(WebPubSubResourceInner.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 WebPubSubProperties innerProperties;
 
     /*
-     * The managed identity response
+     * A class represent managed identities used for request and response
      */
     @JsonProperty(value = "identity")
     private ManagedIdentity identity;
@@ -50,7 +50,7 @@ public final class WebPubSubResourceInner 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.
      */
@@ -59,7 +59,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 WebPubSubResourceInner object itself.
@@ -70,7 +70,7 @@ public WebPubSubResourceInner 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.
      */
@@ -79,7 +79,7 @@ private WebPubSubProperties innerProperties() {
     }
 
     /**
-     * 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.
      */
@@ -88,7 +88,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 WebPubSubResourceInner object itself.
@@ -196,7 +196,7 @@ public List<SharedPrivateLinkResourceInner> sharedPrivateLinkResources() {
     }
 
     /**
-     * Get the tls property: TLS settings.
+     * Get the tls property: TLS settings for the resource.
      *
      * @return the tls value.
      */
@@ -205,7 +205,7 @@ public WebPubSubTlsSettings 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 WebPubSubResourceInner object itself.
@@ -251,10 +251,7 @@ public WebPubSubResourceInner withLiveTraceConfiguration(LiveTraceConfiguration
     }
 
     /**
-     * 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.
      */
@@ -263,10 +260,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 WebPubSubResourceInner object itself.
@@ -280,7 +274,7 @@ public WebPubSubResourceInner withResourceLogConfiguration(ResourceLogConfigurat
     }
 
     /**
-     * Get the networkACLs property: Network ACLs.
+     * Get the networkACLs property: Network ACLs for the resource.
      *
      * @return the networkACLs value.
      */
@@ -289,7 +283,7 @@ public WebPubSubNetworkACLs 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 WebPubSubResourceInner object itself.
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/OperationsClientImpl.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/OperationsClientImpl.java
index c320fe3ea2d4..5f7ad2a84afe 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/OperationsClientImpl.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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) {
@@ -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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/UsagesClientImpl.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/UsagesClientImpl.java
index a624f960b579..f3d6397fdea0 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/UsagesClientImpl.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/UsagesClientImpl.java
@@ -88,7 +88,8 @@ Mono<Response<SignalRServiceUsageList>> 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<SignalRServiceUsageInner>> listSinglePageAsync(String location) {
@@ -139,7 +140,8 @@ private Mono<PagedResponse<SignalRServiceUsageInner>> listSinglePageAsync(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 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<SignalRServiceUsageInner>> listSinglePageAsync(String location, Context context) {
@@ -245,7 +247,8 @@ public PagedIterable<SignalRServiceUsageInner> list(String location, Context con
      * @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<SignalRServiceUsageInner>> listNextSinglePageAsync(String nextLink) {
@@ -281,7 +284,8 @@ private Mono<PagedResponse<SignalRServiceUsageInner>> 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 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<SignalRServiceUsageInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubHubsClientImpl.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubHubsClientImpl.java
index a10875455e57..a56716686c0b 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubHubsClientImpl.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubHubsClientImpl.java
@@ -151,7 +151,7 @@ Mono<Response<WebPubSubHubList>> 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 hub setting list.
+     * @return hub setting list along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<WebPubSubHubInner>> listSinglePageAsync(String resourceGroupName, String resourceName) {
@@ -209,7 +209,7 @@ private Mono<PagedResponse<WebPubSubHubInner>> listSinglePageAsync(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 hub setting list.
+     * @return hub setting list along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<WebPubSubHubInner>> listSinglePageAsync(
@@ -334,7 +334,7 @@ public PagedIterable<WebPubSubHubInner> list(String resourceGroupName, String re
      * @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 hub setting.
+     * @return a hub setting along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<WebPubSubHubInner>> getWithResponseAsync(
@@ -389,7 +389,7 @@ private Mono<Response<WebPubSubHubInner>> 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 a hub setting.
+     * @return a hub setting along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<WebPubSubHubInner>> getWithResponseAsync(
@@ -440,7 +440,7 @@ private Mono<Response<WebPubSubHubInner>> 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 a hub setting.
+     * @return a hub setting on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<WebPubSubHubInner> getAsync(String hubName, String resourceGroupName, String resourceName) {
@@ -483,7 +483,7 @@ public WebPubSubHubInner get(String hubName, String resourceGroupName, String re
      * @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 hub setting.
+     * @return a hub setting along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<WebPubSubHubInner> getWithResponse(
@@ -502,7 +502,7 @@ public Response<WebPubSubHubInner> 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 hub setting.
+     * @return a hub setting along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -564,7 +564,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 hub setting.
+     * @return a hub setting along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -622,7 +622,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 hub setting.
+     * @return a hub setting along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreateOrUpdateAsync(
@@ -632,7 +632,11 @@ private PollerFlux<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreate
         return this
             .client
             .<WebPubSubHubInner, WebPubSubHubInner>getLroResult(
-                mono, this.client.getHttpPipeline(), WebPubSubHubInner.class, WebPubSubHubInner.class, Context.NONE);
+                mono,
+                this.client.getHttpPipeline(),
+                WebPubSubHubInner.class,
+                WebPubSubHubInner.class,
+                this.client.getContext());
     }
 
     /**
@@ -647,7 +651,7 @@ private PollerFlux<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreate
      * @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 hub setting.
+     * @return a hub setting along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreateOrUpdateAsync(
@@ -672,7 +676,7 @@ private PollerFlux<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreate
      * @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 hub setting.
+     * @return a hub setting along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreateOrUpdate(
@@ -692,7 +696,7 @@ public SyncPoller<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreateO
      * @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 hub setting.
+     * @return a hub setting along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreateOrUpdate(
@@ -711,7 +715,7 @@ public SyncPoller<PollResult<WebPubSubHubInner>, WebPubSubHubInner> beginCreateO
      * @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 hub setting.
+     * @return a hub setting on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<WebPubSubHubInner> createOrUpdateAsync(
@@ -733,7 +737,7 @@ private Mono<WebPubSubHubInner> 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 hub setting.
+     * @return a hub setting on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<WebPubSubHubInner> createOrUpdateAsync(
@@ -792,7 +796,7 @@ public WebPubSubHubInner 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(
@@ -847,7 +851,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(
@@ -898,7 +902,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.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
@@ -906,7 +910,8 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
         Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(hubName, 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());
     }
 
     /**
@@ -920,7 +925,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
@@ -943,7 +948,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -962,7 +967,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -980,7 +985,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 hubName, String resourceGroupName, String resourceName) {
@@ -1000,7 +1005,7 @@ private Mono<Void> deleteAsync(String hubName, 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 completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(String hubName, String resourceGroupName, String resourceName, Context context) {
@@ -1049,7 +1054,7 @@ public void delete(String hubName, 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 hub setting list.
+     * @return hub setting list along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<WebPubSubHubInner>> listNextSinglePageAsync(String nextLink) {
@@ -1085,7 +1090,7 @@ private Mono<PagedResponse<WebPubSubHubInner>> 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 hub setting list.
+     * @return hub setting list along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<WebPubSubHubInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubPrivateEndpointConnectionsClientImpl.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubPrivateEndpointConnectionsClientImpl.java
index 3e592fe99eb1..9255f9f09637 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubPrivateEndpointConnectionsClientImpl.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubPrivateEndpointConnectionsClientImpl.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(
@@ -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 Response} on successful completion of {@link Mono}.
      */
     @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 Response} on successful completion of {@link Mono}.
      */
     @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 Response} on successful completion of {@link Mono}.
      */
     @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 Response} on successful completion of {@link Mono}.
      */
     @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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubPrivateLinkResourcesClientImpl.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubPrivateLinkResourcesClientImpl.java
index 765ec89c8997..5fe1965a0efb 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubPrivateLinkResourcesClientImpl.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubPrivateLinkResourcesClientImpl.java
@@ -98,7 +98,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(
@@ -157,7 +158,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(
@@ -281,7 +283,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) {
@@ -317,7 +320,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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubSharedPrivateLinkResourcesClientImpl.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubSharedPrivateLinkResourcesClientImpl.java
index 931051e5fbc4..76447ad627fe 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubSharedPrivateLinkResourcesClientImpl.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubSharedPrivateLinkResourcesClientImpl.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(
@@ -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,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.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner>
@@ -670,7 +677,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
                 this.client.getHttpPipeline(),
                 SharedPrivateLinkResourceInner.class,
                 SharedPrivateLinkResourceInner.class,
-                Context.NONE);
+                this.client.getContext());
     }
 
     /**
@@ -685,7 +692,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.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner>
@@ -720,7 +728,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.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner> beginCreateOrUpdate(
@@ -744,7 +753,8 @@ 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 along with {@link Response} on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<SharedPrivateLinkResourceInner>, SharedPrivateLinkResourceInner> beginCreateOrUpdate(
@@ -769,7 +779,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 +804,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 +876,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 +934,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 +988,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.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
@@ -987,7 +997,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 +1012,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
@@ -1024,7 +1035,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -1043,7 +1054,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -1062,7 +1073,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 +1094,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 +1145,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 +1182,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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubsClientImpl.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubsClientImpl.java
index e1e370a1914a..f20575dca50e 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubsClientImpl.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/implementation/WebPubSubsClientImpl.java
@@ -266,7 +266,8 @@ Mono<Response<WebPubSubResourceList>> 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(
@@ -316,7 +317,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(
@@ -362,7 +364,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(
@@ -402,7 +404,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(
@@ -415,7 +417,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<WebPubSubResourceInner>> listSinglePageAsync() {
@@ -461,7 +464,8 @@ private Mono<PagedResponse<WebPubSubResourceInner>> 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<WebPubSubResourceInner>> listSinglePageAsync(Context context) {
@@ -559,7 +563,8 @@ public PagedIterable<WebPubSubResourceInner> 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<WebPubSubResourceInner>> listByResourceGroupSinglePageAsync(String resourceGroupName) {
@@ -612,7 +617,8 @@ private Mono<PagedResponse<WebPubSubResourceInner>> listByResourceGroupSinglePag
      * @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<WebPubSubResourceInner>> listByResourceGroupSinglePageAsync(
@@ -729,7 +735,7 @@ public PagedIterable<WebPubSubResourceInner> listByResourceGroup(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 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<WebPubSubResourceInner>> getByResourceGroupWithResponseAsync(
@@ -779,7 +785,7 @@ private Mono<Response<WebPubSubResourceInner>> getByResourceGroupWithResponseAsy
      * @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<WebPubSubResourceInner>> getByResourceGroupWithResponseAsync(
@@ -825,7 +831,7 @@ private Mono<Response<WebPubSubResourceInner>> getByResourceGroupWithResponseAsy
      * @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<WebPubSubResourceInner> getByResourceGroupAsync(String resourceGroupName, String resourceName) {
@@ -866,7 +872,7 @@ public WebPubSubResourceInner getByResourceGroup(String resourceGroupName, Strin
      * @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<WebPubSubResourceInner> getByResourceGroupWithResponse(
@@ -884,7 +890,7 @@ public Response<WebPubSubResourceInner> 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(
@@ -941,7 +947,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(
@@ -994,7 +1000,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.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginCreateOrUpdateAsync(
@@ -1008,7 +1014,7 @@ private PollerFlux<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> b
                 this.client.getHttpPipeline(),
                 WebPubSubResourceInner.class,
                 WebPubSubResourceInner.class,
-                Context.NONE);
+                this.client.getContext());
     }
 
     /**
@@ -1022,7 +1028,7 @@ private PollerFlux<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> b
      * @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.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginCreateOrUpdateAsync(
@@ -1050,7 +1056,7 @@ private PollerFlux<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> b
      * @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.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginCreateOrUpdate(
@@ -1069,7 +1075,7 @@ public SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> be
      * @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.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginCreateOrUpdate(
@@ -1087,7 +1093,7 @@ public SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> be
      * @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<WebPubSubResourceInner> createOrUpdateAsync(
@@ -1108,7 +1114,7 @@ private Mono<WebPubSubResourceInner> 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<WebPubSubResourceInner> createOrUpdateAsync(
@@ -1164,7 +1170,7 @@ public WebPubSubResourceInner 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) {
@@ -1213,7 +1219,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(
@@ -1259,14 +1265,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 Response} on successful completion of {@link Mono}.
      */
     @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());
     }
 
     /**
@@ -1279,7 +1286,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
@@ -1300,7 +1307,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName) {
@@ -1317,7 +1324,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
@@ -1334,7 +1341,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) {
@@ -1351,7 +1358,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) {
@@ -1401,7 +1408,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(
@@ -1458,7 +1465,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(
@@ -1511,7 +1518,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.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginUpdateAsync(
@@ -1524,7 +1531,7 @@ private PollerFlux<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> b
                 this.client.getHttpPipeline(),
                 WebPubSubResourceInner.class,
                 WebPubSubResourceInner.class,
-                Context.NONE);
+                this.client.getContext());
     }
 
     /**
@@ -1538,7 +1545,7 @@ private PollerFlux<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> b
      * @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.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginUpdateAsync(
@@ -1566,7 +1573,7 @@ private PollerFlux<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> b
      * @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.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginUpdate(
@@ -1585,7 +1592,7 @@ public SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> be
      * @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.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> beginUpdate(
@@ -1603,7 +1610,7 @@ public SyncPoller<PollResult<WebPubSubResourceInner>, WebPubSubResourceInner> be
      * @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<WebPubSubResourceInner> updateAsync(
@@ -1624,7 +1631,7 @@ private Mono<WebPubSubResourceInner> 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<WebPubSubResourceInner> updateAsync(
@@ -1680,7 +1687,7 @@ public WebPubSubResourceInner 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<WebPubSubKeysInner>> listKeysWithResponseAsync(
@@ -1730,7 +1737,7 @@ private Mono<Response<WebPubSubKeysInner>> 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 along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<WebPubSubKeysInner>> listKeysWithResponseAsync(
@@ -1776,7 +1783,7 @@ private Mono<Response<WebPubSubKeysInner>> 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<WebPubSubKeysInner> listKeysAsync(String resourceGroupName, String resourceName) {
@@ -1817,7 +1824,7 @@ public WebPubSubKeysInner 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<WebPubSubKeysInner> listKeysWithResponse(
@@ -1835,7 +1842,8 @@ public Response<WebPubSubKeysInner> 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(
@@ -1892,7 +1900,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(
@@ -1945,7 +1954,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.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRegenerateKeyAsync(
@@ -1955,7 +1965,11 @@ private PollerFlux<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRege
         return this
             .client
             .<WebPubSubKeysInner, WebPubSubKeysInner>getLroResult(
-                mono, this.client.getHttpPipeline(), WebPubSubKeysInner.class, WebPubSubKeysInner.class, Context.NONE);
+                mono,
+                this.client.getHttpPipeline(),
+                WebPubSubKeysInner.class,
+                WebPubSubKeysInner.class,
+                this.client.getContext());
     }
 
     /**
@@ -1969,7 +1983,8 @@ private PollerFlux<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRege
      * @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.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRegenerateKeyAsync(
@@ -1993,7 +2008,8 @@ private PollerFlux<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRege
      * @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.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRegenerateKey(
@@ -2012,7 +2028,8 @@ public SyncPoller<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRegen
      * @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.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRegenerateKey(
@@ -2030,7 +2047,7 @@ public SyncPoller<PollResult<WebPubSubKeysInner>, WebPubSubKeysInner> beginRegen
      * @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<WebPubSubKeysInner> regenerateKeyAsync(
@@ -2051,7 +2068,7 @@ private Mono<WebPubSubKeysInner> 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<WebPubSubKeysInner> regenerateKeyAsync(
@@ -2107,7 +2124,7 @@ public WebPubSubKeysInner 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) {
@@ -2156,7 +2173,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(
@@ -2202,14 +2219,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 Response} on successful completion of {@link Mono}.
      */
     @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());
     }
 
     /**
@@ -2222,7 +2240,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginRestartAsync(
@@ -2243,7 +2261,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginRestart(String resourceGroupName, String resourceName) {
@@ -2260,7 +2278,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 Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginRestart(
@@ -2277,7 +2295,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) {
@@ -2294,7 +2312,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) {
@@ -2343,7 +2361,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) {
@@ -2392,7 +2410,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(
@@ -2438,7 +2456,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) {
@@ -2479,7 +2497,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) {
@@ -2493,7 +2511,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<WebPubSubResourceInner>> listBySubscriptionNextSinglePageAsync(String nextLink) {
@@ -2530,7 +2549,8 @@ private Mono<PagedResponse<WebPubSubResourceInner>> listBySubscriptionNextSingle
      * @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<WebPubSubResourceInner>> listBySubscriptionNextSinglePageAsync(
@@ -2566,7 +2586,8 @@ private Mono<PagedResponse<WebPubSubResourceInner>> listBySubscriptionNextSingle
      * @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<WebPubSubResourceInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
@@ -2603,7 +2624,8 @@ private Mono<PagedResponse<WebPubSubResourceInner>> listByResourceGroupNextSingl
      * @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<WebPubSubResourceInner>> listByResourceGroupNextSinglePageAsync(
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/EventHandler.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/EventHandler.java
index 30aa31166814..402c6ec2d028 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/EventHandler.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/EventHandler.java
@@ -44,8 +44,8 @@ public final class EventHandler {
     private List<String> systemEvents;
 
     /*
-     * Gets or sets the auth settings for an event handler. If not set, no auth
-     * is used.
+     * Upstream auth settings. If not set, no auth is used for upstream
+     * messages.
      */
     @JsonProperty(value = "auth")
     private UpstreamAuthSettings auth;
@@ -123,7 +123,7 @@ public EventHandler withSystemEvents(List<String> systemEvents) {
     }
 
     /**
-     * Get the auth property: Gets or sets the auth settings for an event handler. If not set, no auth is used.
+     * Get the auth property: Upstream auth settings. If not set, no auth is used for upstream messages.
      *
      * @return the auth value.
      */
@@ -132,7 +132,7 @@ public UpstreamAuthSettings auth() {
     }
 
     /**
-     * Set the auth property: Gets or sets the auth settings for an event handler. If not set, no auth is used.
+     * 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 EventHandler object itself.
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/ManagedIdentity.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/ManagedIdentity.java
index a05fdad2fcf6..d29173fe7e4d 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/ManagedIdentity.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/Operation.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/Operation.java
index cbcd019d1460..ff42de3760f6 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/Operation.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/OperationProperties.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/OperationProperties.java
index 100e1d699117..f79ac2a5f286 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/OperationProperties.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/PrivateEndpointConnection.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/PrivateEndpointConnection.java
index 8343c0515da7..28bb0cdeaa29 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/PrivateEndpointConnection.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/RegenerateKeyParameters.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/RegenerateKeyParameters.java
index cefc6d4d3fa5..b27259ae8468 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/RegenerateKeyParameters.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/SharedPrivateLinkResource.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/SharedPrivateLinkResource.java
index 10d62ed2b39f..3569a8d8ba52 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/SharedPrivateLinkResource.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/Sku.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/Sku.java
index af3d5893653a..fcdca1cc8a84 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/Sku.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/UpstreamAuthSettings.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/UpstreamAuthSettings.java
index c5657e1902eb..cd6b02d2b3f3 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/UpstreamAuthSettings.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubHub.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubHub.java
index 25850cc0c6b0..ab522a47f0cf 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubHub.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubHub.java
@@ -39,7 +39,7 @@ public interface WebPubSubHub {
     SystemData systemData();
 
     /**
-     * Gets the properties property: Properties of the hub setting.
+     * Gets the properties property: Properties of a hub.
      *
      * @return the properties value.
      */
@@ -79,9 +79,9 @@ interface WithParentResource {
         /** The stage of the WebPubSubHub definition allowing to specify properties. */
         interface WithProperties {
             /**
-             * Specifies the properties property: Properties of the hub setting..
+             * Specifies the properties property: Properties of a hub..
              *
-             * @param properties Properties of the hub setting.
+             * @param properties Properties of a hub.
              * @return the next definition stage.
              */
             WithCreate withProperties(WebPubSubHubProperties properties);
@@ -136,9 +136,9 @@ interface UpdateStages {
         /** The stage of the WebPubSubHub update allowing to specify properties. */
         interface WithProperties {
             /**
-             * Specifies the properties property: Properties of the hub setting..
+             * Specifies the properties property: Properties of a hub..
              *
-             * @param properties Properties of the hub setting.
+             * @param properties Properties of a hub.
              * @return the next definition stage.
              */
             Update withProperties(WebPubSubHubProperties properties);
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubHubs.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubHubs.java
index 8ba35f6fb36b..4cad8afcafc0 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubHubs.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubHubs.java
@@ -62,7 +62,7 @@ public interface WebPubSubHubs {
      * @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 hub setting.
+     * @return a hub setting along with {@link Response}.
      */
     Response<WebPubSubHub> getWithResponse(
         String hubName, String resourceGroupName, String resourceName, Context context);
@@ -101,7 +101,7 @@ Response<WebPubSubHub> 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 a hub setting.
+     * @return a hub setting along with {@link Response}.
      */
     WebPubSubHub getById(String id);
 
@@ -113,7 +113,7 @@ Response<WebPubSubHub> 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 a hub setting.
+     * @return a hub setting along with {@link Response}.
      */
     Response<WebPubSubHub> getByIdWithResponse(String id, Context context);
 
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubNetworkACLs.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubNetworkACLs.java
index f25999a1d547..b76c6e0aa98d 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubNetworkACLs.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubNetworkACLs.java
@@ -16,13 +16,13 @@ public final class WebPubSubNetworkACLs {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(WebPubSubNetworkACLs.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 WebPubSubNetworkACLs {
     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 WebPubSubNetworkACLs object itself.
@@ -54,7 +54,7 @@ public WebPubSubNetworkACLs 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 WebPubSubNetworkACLs object itself.
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubPrivateEndpointConnections.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubPrivateEndpointConnections.java
index 66d331344b99..547f1c082e3f 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubPrivateEndpointConnections.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubPrivateEndpointConnections.java
@@ -63,7 +63,7 @@ public interface WebPubSubPrivateEndpointConnections {
      * @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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubResource.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubResource.java
index bcb704a905f5..c880f34f4085 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubResource.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubResource.java
@@ -50,14 +50,14 @@ public interface WebPubSubResource {
     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 identity property: The managed identity response.
+     * Gets the identity property: A class represent managed identities used for request and response.
      *
      * @return the identity value.
      */
@@ -129,7 +129,7 @@ public interface WebPubSubResource {
     List<SharedPrivateLinkResource> sharedPrivateLinkResources();
 
     /**
-     * Gets the tls property: TLS settings.
+     * Gets the tls property: TLS settings for the resource.
      *
      * @return the tls value.
      */
@@ -150,17 +150,14 @@ public interface WebPubSubResource {
     LiveTraceConfiguration liveTraceConfiguration();
 
     /**
-     * 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.
      */
     ResourceLogConfiguration resourceLogConfiguration();
 
     /**
-     * Gets the networkACLs property: Network ACLs.
+     * Gets the networkACLs property: Network ACLs for the resource.
      *
      * @return the networkACLs value.
      */
@@ -296,9 +293,9 @@ interface WithTags {
         /** The stage of the WebPubSubResource 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);
@@ -306,9 +303,9 @@ interface WithSku {
         /** The stage of the WebPubSubResource 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);
@@ -316,9 +313,9 @@ interface WithIdentity {
         /** The stage of the WebPubSubResource 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(WebPubSubTlsSettings tls);
@@ -338,14 +335,9 @@ interface WithLiveTraceConfiguration {
         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..
+             * resource..
              *
-             * @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.
+             * @param resourceLogConfiguration Resource log configuration of a Microsoft.SignalRService resource.
              * @return the next definition stage.
              */
             WithCreate withResourceLogConfiguration(ResourceLogConfiguration resourceLogConfiguration);
@@ -353,9 +345,9 @@ interface WithResourceLogConfiguration {
         /** The stage of the WebPubSubResource 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(WebPubSubNetworkACLs networkACLs);
@@ -448,9 +440,9 @@ interface WithTags {
         /** The stage of the WebPubSubResource 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);
@@ -458,9 +450,9 @@ interface WithSku {
         /** The stage of the WebPubSubResource 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);
@@ -468,9 +460,9 @@ interface WithIdentity {
         /** The stage of the WebPubSubResource 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(WebPubSubTlsSettings tls);
@@ -490,14 +482,9 @@ interface WithLiveTraceConfiguration {
         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..
+             * resource..
              *
-             * @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.
+             * @param resourceLogConfiguration Resource log configuration of a Microsoft.SignalRService resource.
              * @return the next definition stage.
              */
             Update withResourceLogConfiguration(ResourceLogConfiguration resourceLogConfiguration);
@@ -505,9 +492,9 @@ interface WithResourceLogConfiguration {
         /** The stage of the WebPubSubResource 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(WebPubSubNetworkACLs networkACLs);
@@ -582,7 +569,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<WebPubSubKeys> listKeysWithResponse(Context context);
 
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubSharedPrivateLinkResources.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubSharedPrivateLinkResources.java
index c8fe46497006..a6c68cd00b39 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubSharedPrivateLinkResources.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubSharedPrivateLinkResources.java
@@ -62,7 +62,7 @@ public interface WebPubSubSharedPrivateLinkResources {
      * @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/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubs.java b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubs.java
index b4d18322ac0b..71892ef734da 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubs.java
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/src/main/java/com/azure/resourcemanager/webpubsub/models/WebPubSubs.java
@@ -31,7 +31,7 @@ public interface WebPubSubs {
      * @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);
@@ -104,7 +104,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<WebPubSubResource> getByResourceGroupWithResponse(
         String resourceGroupName, String resourceName, Context context);
@@ -157,7 +157,7 @@ Response<WebPubSubResource> 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<WebPubSubKeys> listKeysWithResponse(String resourceGroupName, String resourceName, Context context);
 
@@ -239,7 +239,7 @@ WebPubSubKeys 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 +250,7 @@ WebPubSubKeys 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}.
      */
     WebPubSubResource getById(String id);
 
@@ -262,7 +262,7 @@ WebPubSubKeys 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<WebPubSubResource> getByIdWithResponse(String id, Context context);