diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/CHANGELOG.md b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/CHANGELOG.md
index ae3531700c92..371355bbb8fb 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/CHANGELOG.md
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Release History
 
-## 1.0.0-beta.5 (Unreleased)
+## 1.0.0-beta.1 (2022-06-07)
+
+- Azure Resource Manager CognitiveServices client library for Java. This package contains Microsoft Azure SDK for CognitiveServices Management SDK. Cognitive Services Management Client. Package tag package-2022-03. 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/cognitiveservices/azure-resourcemanager-cognitiveservices/README.md b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/README.md
index 46edaeafaa87..2977e22f8f08 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/README.md
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-cognitiveservices</artifactId>
-    <version>1.0.0-beta.4</version>
+    <version>1.0.0-beta.5</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/CognitiveServicesManager.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/CognitiveServicesManager.java
index d3e2e9bf6de9..43282a529a1c 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/CognitiveServicesManager.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/CognitiveServicesManager.java
@@ -239,7 +239,7 @@ public CognitiveServicesManager authenticate(TokenCredential credential, AzurePr
                 .append("-")
                 .append("com.azure.resourcemanager.cognitiveservices")
                 .append("/")
-                .append("1.0.0-beta.4");
+                .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")
@@ -296,7 +296,11 @@ public CognitiveServicesManager authenticate(TokenCredential credential, AzurePr
         }
     }
 
-    /** @return Resource collection API of Accounts. */
+    /**
+     * Gets the resource collection API of Accounts. It manages Account.
+     *
+     * @return Resource collection API of Accounts.
+     */
     public Accounts accounts() {
         if (this.accounts == null) {
             this.accounts = new AccountsImpl(clientObject.getAccounts(), this);
@@ -304,7 +308,11 @@ public Accounts accounts() {
         return accounts;
     }
 
-    /** @return Resource collection API of DeletedAccounts. */
+    /**
+     * Gets the resource collection API of DeletedAccounts.
+     *
+     * @return Resource collection API of DeletedAccounts.
+     */
     public DeletedAccounts deletedAccounts() {
         if (this.deletedAccounts == null) {
             this.deletedAccounts = new DeletedAccountsImpl(clientObject.getDeletedAccounts(), this);
@@ -312,7 +320,11 @@ public DeletedAccounts deletedAccounts() {
         return deletedAccounts;
     }
 
-    /** @return Resource collection API of ResourceSkus. */
+    /**
+     * Gets the resource collection API of ResourceSkus.
+     *
+     * @return Resource collection API of ResourceSkus.
+     */
     public ResourceSkus resourceSkus() {
         if (this.resourceSkus == null) {
             this.resourceSkus = new ResourceSkusImpl(clientObject.getResourceSkus(), this);
@@ -320,7 +332,11 @@ public ResourceSkus resourceSkus() {
         return resourceSkus;
     }
 
-    /** @return Resource collection API of Operations. */
+    /**
+     * Gets the resource collection API of Operations.
+     *
+     * @return Resource collection API of Operations.
+     */
     public Operations operations() {
         if (this.operations == null) {
             this.operations = new OperationsImpl(clientObject.getOperations(), this);
@@ -328,7 +344,11 @@ public Operations operations() {
         return operations;
     }
 
-    /** @return Resource collection API of ResourceProviders. */
+    /**
+     * Gets the resource collection API of ResourceProviders.
+     *
+     * @return Resource collection API of ResourceProviders.
+     */
     public ResourceProviders resourceProviders() {
         if (this.resourceProviders == null) {
             this.resourceProviders = new ResourceProvidersImpl(clientObject.getResourceProviders(), this);
@@ -336,7 +356,11 @@ public ResourceProviders resourceProviders() {
         return resourceProviders;
     }
 
-    /** @return Resource collection API of CommitmentTiers. */
+    /**
+     * Gets the resource collection API of CommitmentTiers.
+     *
+     * @return Resource collection API of CommitmentTiers.
+     */
     public CommitmentTiers commitmentTiers() {
         if (this.commitmentTiers == null) {
             this.commitmentTiers = new CommitmentTiersImpl(clientObject.getCommitmentTiers(), this);
@@ -344,7 +368,11 @@ public CommitmentTiers commitmentTiers() {
         return commitmentTiers;
     }
 
-    /** @return Resource collection API of PrivateEndpointConnections. */
+    /**
+     * Gets the resource collection API of PrivateEndpointConnections. It manages PrivateEndpointConnection.
+     *
+     * @return Resource collection API of PrivateEndpointConnections.
+     */
     public PrivateEndpointConnections privateEndpointConnections() {
         if (this.privateEndpointConnections == null) {
             this.privateEndpointConnections =
@@ -353,7 +381,11 @@ public PrivateEndpointConnections privateEndpointConnections() {
         return privateEndpointConnections;
     }
 
-    /** @return Resource collection API of PrivateLinkResources. */
+    /**
+     * Gets the resource collection API of PrivateLinkResources.
+     *
+     * @return Resource collection API of PrivateLinkResources.
+     */
     public PrivateLinkResources privateLinkResources() {
         if (this.privateLinkResources == null) {
             this.privateLinkResources = new PrivateLinkResourcesImpl(clientObject.getPrivateLinkResources(), this);
@@ -361,7 +393,11 @@ public PrivateLinkResources privateLinkResources() {
         return privateLinkResources;
     }
 
-    /** @return Resource collection API of Deployments. */
+    /**
+     * Gets the resource collection API of Deployments. It manages Deployment.
+     *
+     * @return Resource collection API of Deployments.
+     */
     public Deployments deployments() {
         if (this.deployments == null) {
             this.deployments = new DeploymentsImpl(clientObject.getDeployments(), this);
@@ -369,7 +405,11 @@ public Deployments deployments() {
         return deployments;
     }
 
-    /** @return Resource collection API of CommitmentPlans. */
+    /**
+     * Gets the resource collection API of CommitmentPlans. It manages CommitmentPlan.
+     *
+     * @return Resource collection API of CommitmentPlans.
+     */
     public CommitmentPlans commitmentPlans() {
         if (this.commitmentPlans == null) {
             this.commitmentPlans = new CommitmentPlansImpl(clientObject.getCommitmentPlans(), this);
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/AccountImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/AccountImpl.java
index 340449c1495f..3b92b264a140 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/AccountImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/AccountImpl.java
@@ -80,6 +80,10 @@ public String regionName() {
         return this.location();
     }
 
+    public String resourceGroupName() {
+        return resourceGroupName;
+    }
+
     public AccountInner innerModel() {
         return this.innerObject;
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/AccountsClientImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/AccountsClientImpl.java
index e7b31e729983..5f8ca0e42cb9 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/AccountsClientImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/AccountsClientImpl.java
@@ -1151,14 +1151,7 @@ private Mono<Response<AccountInner>> getByResourceGroupWithResponseAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<AccountInner> getByResourceGroupAsync(String resourceGroupName, String accountName) {
         return getByResourceGroupWithResponseAsync(resourceGroupName, accountName)
-            .flatMap(
-                (Response<AccountInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -1614,14 +1607,7 @@ private Mono<Response<ApiKeysInner>> listKeysWithResponseAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApiKeysInner> listKeysAsync(String resourceGroupName, String accountName) {
         return listKeysWithResponseAsync(resourceGroupName, accountName)
-            .flatMap(
-                (Response<ApiKeysInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -1780,14 +1766,7 @@ private Mono<Response<ApiKeysInner>> regenerateKeyWithResponseAsync(
     private Mono<ApiKeysInner> regenerateKeyAsync(
         String resourceGroupName, String accountName, RegenerateKeyParameters parameters) {
         return regenerateKeyWithResponseAsync(resourceGroupName, accountName, parameters)
-            .flatMap(
-                (Response<ApiKeysInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -1934,14 +1913,7 @@ private Mono<Response<AccountSkuListResultInner>> listSkusWithResponseAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<AccountSkuListResultInner> listSkusAsync(String resourceGroupName, String accountName) {
         return listSkusWithResponseAsync(resourceGroupName, accountName)
-            .flatMap(
-                (Response<AccountSkuListResultInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -2093,14 +2065,7 @@ private Mono<Response<UsageListResultInner>> listUsagesWithResponseAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<UsageListResultInner> listUsagesAsync(String resourceGroupName, String accountName, String filter) {
         return listUsagesWithResponseAsync(resourceGroupName, accountName, filter)
-            .flatMap(
-                (Response<UsageListResultInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -2117,14 +2082,7 @@ private Mono<UsageListResultInner> listUsagesAsync(String resourceGroupName, Str
     private Mono<UsageListResultInner> listUsagesAsync(String resourceGroupName, String accountName) {
         final String filter = null;
         return listUsagesWithResponseAsync(resourceGroupName, accountName, filter)
-            .flatMap(
-                (Response<UsageListResultInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CognitiveServicesManagementClientBuilder.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CognitiveServicesManagementClientBuilder.java
index 1091bb654998..91530f88bdb4 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CognitiveServicesManagementClientBuilder.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CognitiveServicesManagementClientBuilder.java
@@ -119,9 +119,6 @@ public CognitiveServicesManagementClientBuilder serializerAdapter(SerializerAdap
      * @return an instance of CognitiveServicesManagementClientImpl.
      */
     public CognitiveServicesManagementClientImpl buildClient() {
-        if (pipeline == null) {
-            this.pipeline = new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build();
-        }
         if (endpoint == null) {
             this.endpoint = "https://management.azure.com";
         }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CognitiveServicesManagementClientImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CognitiveServicesManagementClientImpl.java
index 51b24a60de14..d05de0dbf8f0 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CognitiveServicesManagementClientImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CognitiveServicesManagementClientImpl.java
@@ -15,6 +15,7 @@
 import com.azure.core.management.polling.PollResult;
 import com.azure.core.management.polling.PollerFactory;
 import com.azure.core.util.Context;
+import com.azure.core.util.CoreUtils;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.AsyncPollResponse;
 import com.azure.core.util.polling.LongRunningOperationStatus;
@@ -38,7 +39,6 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
-import java.util.Map;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -288,10 +288,7 @@ public Context getContext() {
      * @return the merged context.
      */
     public Context mergeContext(Context context) {
-        for (Map.Entry<Object, Object> entry : this.getContext().getValues().entrySet()) {
-            context = context.addData(entry.getKey(), entry.getValue());
-        }
-        return context;
+        return CoreUtils.mergeContexts(this.getContext(), context);
     }
 
     /**
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CommitmentPlanImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CommitmentPlanImpl.java
index 176b9a1662c6..6620da49392f 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CommitmentPlanImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CommitmentPlanImpl.java
@@ -39,6 +39,10 @@ public CommitmentPlanProperties properties() {
         return this.innerModel().properties();
     }
 
+    public String resourceGroupName() {
+        return resourceGroupName;
+    }
+
     public CommitmentPlanInner innerModel() {
         return this.innerObject;
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CommitmentPlansClientImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CommitmentPlansClientImpl.java
index 49cda72737ad..58d36f3e8935 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CommitmentPlansClientImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/CommitmentPlansClientImpl.java
@@ -445,14 +445,7 @@ private Mono<Response<CommitmentPlanInner>> getWithResponseAsync(
     private Mono<CommitmentPlanInner> getAsync(
         String resourceGroupName, String accountName, String commitmentPlanName) {
         return getWithResponseAsync(resourceGroupName, accountName, commitmentPlanName)
-            .flatMap(
-                (Response<CommitmentPlanInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -631,14 +624,7 @@ private Mono<Response<CommitmentPlanInner>> createOrUpdateWithResponseAsync(
     private Mono<CommitmentPlanInner> createOrUpdateAsync(
         String resourceGroupName, String accountName, String commitmentPlanName, CommitmentPlanInner commitmentPlan) {
         return createOrUpdateWithResponseAsync(resourceGroupName, accountName, commitmentPlanName, commitmentPlan)
-            .flatMap(
-                (Response<CommitmentPlanInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeletedAccountsClientImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeletedAccountsClientImpl.java
index 2f81277e53d2..d6e1a1ff5f7f 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeletedAccountsClientImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeletedAccountsClientImpl.java
@@ -237,14 +237,7 @@ private Mono<Response<AccountInner>> getWithResponseAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<AccountInner> getAsync(String location, String resourceGroupName, String accountName) {
         return getWithResponseAsync(location, resourceGroupName, accountName)
-            .flatMap(
-                (Response<AccountInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeploymentImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeploymentImpl.java
index 98b16314cedd..e3cc0a84fdd2 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeploymentImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeploymentImpl.java
@@ -39,6 +39,10 @@ public DeploymentProperties properties() {
         return this.innerModel().properties();
     }
 
+    public String resourceGroupName() {
+        return resourceGroupName;
+    }
+
     public DeploymentInner innerModel() {
         return this.innerObject;
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeploymentsClientImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeploymentsClientImpl.java
index 4955cce362b8..df1ffcf872a7 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeploymentsClientImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/DeploymentsClientImpl.java
@@ -442,14 +442,7 @@ private Mono<Response<DeploymentInner>> getWithResponseAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<DeploymentInner> getAsync(String resourceGroupName, String accountName, String deploymentName) {
         return getWithResponseAsync(resourceGroupName, accountName, deploymentName)
-            .flatMap(
-                (Response<DeploymentInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateEndpointConnectionImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateEndpointConnectionImpl.java
index 6d377f01d712..1ede8ea1b021 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateEndpointConnectionImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateEndpointConnectionImpl.java
@@ -53,6 +53,10 @@ public String regionName() {
         return this.location();
     }
 
+    public String resourceGroupName() {
+        return resourceGroupName;
+    }
+
     public PrivateEndpointConnectionInner innerModel() {
         return this.innerObject;
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateEndpointConnectionsClientImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateEndpointConnectionsClientImpl.java
index db2282ab4754..5fbc919cc0ac 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateEndpointConnectionsClientImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateEndpointConnectionsClientImpl.java
@@ -236,15 +236,7 @@ private Mono<Response<PrivateEndpointConnectionListResultInner>> listWithRespons
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PrivateEndpointConnectionListResultInner> listAsync(String resourceGroupName, String accountName) {
-        return listWithResponseAsync(resourceGroupName, accountName)
-            .flatMap(
-                (Response<PrivateEndpointConnectionListResultInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+        return listWithResponseAsync(resourceGroupName, accountName).flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -411,14 +403,7 @@ private Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(
     private Mono<PrivateEndpointConnectionInner> getAsync(
         String resourceGroupName, String accountName, String privateEndpointConnectionName) {
         return getWithResponseAsync(resourceGroupName, accountName, privateEndpointConnectionName)
-            .flatMap(
-                (Response<PrivateEndpointConnectionInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateLinkResourcesClientImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateLinkResourcesClientImpl.java
index 3c0da7e8951c..03cf23d5ecb8 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateLinkResourcesClientImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/PrivateLinkResourcesClientImpl.java
@@ -177,15 +177,7 @@ private Mono<Response<PrivateLinkResourceListResultInner>> listWithResponseAsync
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PrivateLinkResourceListResultInner> listAsync(String resourceGroupName, String accountName) {
-        return listWithResponseAsync(resourceGroupName, accountName)
-            .flatMap(
-                (Response<PrivateLinkResourceListResultInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+        return listWithResponseAsync(resourceGroupName, accountName).flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/ResourceProvidersClientImpl.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/ResourceProvidersClientImpl.java
index b1aae09f8f71..9aee50aa3c24 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/ResourceProvidersClientImpl.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/implementation/ResourceProvidersClientImpl.java
@@ -193,14 +193,7 @@ private Mono<Response<SkuAvailabilityListResultInner>> checkSkuAvailabilityWithR
     private Mono<SkuAvailabilityListResultInner> checkSkuAvailabilityAsync(
         String location, CheckSkuAvailabilityParameter parameters) {
         return checkSkuAvailabilityWithResponseAsync(location, parameters)
-            .flatMap(
-                (Response<SkuAvailabilityListResultInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
@@ -333,15 +326,7 @@ private Mono<Response<DomainAvailabilityInner>> checkDomainAvailabilityWithRespo
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<DomainAvailabilityInner> checkDomainAvailabilityAsync(CheckDomainAvailabilityParameter parameters) {
-        return checkDomainAvailabilityWithResponseAsync(parameters)
-            .flatMap(
-                (Response<DomainAvailabilityInner> res) -> {
-                    if (res.getValue() != null) {
-                        return Mono.just(res.getValue());
-                    } else {
-                        return Mono.empty();
-                    }
-                });
+        return checkDomainAvailabilityWithResponseAsync(parameters).flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Account.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Account.java
index 84b5d02acdc0..1ac251016c72 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Account.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Account.java
@@ -104,6 +104,13 @@ public interface Account {
      */
     String regionName();
 
+    /**
+     * Gets the name of the resource group.
+     *
+     * @return the name of the resource group.
+     */
+    String resourceGroupName();
+
     /**
      * Gets the inner com.azure.resourcemanager.cognitiveservices.fluent.models.AccountInner object.
      *
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ActionType.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ActionType.java
index 69030c0bf441..e4a4171eb6b2 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ActionType.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ActionType.java
@@ -24,7 +24,11 @@ public static ActionType fromString(String name) {
         return fromString(name, ActionType.class);
     }
 
-    /** @return known ActionType values. */
+    /**
+     * Gets known ActionType values.
+     *
+     * @return known ActionType values.
+     */
     public static Collection<ActionType> values() {
         return values(ActionType.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/CommitmentPlan.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/CommitmentPlan.java
index edf2a8ad6605..e35c770bcd2c 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/CommitmentPlan.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/CommitmentPlan.java
@@ -52,6 +52,13 @@ public interface CommitmentPlan {
      */
     CommitmentPlanProperties properties();
 
+    /**
+     * Gets the name of the resource group.
+     *
+     * @return the name of the resource group.
+     */
+    String resourceGroupName();
+
     /**
      * Gets the inner com.azure.resourcemanager.cognitiveservices.fluent.models.CommitmentPlanInner object.
      *
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Deployment.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Deployment.java
index 0ca32ed9b687..f560fbd3a972 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Deployment.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Deployment.java
@@ -52,6 +52,13 @@ public interface Deployment {
      */
     DeploymentProperties properties();
 
+    /**
+     * Gets the name of the resource group.
+     *
+     * @return the name of the resource group.
+     */
+    String resourceGroupName();
+
     /**
      * Gets the inner com.azure.resourcemanager.cognitiveservices.fluent.models.DeploymentInner object.
      *
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/DeploymentProvisioningState.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/DeploymentProvisioningState.java
index 2533e1832376..f4581e7c8f5d 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/DeploymentProvisioningState.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/DeploymentProvisioningState.java
@@ -39,7 +39,11 @@ public static DeploymentProvisioningState fromString(String name) {
         return fromString(name, DeploymentProvisioningState.class);
     }
 
-    /** @return known DeploymentProvisioningState values. */
+    /**
+     * Gets known DeploymentProvisioningState values.
+     *
+     * @return known DeploymentProvisioningState values.
+     */
     public static Collection<DeploymentProvisioningState> values() {
         return values(DeploymentProvisioningState.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/DeploymentScaleType.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/DeploymentScaleType.java
index c432ef2a1139..86d6ccdf14ed 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/DeploymentScaleType.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/DeploymentScaleType.java
@@ -10,6 +10,9 @@
 
 /** Defines values for DeploymentScaleType. */
 public final class DeploymentScaleType extends ExpandableStringEnum<DeploymentScaleType> {
+    /** Static value Standard for DeploymentScaleType. */
+    public static final DeploymentScaleType STANDARD = fromString("Standard");
+
     /** Static value Manual for DeploymentScaleType. */
     public static final DeploymentScaleType MANUAL = fromString("Manual");
 
@@ -24,7 +27,11 @@ public static DeploymentScaleType fromString(String name) {
         return fromString(name, DeploymentScaleType.class);
     }
 
-    /** @return known DeploymentScaleType values. */
+    /**
+     * Gets known DeploymentScaleType values.
+     *
+     * @return known DeploymentScaleType values.
+     */
     public static Collection<DeploymentScaleType> values() {
         return values(DeploymentScaleType.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/HostingModel.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/HostingModel.java
index 4100ef42adfe..e730bc30e933 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/HostingModel.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/HostingModel.java
@@ -30,7 +30,11 @@ public static HostingModel fromString(String name) {
         return fromString(name, HostingModel.class);
     }
 
-    /** @return known HostingModel values. */
+    /**
+     * Gets known HostingModel values.
+     *
+     * @return known HostingModel values.
+     */
     public static Collection<HostingModel> values() {
         return values(HostingModel.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/KeySource.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/KeySource.java
index 71afb370def2..d4237c1109a4 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/KeySource.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/KeySource.java
@@ -27,7 +27,11 @@ public static KeySource fromString(String name) {
         return fromString(name, KeySource.class);
     }
 
-    /** @return known KeySource values. */
+    /**
+     * Gets known KeySource values.
+     *
+     * @return known KeySource values.
+     */
     public static Collection<KeySource> values() {
         return values(KeySource.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/NetworkRuleAction.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/NetworkRuleAction.java
index e8440f7e8af0..c239b47f01c3 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/NetworkRuleAction.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/NetworkRuleAction.java
@@ -27,7 +27,11 @@ public static NetworkRuleAction fromString(String name) {
         return fromString(name, NetworkRuleAction.class);
     }
 
-    /** @return known NetworkRuleAction values. */
+    /**
+     * Gets known NetworkRuleAction values.
+     *
+     * @return known NetworkRuleAction values.
+     */
     public static Collection<NetworkRuleAction> values() {
         return values(NetworkRuleAction.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Origin.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Origin.java
index cf137faedfad..a0b3e9dfa889 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Origin.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/Origin.java
@@ -30,7 +30,11 @@ public static Origin fromString(String name) {
         return fromString(name, Origin.class);
     }
 
-    /** @return known Origin values. */
+    /**
+     * Gets known Origin values.
+     *
+     * @return known Origin values.
+     */
     public static Collection<Origin> values() {
         return values(Origin.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointConnection.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointConnection.java
index 9fb749a41b7f..35631bc31eb7 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointConnection.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointConnection.java
@@ -74,6 +74,13 @@ public interface PrivateEndpointConnection {
      */
     String regionName();
 
+    /**
+     * Gets the name of the resource group.
+     *
+     * @return the name of the resource group.
+     */
+    String resourceGroupName();
+
     /**
      * Gets the inner com.azure.resourcemanager.cognitiveservices.fluent.models.PrivateEndpointConnectionInner object.
      *
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointConnectionProvisioningState.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointConnectionProvisioningState.java
index 7175eb194f07..ca9e821cabfe 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointConnectionProvisioningState.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointConnectionProvisioningState.java
@@ -34,7 +34,11 @@ public static PrivateEndpointConnectionProvisioningState fromString(String name)
         return fromString(name, PrivateEndpointConnectionProvisioningState.class);
     }
 
-    /** @return known PrivateEndpointConnectionProvisioningState values. */
+    /**
+     * Gets known PrivateEndpointConnectionProvisioningState values.
+     *
+     * @return known PrivateEndpointConnectionProvisioningState values.
+     */
     public static Collection<PrivateEndpointConnectionProvisioningState> values() {
         return values(PrivateEndpointConnectionProvisioningState.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointServiceConnectionStatus.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointServiceConnectionStatus.java
index d1fe58f98380..4b8f05cdb747 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointServiceConnectionStatus.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PrivateEndpointServiceConnectionStatus.java
@@ -31,7 +31,11 @@ public static PrivateEndpointServiceConnectionStatus fromString(String name) {
         return fromString(name, PrivateEndpointServiceConnectionStatus.class);
     }
 
-    /** @return known PrivateEndpointServiceConnectionStatus values. */
+    /**
+     * Gets known PrivateEndpointServiceConnectionStatus values.
+     *
+     * @return known PrivateEndpointServiceConnectionStatus values.
+     */
     public static Collection<PrivateEndpointServiceConnectionStatus> values() {
         return values(PrivateEndpointServiceConnectionStatus.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ProvisioningState.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ProvisioningState.java
index eb29acafeb62..4fabe3f3cf0c 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ProvisioningState.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ProvisioningState.java
@@ -42,7 +42,11 @@ public static ProvisioningState fromString(String name) {
         return fromString(name, ProvisioningState.class);
     }
 
-    /** @return known ProvisioningState values. */
+    /**
+     * Gets known ProvisioningState values.
+     *
+     * @return known ProvisioningState values.
+     */
     public static Collection<ProvisioningState> values() {
         return values(ProvisioningState.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PublicNetworkAccess.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PublicNetworkAccess.java
index 8dfecfd18355..2cb051c6eb1a 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PublicNetworkAccess.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/PublicNetworkAccess.java
@@ -27,7 +27,11 @@ public static PublicNetworkAccess fromString(String name) {
         return fromString(name, PublicNetworkAccess.class);
     }
 
-    /** @return known PublicNetworkAccess values. */
+    /**
+     * Gets known PublicNetworkAccess values.
+     *
+     * @return known PublicNetworkAccess values.
+     */
     public static Collection<PublicNetworkAccess> values() {
         return values(PublicNetworkAccess.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/QuotaUsageStatus.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/QuotaUsageStatus.java
index b7cf33fb8ecf..8ad57cf6be63 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/QuotaUsageStatus.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/QuotaUsageStatus.java
@@ -33,7 +33,11 @@ public static QuotaUsageStatus fromString(String name) {
         return fromString(name, QuotaUsageStatus.class);
     }
 
-    /** @return known QuotaUsageStatus values. */
+    /**
+     * Gets known QuotaUsageStatus values.
+     *
+     * @return known QuotaUsageStatus values.
+     */
     public static Collection<QuotaUsageStatus> values() {
         return values(QuotaUsageStatus.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ResourceSkuRestrictionsReasonCode.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ResourceSkuRestrictionsReasonCode.java
index b30243f07c42..2213e0cf0d9a 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ResourceSkuRestrictionsReasonCode.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/ResourceSkuRestrictionsReasonCode.java
@@ -28,7 +28,11 @@ public static ResourceSkuRestrictionsReasonCode fromString(String name) {
         return fromString(name, ResourceSkuRestrictionsReasonCode.class);
     }
 
-    /** @return known ResourceSkuRestrictionsReasonCode values. */
+    /**
+     * Gets known ResourceSkuRestrictionsReasonCode values.
+     *
+     * @return known ResourceSkuRestrictionsReasonCode values.
+     */
     public static Collection<ResourceSkuRestrictionsReasonCode> values() {
         return values(ResourceSkuRestrictionsReasonCode.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/SkuTier.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/SkuTier.java
index 753b3d3fb074..1cd3b2ca9de6 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/SkuTier.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/SkuTier.java
@@ -36,7 +36,11 @@ public static SkuTier fromString(String name) {
         return fromString(name, SkuTier.class);
     }
 
-    /** @return known SkuTier values. */
+    /**
+     * Gets known SkuTier values.
+     *
+     * @return known SkuTier values.
+     */
     public static Collection<SkuTier> values() {
         return values(SkuTier.class);
     }
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/UnitType.java b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/UnitType.java
index 2600db0a4c01..163fbe8b0135 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/UnitType.java
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/src/main/java/com/azure/resourcemanager/cognitiveservices/models/UnitType.java
@@ -42,7 +42,11 @@ public static UnitType fromString(String name) {
         return fromString(name, UnitType.class);
     }
 
-    /** @return known UnitType values. */
+    /**
+     * Gets known UnitType values.
+     *
+     * @return known UnitType values.
+     */
     public static Collection<UnitType> values() {
         return values(UnitType.class);
     }