From 059c6663d83f98ced3f8b79b68bf225c9a98b1c8 Mon Sep 17 00:00:00 2001
From: SDKAuto <sdkautomation@microsoft.com>
Date: Mon, 23 Jan 2023 20:45:02 +0000
Subject: [PATCH] CodeGen from PR 21737 in Azure/azure-rest-api-specs Merge
 5ee6fc93f601053d163ab0ec2fecc9a65dfe31f6 into
 1a1463ae88cef725851f9f4b22a8beb089e9d22c

---
 .../CHANGELOG.md                              |   4 +-
 .../README.md                                 |  27 +-
 .../SAMPLE.md                                 | 152 ++--
 .../pom.xml                                   |   3 +-
 .../IotDpsManager.java                        |   2 +-
 .../fluent/DpsCertificatesClient.java         | 136 ++--
 .../fluent/IotDpsResourcesClient.java         | 280 ++++---
 .../models/AsyncOperationResultInner.java     |   4 +
 .../CertificateListDescriptionInner.java      |   4 +
 .../models/CertificateResponseInner.java      |   4 +
 .../models/GroupIdInformationInner.java       |   4 +
 .../models/IotDpsSkuDefinitionInner.java      |   4 +
 .../models/NameAvailabilityInfoInner.java     |   4 +
 .../fluent/models/OperationInner.java         |   4 +
 .../PrivateEndpointConnectionInner.java       |   4 +
 .../models/PrivateLinkResourcesInner.java     |   4 +
 .../ProvisioningServiceDescriptionInner.java  |  61 +-
 ...AccessSignatureAuthorizationRuleInner.java |   4 +
 .../models/VerificationCodeResponseInner.java |   4 +
 .../DpsCertificatesClientImpl.java            | 571 ++++++---------
 .../implementation/DpsCertificatesImpl.java   |  72 +-
 .../implementation/IotDpsClientBuilder.java   |  34 +-
 .../implementation/IotDpsClientImpl.java      |   2 +-
 .../IotDpsResourcesClientImpl.java            | 682 ++++++++++++------
 .../implementation/IotDpsResourcesImpl.java   | 136 ++--
 .../implementation/OperationsClientImpl.java  |   8 +-
 .../ProvisioningServiceDescriptionImpl.java   |  18 +
 .../models/AccessRightsDescription.java       |  11 +-
 .../models/AllocationPolicy.java              |  11 +-
 .../models/CertificateProperties.java         |   7 +-
 .../models/CertificatePurpose.java            |   9 +
 .../models/DpsCertificates.java               | 118 +--
 .../models/ErrorDetails.java                  |   4 +
 .../models/ErrorDetailsException.java         |   1 +
 .../models/ErrorMessage.java                  |   4 +
 .../models/GroupIdInformationProperties.java  |   4 +
 .../models/IotDpsPropertiesDescription.java   |  33 +-
 .../models/IotDpsResources.java               | 230 +++---
 .../models/IotDpsSku.java                     |  11 +-
 .../models/IotDpsSkuDefinitionListResult.java |   4 +
 .../models/IotDpsSkuInfo.java                 |   4 +
 .../models/IotHubDefinitionDescription.java   |   4 +
 .../models/IpFilterActionType.java            |   6 +-
 .../models/IpFilterRule.java                  |   7 +-
 .../models/IpFilterTargetType.java            |   6 +-
 .../models/NameUnavailabilityReason.java      |  11 +-
 .../models/OperationDisplay.java              |   4 +
 .../models/OperationInputs.java               |   4 +
 .../models/OperationListResult.java           |   7 +-
 .../models/PrivateEndpoint.java               |   4 +
 .../PrivateEndpointConnectionProperties.java  |   4 +
 .../PrivateLinkServiceConnectionState.java    |   4 +
 .../PrivateLinkServiceConnectionStatus.java   |  11 +-
 .../ProvisioningServiceDescription.java       |  48 +-
 ...visioningServiceDescriptionListResult.java |   4 +
 .../models/PublicNetworkAccess.java           |  11 +-
 ...sSignatureAuthorizationRuleListResult.java |   4 +
 .../models/State.java                         |  11 +-
 .../models/TagsResource.java                  |   4 +
 .../models/VerificationCodeRequest.java       |   7 +-
 .../VerificationCodeResponseProperties.java   |   7 +-
 .../DpsCertificateCreateOrUpdateSamples.java  |   5 +-
 .../DpsCertificateDeleteSamples.java          |   6 +-
 ...ficateGenerateVerificationCodeSamples.java |   6 +-
 .../generated/DpsCertificateGetSamples.java   |   7 +-
 .../generated/DpsCertificateListSamples.java  |   8 +-
 ...psCertificateVerifyCertificateSamples.java |   5 +-
 ...eckProvisioningServiceNameAvailabilit.java |   5 +-
 ...eateOrUpdatePrivateEndpointConnection.java |   2 +-
 .../IotDpsResourceCreateOrUpdateSamples.java  |   2 +-
 ...eletePrivateEndpointConnectionSamples.java |   9 +-
 .../IotDpsResourceDeleteSamples.java          |   8 +-
 ...tDpsResourceGetByResourceGroupSamples.java |   7 +-
 ...tDpsResourceGetOperationResultSamples.java |   6 +-
 ...ceGetPrivateEndpointConnectionSamples.java |   9 +-
 ...esourceGetPrivateLinkResourcesSamples.java |   6 +-
 ...DpsResourceListByResourceGroupSamples.java |   6 +-
 ...tDpsResourceListKeysForKeyNameSamples.java |   7 +-
 .../IotDpsResourceListKeysSamples.java        |   8 +-
 ...ListPrivateEndpointConnectionsSamples.java |   7 +-
 ...sourceListPrivateLinkResourcesSamples.java |   7 +-
 .../generated/IotDpsResourceListSamples.java  |   6 +-
 .../IotDpsResourceListValidSkusSamples.java   |   8 +-
 .../IotDpsResourceUpdateSamples.java          |   6 +-
 .../generated/OperationsListSamples.java      |   6 +-
 85 files changed, 1771 insertions(+), 1232 deletions(-)

diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/CHANGELOG.md b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/CHANGELOG.md
index 7be52e0e11869..b0b32fdf799bd 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/CHANGELOG.md
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Release History
 
-## 1.1.0-beta.3 (Unreleased)
+## 1.0.0-beta.1 (2023-01-23)
+
+- Azure Resource Manager IotDps client library for Java. This package contains Microsoft Azure SDK for IotDps Management SDK. API for using the Azure IoT Hub Device Provisioning Service features. Package tag package-2022-12. 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/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/README.md b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/README.md
index fe126747b2ff5..6125350eb4f82 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/README.md
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/README.md
@@ -2,7 +2,7 @@
 
 Azure Resource Manager IotDps client library for Java.
 
-This package contains Microsoft Azure SDK for IotDps Management SDK. API for using the Azure IoT Hub Device Provisioning Service features. Package tag package-2022-02. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for IotDps Management SDK. API for using the Azure IoT Hub Device Provisioning Service features. Package tag package-2022-12. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-deviceprovisioningservices</artifactId>
-    <version>1.1.0-beta.2</version>
+    <version>1.1.0-beta.3</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -41,19 +41,19 @@ Various documentation is available to help you get started
 
 Azure Management Libraries require a `TokenCredential` implementation for authentication and an `HttpClient` implementation for HTTP client.
 
-[Azure Identity][azure_identity] package and [Azure Core Netty HTTP][azure_core_http_netty] package provide the default implementation.
+[Azure Identity][azure_identity] and [Azure Core Netty HTTP][azure_core_http_netty] packages provide the default implementation.
 
 ### Authentication
 
-By default, Azure Active Directory token authentication depends on correct configure of following environment variables.
+By default, Azure Active Directory token authentication depends on correct configuration of the following environment variables.
 
 - `AZURE_CLIENT_ID` for Azure client ID.
 - `AZURE_TENANT_ID` for Azure tenant ID.
 - `AZURE_CLIENT_SECRET` or `AZURE_CLIENT_CERTIFICATE_PATH` for client secret or client certificate.
 
-In addition, Azure subscription ID can be configured via environment variable `AZURE_SUBSCRIPTION_ID`.
+In addition, Azure subscription ID can be configured via `AZURE_SUBSCRIPTION_ID` environment variable.
 
-With above configuration, `azure` client can be authenticated by following code:
+With above configuration, `azure` client can be authenticated using the following code:
 
 ```java
 AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
@@ -83,13 +83,13 @@ See [API design][design] for general introduction on design and key concepts on
 
 ## Contributing
 
-For details on contributing to this repository, see the [contributing guide](https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md).
+For details on contributing to this repository, see the [contributing guide][cg].
 
-1. Fork it
-1. Create your feature branch (`git checkout -b my-new-feature`)
-1. Commit your changes (`git commit -am 'Add some feature'`)
-1. Push to the branch (`git push origin my-new-feature`)
-1. Create new Pull Request
+This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit <https://cla.microsoft.com>.
+
+When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repositories using our CLA.
+
+This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][coc_faq] or contact <opencode@microsoft.com> with any additional questions or comments.
 
 <!-- LINKS -->
 [survey]: https://microsoft.qualtrics.com/jfe/form/SV_ehN0lIk2FKEBkwd?Q_CHL=DOCS
@@ -100,3 +100,6 @@ For details on contributing to this repository, see the [contributing guide](htt
 [azure_core_http_netty]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/core/azure-core-http-netty
 [authenticate]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/resourcemanager/docs/AUTH.md
 [design]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/resourcemanager/docs/DESIGN.md
+[cg]: https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md
+[coc]: https://opensource.microsoft.com/codeofconduct/
+[coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/SAMPLE.md b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/SAMPLE.md
index 42d3c69bf0c23..bb3bcd431a9c0 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/SAMPLE.md
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/SAMPLE.md
@@ -41,7 +41,7 @@ import com.azure.resourcemanager.deviceprovisioningservices.models.CertificatePr
 /** Samples for DpsCertificate CreateOrUpdate. */
 public final class DpsCertificateCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSCertificateCreateOrUpdate.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSCertificateCreateOrUpdate.json
      */
     /**
      * Sample code: DPSCreateOrUpdateCertificate.
@@ -54,8 +54,7 @@ public final class DpsCertificateCreateOrUpdateSamples {
             .dpsCertificates()
             .define("cert")
             .withExistingProvisioningService("myResourceGroup", "myFirstProvisioningService")
-            .withProperties(
-                new CertificateProperties().withCertificate("############################################".getBytes()))
+            .withProperties(new CertificateProperties().withCertificate("MA==".getBytes()))
             .create();
     }
 }
@@ -64,12 +63,10 @@ public final class DpsCertificateCreateOrUpdateSamples {
 ### DpsCertificate_Delete
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for DpsCertificate Delete. */
 public final class DpsCertificateDeleteSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSDeleteCertificate.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSDeleteCertificate.json
      */
     /**
      * Sample code: DPSDeleteCertificate.
@@ -93,7 +90,7 @@ public final class DpsCertificateDeleteSamples {
                 null,
                 null,
                 null,
-                Context.NONE);
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -101,12 +98,10 @@ public final class DpsCertificateDeleteSamples {
 ### DpsCertificate_GenerateVerificationCode
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for DpsCertificate GenerateVerificationCode. */
 public final class DpsCertificateGenerateVerificationCodeSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGenerateVerificationCode.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGenerateVerificationCode.json
      */
     /**
      * Sample code: DPSGenerateVerificationCode.
@@ -130,7 +125,7 @@ public final class DpsCertificateGenerateVerificationCodeSamples {
                 null,
                 null,
                 null,
-                Context.NONE);
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -138,12 +133,10 @@ public final class DpsCertificateGenerateVerificationCodeSamples {
 ### DpsCertificate_Get
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for DpsCertificate Get. */
 public final class DpsCertificateGetSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetCertificate.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetCertificate.json
      */
     /**
      * Sample code: DPSGetCertificate.
@@ -153,7 +146,8 @@ public final class DpsCertificateGetSamples {
     public static void dPSGetCertificate(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
         manager
             .dpsCertificates()
-            .getWithResponse("cert", "myResourceGroup", "myFirstProvisioningService", null, Context.NONE);
+            .getWithResponse(
+                "cert", "myResourceGroup", "myFirstProvisioningService", null, com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -161,12 +155,10 @@ public final class DpsCertificateGetSamples {
 ### DpsCertificate_List
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for DpsCertificate List. */
 public final class DpsCertificateListSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetCertificates.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetCertificates.json
      */
     /**
      * Sample code: DPSGetCertificates.
@@ -174,7 +166,9 @@ public final class DpsCertificateListSamples {
      * @param manager Entry point to IotDpsManager.
      */
     public static void dPSGetCertificates(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.dpsCertificates().listWithResponse("myResourceGroup", "myFirstProvisioningService", Context.NONE);
+        manager
+            .dpsCertificates()
+            .listWithResponse("myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -182,13 +176,12 @@ public final class DpsCertificateListSamples {
 ### DpsCertificate_VerifyCertificate
 
 ```java
-import com.azure.core.util.Context;
 import com.azure.resourcemanager.deviceprovisioningservices.models.VerificationCodeRequest;
 
 /** Samples for DpsCertificate VerifyCertificate. */
 public final class DpsCertificateVerifyCertificateSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSVerifyCertificate.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSVerifyCertificate.json
      */
     /**
      * Sample code: DPSVerifyCertificate.
@@ -213,7 +206,7 @@ public final class DpsCertificateVerifyCertificateSamples {
                 null,
                 null,
                 null,
-                Context.NONE);
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -221,13 +214,12 @@ public final class DpsCertificateVerifyCertificateSamples {
 ### IotDpsResource_CheckProvisioningServiceNameAvailability
 
 ```java
-import com.azure.core.util.Context;
 import com.azure.resourcemanager.deviceprovisioningservices.models.OperationInputs;
 
 /** Samples for IotDpsResource CheckProvisioningServiceNameAvailability. */
 public final class IotDpsResourceCheckProvisioningServiceNameAvailabilit {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSCheckNameAvailability.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSCheckNameAvailability.json
      */
     /**
      * Sample code: DPSCheckName.
@@ -238,7 +230,7 @@ public final class IotDpsResourceCheckProvisioningServiceNameAvailabilit {
         manager
             .iotDpsResources()
             .checkProvisioningServiceNameAvailabilityWithResponse(
-                new OperationInputs().withName("test213123"), Context.NONE);
+                new OperationInputs().withName("test213123"), com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -255,7 +247,7 @@ import java.util.Map;
 /** Samples for IotDpsResource CreateOrUpdate. */
 public final class IotDpsResourceCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSCreate.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSCreate.json
      */
     /**
      * Sample code: DPSCreate.
@@ -297,7 +289,7 @@ import com.azure.resourcemanager.deviceprovisioningservices.models.PrivateLinkSe
 /** Samples for IotDpsResource CreateOrUpdatePrivateEndpointConnection. */
 public final class IotDpsResourceCreateOrUpdatePrivateEndpointConnection {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSCreateOrUpdatePrivateEndpointConnection.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSCreateOrUpdatePrivateEndpointConnection.json
      */
     /**
      * Sample code: PrivateEndpointConnection_CreateOrUpdate.
@@ -324,12 +316,10 @@ public final class IotDpsResourceCreateOrUpdatePrivateEndpointConnection {
 ### IotDpsResource_Delete
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource Delete. */
 public final class IotDpsResourceDeleteSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSDelete.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSDelete.json
      */
     /**
      * Sample code: DPSDelete.
@@ -337,7 +327,9 @@ public final class IotDpsResourceDeleteSamples {
      * @param manager Entry point to IotDpsManager.
      */
     public static void dPSDelete(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.iotDpsResources().delete("myResourceGroup", "myFirstProvisioningService", Context.NONE);
+        manager
+            .iotDpsResources()
+            .delete("myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -345,12 +337,10 @@ public final class IotDpsResourceDeleteSamples {
 ### IotDpsResource_DeletePrivateEndpointConnection
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource DeletePrivateEndpointConnection. */
 public final class IotDpsResourceDeletePrivateEndpointConnectionSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSDeletePrivateEndpointConnection.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSDeletePrivateEndpointConnection.json
      */
     /**
      * Sample code: PrivateEndpointConnection_Delete.
@@ -362,7 +352,10 @@ public final class IotDpsResourceDeletePrivateEndpointConnectionSamples {
         manager
             .iotDpsResources()
             .deletePrivateEndpointConnection(
-                "myResourceGroup", "myFirstProvisioningService", "myPrivateEndpointConnection", Context.NONE);
+                "myResourceGroup",
+                "myFirstProvisioningService",
+                "myPrivateEndpointConnection",
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -370,12 +363,10 @@ public final class IotDpsResourceDeletePrivateEndpointConnectionSamples {
 ### IotDpsResource_GetByResourceGroup
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource GetByResourceGroup. */
 public final class IotDpsResourceGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGet.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGet.json
      */
     /**
      * Sample code: DPSGet.
@@ -385,7 +376,8 @@ public final class IotDpsResourceGetByResourceGroupSamples {
     public static void dPSGet(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
         manager
             .iotDpsResources()
-            .getByResourceGroupWithResponse("myResourceGroup", "myFirstProvisioningService", Context.NONE);
+            .getByResourceGroupWithResponse(
+                "myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -393,12 +385,10 @@ public final class IotDpsResourceGetByResourceGroupSamples {
 ### IotDpsResource_GetOperationResult
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource GetOperationResult. */
 public final class IotDpsResourceGetOperationResultSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetOperationResult.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetOperationResult.json
      */
     /**
      * Sample code: DPSGetOperationResult.
@@ -414,7 +404,7 @@ public final class IotDpsResourceGetOperationResultSamples {
                 "myResourceGroup",
                 "myFirstProvisioningService",
                 "1508265712453",
-                Context.NONE);
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -422,12 +412,10 @@ public final class IotDpsResourceGetOperationResultSamples {
 ### IotDpsResource_GetPrivateEndpointConnection
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource GetPrivateEndpointConnection. */
 public final class IotDpsResourceGetPrivateEndpointConnectionSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetPrivateEndpointConnection.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetPrivateEndpointConnection.json
      */
     /**
      * Sample code: PrivateEndpointConnection_Get.
@@ -439,7 +427,10 @@ public final class IotDpsResourceGetPrivateEndpointConnectionSamples {
         manager
             .iotDpsResources()
             .getPrivateEndpointConnectionWithResponse(
-                "myResourceGroup", "myFirstProvisioningService", "myPrivateEndpointConnection", Context.NONE);
+                "myResourceGroup",
+                "myFirstProvisioningService",
+                "myPrivateEndpointConnection",
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -447,12 +438,10 @@ public final class IotDpsResourceGetPrivateEndpointConnectionSamples {
 ### IotDpsResource_GetPrivateLinkResources
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource GetPrivateLinkResources. */
 public final class IotDpsResourceGetPrivateLinkResourcesSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetPrivateLinkResources.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetPrivateLinkResources.json
      */
     /**
      * Sample code: PrivateLinkResources_List.
@@ -464,7 +453,7 @@ public final class IotDpsResourceGetPrivateLinkResourcesSamples {
         manager
             .iotDpsResources()
             .getPrivateLinkResourcesWithResponse(
-                "myResourceGroup", "myFirstProvisioningService", "iotDps", Context.NONE);
+                "myResourceGroup", "myFirstProvisioningService", "iotDps", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -472,12 +461,10 @@ public final class IotDpsResourceGetPrivateLinkResourcesSamples {
 ### IotDpsResource_List
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource List. */
 public final class IotDpsResourceListSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSListBySubscription.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSListBySubscription.json
      */
     /**
      * Sample code: DPSListBySubscription.
@@ -486,7 +473,7 @@ public final class IotDpsResourceListSamples {
      */
     public static void dPSListBySubscription(
         com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.iotDpsResources().list(Context.NONE);
+        manager.iotDpsResources().list(com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -494,12 +481,10 @@ public final class IotDpsResourceListSamples {
 ### IotDpsResource_ListByResourceGroup
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListByResourceGroup. */
 public final class IotDpsResourceListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSListByResourceGroup.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSListByResourceGroup.json
      */
     /**
      * Sample code: DPSListByResourceGroup.
@@ -508,7 +493,7 @@ public final class IotDpsResourceListByResourceGroupSamples {
      */
     public static void dPSListByResourceGroup(
         com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.iotDpsResources().listByResourceGroup("myResourceGroup", Context.NONE);
+        manager.iotDpsResources().listByResourceGroup("myResourceGroup", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -516,12 +501,10 @@ public final class IotDpsResourceListByResourceGroupSamples {
 ### IotDpsResource_ListKeys
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListKeys. */
 public final class IotDpsResourceListKeysSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSListKeys.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSListKeys.json
      */
     /**
      * Sample code: DPSListKeys.
@@ -529,7 +512,9 @@ public final class IotDpsResourceListKeysSamples {
      * @param manager Entry point to IotDpsManager.
      */
     public static void dPSListKeys(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.iotDpsResources().listKeys("myFirstProvisioningService", "myResourceGroup", Context.NONE);
+        manager
+            .iotDpsResources()
+            .listKeys("myFirstProvisioningService", "myResourceGroup", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -537,12 +522,10 @@ public final class IotDpsResourceListKeysSamples {
 ### IotDpsResource_ListKeysForKeyName
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListKeysForKeyName. */
 public final class IotDpsResourceListKeysForKeyNameSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetKey.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetKey.json
      */
     /**
      * Sample code: DPSGetKey.
@@ -552,7 +535,8 @@ public final class IotDpsResourceListKeysForKeyNameSamples {
     public static void dPSGetKey(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
         manager
             .iotDpsResources()
-            .listKeysForKeyNameWithResponse("myFirstProvisioningService", "testKey", "myResourceGroup", Context.NONE);
+            .listKeysForKeyNameWithResponse(
+                "myFirstProvisioningService", "testKey", "myResourceGroup", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -560,12 +544,10 @@ public final class IotDpsResourceListKeysForKeyNameSamples {
 ### IotDpsResource_ListPrivateEndpointConnections
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListPrivateEndpointConnections. */
 public final class IotDpsResourceListPrivateEndpointConnectionsSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSListPrivateEndpointConnections.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSListPrivateEndpointConnections.json
      */
     /**
      * Sample code: PrivateEndpointConnections_List.
@@ -576,7 +558,8 @@ public final class IotDpsResourceListPrivateEndpointConnectionsSamples {
         com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
         manager
             .iotDpsResources()
-            .listPrivateEndpointConnectionsWithResponse("myResourceGroup", "myFirstProvisioningService", Context.NONE);
+            .listPrivateEndpointConnectionsWithResponse(
+                "myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -584,12 +567,10 @@ public final class IotDpsResourceListPrivateEndpointConnectionsSamples {
 ### IotDpsResource_ListPrivateLinkResources
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListPrivateLinkResources. */
 public final class IotDpsResourceListPrivateLinkResourcesSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSListPrivateLinkResources.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSListPrivateLinkResources.json
      */
     /**
      * Sample code: PrivateLinkResources_List.
@@ -600,7 +581,8 @@ public final class IotDpsResourceListPrivateLinkResourcesSamples {
         com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
         manager
             .iotDpsResources()
-            .listPrivateLinkResourcesWithResponse("myResourceGroup", "myFirstProvisioningService", Context.NONE);
+            .listPrivateLinkResourcesWithResponse(
+                "myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -608,12 +590,10 @@ public final class IotDpsResourceListPrivateLinkResourcesSamples {
 ### IotDpsResource_ListValidSkus
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListValidSkus. */
 public final class IotDpsResourceListValidSkusSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetValidSku.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetValidSku.json
      */
     /**
      * Sample code: DPSGetValidSku.
@@ -621,7 +601,9 @@ public final class IotDpsResourceListValidSkusSamples {
      * @param manager Entry point to IotDpsManager.
      */
     public static void dPSGetValidSku(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.iotDpsResources().listValidSkus("myFirstProvisioningService", "myResourceGroup", Context.NONE);
+        manager
+            .iotDpsResources()
+            .listValidSkus("myFirstProvisioningService", "myResourceGroup", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -629,7 +611,6 @@ public final class IotDpsResourceListValidSkusSamples {
 ### IotDpsResource_Update
 
 ```java
-import com.azure.core.util.Context;
 import com.azure.resourcemanager.deviceprovisioningservices.models.ProvisioningServiceDescription;
 import java.util.HashMap;
 import java.util.Map;
@@ -637,7 +618,7 @@ import java.util.Map;
 /** Samples for IotDpsResource Update. */
 public final class IotDpsResourceUpdateSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSPatch.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSPatch.json
      */
     /**
      * Sample code: DPSPatch.
@@ -648,7 +629,8 @@ public final class IotDpsResourceUpdateSamples {
         ProvisioningServiceDescription resource =
             manager
                 .iotDpsResources()
-                .getByResourceGroupWithResponse("myResourceGroup", "myFirstProvisioningService", Context.NONE)
+                .getByResourceGroupWithResponse(
+                    "myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE)
                 .getValue();
         resource.update().withTags(mapOf("foo", "bar")).apply();
     }
@@ -669,12 +651,10 @@ public final class IotDpsResourceUpdateSamples {
 ### Operations_List
 
 ```java
-import com.azure.core.util.Context;
-
 /** Samples for Operations List. */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSOperations.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSOperations.json
      */
     /**
      * Sample code: DPSOperations.
@@ -682,7 +662,7 @@ public final class OperationsListSamples {
      * @param manager Entry point to IotDpsManager.
      */
     public static void dPSOperations(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.operations().list(Context.NONE);
+        manager.operations().list(com.azure.core.util.Context.NONE);
     }
 }
 ```
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml
index fbbe71b9c00a0..3747ddddb7ace 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml
@@ -13,7 +13,7 @@
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for IotDps Management</name>
-  <description>This package contains Microsoft Azure SDK for IotDps Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. API for using the Azure IoT Hub Device Provisioning Service features. Package tag package-2022-02.</description>
+  <description>This package contains Microsoft Azure SDK for IotDps Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. API for using the Azure IoT Hub Device Provisioning Service features. Package tag package-2022-12.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>
@@ -39,7 +39,6 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jacoco.skip>true</jacoco.skip>
-    <revapi.skip>true</revapi.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/IotDpsManager.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/IotDpsManager.java
index ef38a18842975..cc0c5aac2c70e 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/IotDpsManager.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/IotDpsManager.java
@@ -211,7 +211,7 @@ public IotDpsManager authenticate(TokenCredential credential, AzureProfile profi
                 .append("-")
                 .append("com.azure.resourcemanager.deviceprovisioningservices")
                 .append("/")
-                .append("1.1.0-beta.2");
+                .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/DpsCertificatesClient.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/DpsCertificatesClient.java
index ae35b989b0658..ba3e57728e33d 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/DpsCertificatesClient.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/DpsCertificatesClient.java
@@ -17,21 +17,6 @@
 
 /** An instance of this class provides access to all the operations defined in DpsCertificatesClient. */
 public interface DpsCertificatesClient {
-    /**
-     * Get the certificate from the provisioning service.
-     *
-     * @param certificateName Name of the certificate to retrieve.
-     * @param resourceGroupName Resource group identifier.
-     * @param provisioningServiceName Name of the provisioning service the certificate is associated with.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
-     *     is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the certificate from the provisioning service.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    CertificateResponseInner get(String certificateName, String resourceGroupName, String provisioningServiceName);
-
     /**
      * Get the certificate from the provisioning service.
      *
@@ -55,27 +40,24 @@ Response<CertificateResponseInner> getWithResponse(
         Context context);
 
     /**
-     * Add new certificate or update an existing certificate.
+     * Get the certificate from the provisioning service.
      *
+     * @param certificateName Name of the certificate to retrieve.
      * @param resourceGroupName Resource group identifier.
-     * @param provisioningServiceName The name of the provisioning service.
-     * @param certificateName The name of the certificate create or update.
-     * @param certificateDescription The certificate body.
+     * @param provisioningServiceName Name of the provisioning service the certificate is associated with.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the X509 Certificate.
+     * @return the certificate from the provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    CertificateResponseInner createOrUpdate(
-        String resourceGroupName,
-        String provisioningServiceName,
-        String certificateName,
-        CertificateResponseInner certificateDescription);
+    CertificateResponseInner get(String certificateName, String resourceGroupName, String provisioningServiceName);
 
     /**
-     * Add new certificate or update an existing certificate.
+     * Upload the certificate to the provisioning service.
+     *
+     * <p>Add new certificate or update an existing certificate.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName The name of the provisioning service.
@@ -100,23 +82,31 @@ Response<CertificateResponseInner> createOrUpdateWithResponse(
         Context context);
 
     /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * Upload the certificate to the provisioning service.
+     *
+     * <p>Add new certificate or update an existing certificate.
      *
      * @param resourceGroupName Resource group identifier.
-     * @param ifMatch ETag of the certificate.
      * @param provisioningServiceName The name of the provisioning service.
-     * @param certificateName This is a mandatory field, and is the logical name of the certificate that the
-     *     provisioning service will access by.
+     * @param certificateName The name of the certificate create or update.
+     * @param certificateDescription The certificate body.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the X509 Certificate.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String ifMatch, String provisioningServiceName, String certificateName);
+    CertificateResponseInner createOrUpdate(
+        String resourceGroupName,
+        String provisioningServiceName,
+        String certificateName,
+        CertificateResponseInner certificateDescription);
 
     /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * Delete the Provisioning Service Certificate.
+     *
+     * <p>Deletes the specified certificate associated with the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param ifMatch ETag of the certificate.
@@ -155,18 +145,22 @@ Response<Void> deleteWithResponse(
         Context context);
 
     /**
-     * Get all the certificates tied to the provisioning service.
+     * Delete the Provisioning Service Certificate.
      *
-     * @param resourceGroupName Name of resource group.
-     * @param provisioningServiceName Name of provisioning service to retrieve certificates for.
+     * <p>Deletes the specified certificate associated with the Provisioning Service.
+     *
+     * @param resourceGroupName Resource group identifier.
+     * @param ifMatch ETag of the certificate.
+     * @param provisioningServiceName The name of the provisioning service.
+     * @param certificateName This is a mandatory field, and is the logical name of the certificate that the
+     *     provisioning service will access by.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all the certificates tied to the provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    CertificateListDescriptionInner list(String resourceGroupName, String provisioningServiceName);
+    void delete(String resourceGroupName, String ifMatch, String provisioningServiceName, String certificateName);
 
     /**
      * Get all the certificates tied to the provisioning service.
@@ -185,23 +179,18 @@ Response<CertificateListDescriptionInner> listWithResponse(
         String resourceGroupName, String provisioningServiceName, Context context);
 
     /**
-     * Generate verification code for Proof of Possession.
+     * Get all the certificates tied to the provisioning service.
      *
-     * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
-     *     access.
-     * @param ifMatch ETag of the certificate. This is required to update an existing certificate, and ignored while
-     *     creating a brand new certificate.
-     * @param resourceGroupName name of resource group.
-     * @param provisioningServiceName Name of provisioning service.
+     * @param resourceGroupName Name of resource group.
+     * @param provisioningServiceName Name of provisioning service to retrieve certificates for.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of the response of the verification code.
+     * @return all the certificates tied to the provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    VerificationCodeResponseInner generateVerificationCode(
-        String certificateName, String ifMatch, String resourceGroupName, String provisioningServiceName);
+    CertificateListDescriptionInner list(String resourceGroupName, String provisioningServiceName);
 
     /**
      * Generate verification code for Proof of Possession.
@@ -244,32 +233,29 @@ Response<VerificationCodeResponseInner> generateVerificationCodeWithResponse(
         Context context);
 
     /**
-     * Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre uploaded
-     * certificate.
+     * Generate verification code for Proof of Possession.
      *
      * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
      *     access.
-     * @param ifMatch ETag of the certificate.
-     * @param resourceGroupName Resource group name.
-     * @param provisioningServiceName Provisioning service name.
-     * @param request The name of the certificate.
+     * @param ifMatch ETag of the certificate. This is required to update an existing certificate, and ignored while
+     *     creating a brand new certificate.
+     * @param resourceGroupName name of resource group.
+     * @param provisioningServiceName Name of provisioning service.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the X509 Certificate.
+     * @return description of the response of the verification code.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    CertificateResponseInner verifyCertificate(
-        String certificateName,
-        String ifMatch,
-        String resourceGroupName,
-        String provisioningServiceName,
-        VerificationCodeRequest request);
+    VerificationCodeResponseInner generateVerificationCode(
+        String certificateName, String ifMatch, String resourceGroupName, String provisioningServiceName);
 
     /**
-     * Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre uploaded
-     * certificate.
+     * Verify certificate's private key possession.
+     *
+     * <p>Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre
+     * uploaded certificate.
      *
      * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
      *     access.
@@ -308,4 +294,30 @@ Response<CertificateResponseInner> verifyCertificateWithResponse(
         Boolean certificateHasPrivateKey,
         String certificateNonce,
         Context context);
+
+    /**
+     * Verify certificate's private key possession.
+     *
+     * <p>Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre
+     * uploaded certificate.
+     *
+     * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
+     *     access.
+     * @param ifMatch ETag of the certificate.
+     * @param resourceGroupName Resource group name.
+     * @param provisioningServiceName Provisioning service name.
+     * @param request The name of the certificate.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
+     *     is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the X509 Certificate.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    CertificateResponseInner verifyCertificate(
+        String certificateName,
+        String ifMatch,
+        String resourceGroupName,
+        String provisioningServiceName,
+        VerificationCodeRequest request);
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/IotDpsResourcesClient.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/IotDpsResourcesClient.java
index 6a0df9175123f..460452d4cd02f 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/IotDpsResourcesClient.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/IotDpsResourcesClient.java
@@ -26,39 +26,45 @@
 /** An instance of this class provides access to all the operations defined in IotDpsResourcesClient. */
 public interface IotDpsResourcesClient {
     /**
-     * Get the metadata of the provisioning service without SAS keys.
+     * Get the non-security related metadata of the provisioning service.
+     *
+     * <p>Get the metadata of the provisioning service without SAS keys.
      *
      * @param resourceGroupName Resource group name.
      * @param provisioningServiceName Name of the provisioning service to retrieve.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the metadata of the provisioning service without SAS keys.
+     * @return the metadata of the provisioning service without SAS keys along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    ProvisioningServiceDescriptionInner getByResourceGroup(String resourceGroupName, String provisioningServiceName);
+    Response<ProvisioningServiceDescriptionInner> getByResourceGroupWithResponse(
+        String resourceGroupName, String provisioningServiceName, Context context);
 
     /**
-     * Get the metadata of the provisioning service without SAS keys.
+     * Get the non-security related metadata of the provisioning service.
+     *
+     * <p>Get the metadata of the provisioning service without SAS keys.
      *
      * @param resourceGroupName Resource group name.
      * @param provisioningServiceName Name of the provisioning service to retrieve.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the metadata of the provisioning service without SAS keys along with {@link Response}.
+     * @return the metadata of the provisioning service without SAS keys.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<ProvisioningServiceDescriptionInner> getByResourceGroupWithResponse(
-        String resourceGroupName, String provisioningServiceName, Context context);
+    ProvisioningServiceDescriptionInner getByResourceGroup(String resourceGroupName, String provisioningServiceName);
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -77,9 +83,11 @@ Response<ProvisioningServiceDescriptionInner> getByResourceGroupWithResponse(
             ProvisioningServiceDescriptionInner iotDpsDescription);
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -100,9 +108,11 @@ Response<ProvisioningServiceDescriptionInner> getByResourceGroupWithResponse(
             Context context);
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -120,9 +130,11 @@ ProvisioningServiceDescriptionInner createOrUpdate(
         ProvisioningServiceDescriptionInner iotDpsDescription);
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -142,7 +154,9 @@ ProvisioningServiceDescriptionInner createOrUpdate(
         Context context);
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -157,7 +171,9 @@ SyncPoller<PollResult<ProvisioningServiceDescriptionInner>, ProvisioningServiceD
         String resourceGroupName, String provisioningServiceName, TagsResource provisioningServiceTags);
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -176,7 +192,9 @@ SyncPoller<PollResult<ProvisioningServiceDescriptionInner>, ProvisioningServiceD
         Context context);
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -191,7 +209,9 @@ ProvisioningServiceDescriptionInner update(
         String resourceGroupName, String provisioningServiceName, TagsResource provisioningServiceTags);
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -210,7 +230,9 @@ ProvisioningServiceDescriptionInner update(
         Context context);
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -224,7 +246,9 @@ ProvisioningServiceDescriptionInner update(
     SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String provisioningServiceName);
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -240,7 +264,9 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String provisioningServiceName, Context context);
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -253,7 +279,9 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
     void delete(String resourceGroupName, String provisioningServiceName);
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -267,7 +295,9 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
     void delete(String resourceGroupName, String provisioningServiceName, Context context);
 
     /**
-     * List all the provisioning services for a given subscription id.
+     * Get all the provisioning services in a subscription.
+     *
+     * <p>List all the provisioning services for a given subscription id.
      *
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
@@ -278,7 +308,9 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
     PagedIterable<ProvisioningServiceDescriptionInner> list();
 
     /**
-     * List all the provisioning services for a given subscription id.
+     * Get all the provisioning services in a subscription.
+     *
+     * <p>List all the provisioning services for a given subscription id.
      *
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
@@ -327,15 +359,21 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @param provisioningServiceName Name of provisioning service that the operation is running on.
      * @param asyncinfo Async header used to poll on the status of the operation, obtained while creating the long
      *     running operation.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a long running operation, such as create, update or delete a provisioning service.
+     * @return the status of a long running operation, such as create, update or delete a provisioning service along
+     *     with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    AsyncOperationResultInner getOperationResult(
-        String operationId, String resourceGroupName, String provisioningServiceName, String asyncinfo);
+    Response<AsyncOperationResultInner> getOperationResultWithResponse(
+        String operationId,
+        String resourceGroupName,
+        String provisioningServiceName,
+        String asyncinfo,
+        Context context);
 
     /**
      * Gets the status of a long running operation, such as create, update or delete a provisioning service.
@@ -345,24 +383,20 @@ AsyncOperationResultInner getOperationResult(
      * @param provisioningServiceName Name of provisioning service that the operation is running on.
      * @param asyncinfo Async header used to poll on the status of the operation, obtained while creating the long
      *     running operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a long running operation, such as create, update or delete a provisioning service along
-     *     with {@link Response}.
+     * @return the status of a long running operation, such as create, update or delete a provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<AsyncOperationResultInner> getOperationResultWithResponse(
-        String operationId,
-        String resourceGroupName,
-        String provisioningServiceName,
-        String asyncinfo,
-        Context context);
+    AsyncOperationResultInner getOperationResult(
+        String operationId, String resourceGroupName, String provisioningServiceName, String asyncinfo);
 
     /**
-     * Gets the list of valid SKUs and tiers for a provisioning service.
+     * Get the list of valid SKUs for a provisioning service.
+     *
+     * <p>Gets the list of valid SKUs and tiers for a provisioning service.
      *
      * @param provisioningServiceName Name of provisioning service.
      * @param resourceGroupName Name of resource group.
@@ -377,7 +411,9 @@ Response<AsyncOperationResultInner> getOperationResultWithResponse(
     PagedIterable<IotDpsSkuDefinitionInner> listValidSkus(String provisioningServiceName, String resourceGroupName);
 
     /**
-     * Gets the list of valid SKUs and tiers for a provisioning service.
+     * Get the list of valid SKUs for a provisioning service.
+     *
+     * <p>Gets the list of valid SKUs and tiers for a provisioning service.
      *
      * @param provisioningServiceName Name of provisioning service.
      * @param resourceGroupName Name of resource group.
@@ -394,39 +430,45 @@ PagedIterable<IotDpsSkuDefinitionInner> listValidSkus(
         String provisioningServiceName, String resourceGroupName, Context context);
 
     /**
-     * Check if a provisioning service name is available. This will validate if the name is syntactically valid and if
-     * the name is usable.
+     * Check if a provisioning service name is available.
+     *
+     * <p>Check if a provisioning service name is available. This will validate if the name is syntactically valid and
+     * if the name is usable.
      *
      * @param arguments Set the name parameter in the OperationInputs structure to the name of the provisioning service
      *     to check.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of name availability.
+     * @return description of name availability along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    NameAvailabilityInfoInner checkProvisioningServiceNameAvailability(OperationInputs arguments);
+    Response<NameAvailabilityInfoInner> checkProvisioningServiceNameAvailabilityWithResponse(
+        OperationInputs arguments, Context context);
 
     /**
-     * Check if a provisioning service name is available. This will validate if the name is syntactically valid and if
-     * the name is usable.
+     * Check if a provisioning service name is available.
+     *
+     * <p>Check if a provisioning service name is available. This will validate if the name is syntactically valid and
+     * if the name is usable.
      *
      * @param arguments Set the name parameter in the OperationInputs structure to the name of the provisioning service
      *     to check.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of name availability along with {@link Response}.
+     * @return description of name availability.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<NameAvailabilityInfoInner> checkProvisioningServiceNameAvailabilityWithResponse(
-        OperationInputs arguments, Context context);
+    NameAvailabilityInfoInner checkProvisioningServiceNameAvailability(OperationInputs arguments);
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @param provisioningServiceName The provisioning service name to get the shared access keys for.
      * @param resourceGroupName resource group name.
@@ -441,7 +483,9 @@ PagedIterable<SharedAccessSignatureAuthorizationRuleInner> listKeys(
         String provisioningServiceName, String resourceGroupName);
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @param provisioningServiceName The provisioning service name to get the shared access keys for.
      * @param resourceGroupName resource group name.
@@ -457,23 +501,9 @@ PagedIterable<SharedAccessSignatureAuthorizationRuleInner> listKeys(
         String provisioningServiceName, String resourceGroupName, Context context);
 
     /**
-     * List primary and secondary keys for a specific key name.
+     * Get a shared access policy by name from a provisioning service.
      *
-     * @param provisioningServiceName Name of the provisioning service.
-     * @param keyName Logical key name to get key-values for.
-     * @param resourceGroupName The name of the resource group that contains the provisioning service.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
-     *     is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of the shared access key.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    SharedAccessSignatureAuthorizationRuleInner listKeysForKeyName(
-        String provisioningServiceName, String keyName, String resourceGroupName);
-
-    /**
-     * List primary and secondary keys for a specific key name.
+     * <p>List primary and secondary keys for a specific key name.
      *
      * @param provisioningServiceName Name of the provisioning service.
      * @param keyName Logical key name to get key-values for.
@@ -490,21 +520,27 @@ Response<SharedAccessSignatureAuthorizationRuleInner> listKeysForKeyNameWithResp
         String provisioningServiceName, String keyName, String resourceGroupName, Context context);
 
     /**
-     * List private link resources for the given provisioning service.
+     * Get a shared access policy by name from a provisioning service.
      *
+     * <p>List primary and secondary keys for a specific key name.
+     *
+     * @param provisioningServiceName Name of the provisioning service.
+     * @param keyName Logical key name to get key-values for.
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
-     * @param resourceName The name of the provisioning service.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the available private link resources for a provisioning service.
+     * @return description of the shared access key.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    PrivateLinkResourcesInner listPrivateLinkResources(String resourceGroupName, String resourceName);
+    SharedAccessSignatureAuthorizationRuleInner listKeysForKeyName(
+        String provisioningServiceName, String keyName, String resourceGroupName);
 
     /**
-     * List private link resources for the given provisioning service.
+     * List private link resources
+     *
+     * <p>List private link resources for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -520,22 +556,25 @@ Response<PrivateLinkResourcesInner> listPrivateLinkResourcesWithResponse(
         String resourceGroupName, String resourceName, Context context);
 
     /**
-     * Get the specified private link resource for the given provisioning service.
+     * List private link resources
+     *
+     * <p>List private link resources for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
-     * @param groupId The name of the private link resource.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException 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 link resource for the given provisioning service.
+     * @return the available private link resources for a provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    GroupIdInformationInner getPrivateLinkResources(String resourceGroupName, String resourceName, String groupId);
+    PrivateLinkResourcesInner listPrivateLinkResources(String resourceGroupName, String resourceName);
 
     /**
-     * Get the specified private link resource for the given provisioning service.
+     * Get the specified private link resource
+     *
+     * <p>Get the specified private link resource for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -552,21 +591,26 @@ Response<GroupIdInformationInner> getPrivateLinkResourcesWithResponse(
         String resourceGroupName, String resourceName, String groupId, Context context);
 
     /**
-     * List private endpoint connection properties.
+     * Get the specified private link resource
+     *
+     * <p>Get the specified private link resource for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
+     * @param groupId The name of the private link resource.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException 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 of private endpoint connections for a provisioning service.
+     * @return the specified private link resource for the given provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    List<PrivateEndpointConnectionInner> listPrivateEndpointConnections(String resourceGroupName, String resourceName);
+    GroupIdInformationInner getPrivateLinkResources(String resourceGroupName, String resourceName, String groupId);
 
     /**
-     * List private endpoint connection properties.
+     * List private endpoint connections
+     *
+     * <p>List private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -582,23 +626,25 @@ Response<List<PrivateEndpointConnectionInner>> listPrivateEndpointConnectionsWit
         String resourceGroupName, String resourceName, Context context);
 
     /**
-     * Get private endpoint connection properties.
+     * List private endpoint connections
+     *
+     * <p>List private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
-     * @param privateEndpointConnectionName The name of the private endpoint connection.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return private endpoint connection properties.
+     * @return the list of private endpoint connections for a provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    PrivateEndpointConnectionInner getPrivateEndpointConnection(
-        String resourceGroupName, String resourceName, String privateEndpointConnectionName);
+    List<PrivateEndpointConnectionInner> listPrivateEndpointConnections(String resourceGroupName, String resourceName);
 
     /**
-     * Get private endpoint connection properties.
+     * Get private endpoint connection
+     *
+     * <p>Get private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -615,7 +661,27 @@ Response<PrivateEndpointConnectionInner> getPrivateEndpointConnectionWithRespons
         String resourceGroupName, String resourceName, String privateEndpointConnectionName, Context context);
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Get private endpoint connection
+     *
+     * <p>Get private endpoint connection properties.
+     *
+     * @param resourceGroupName The name of the resource group that contains the provisioning service.
+     * @param resourceName The name of the provisioning service.
+     * @param privateEndpointConnectionName The name of the private endpoint connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
+     *     is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return private endpoint connection properties.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    PrivateEndpointConnectionInner getPrivateEndpointConnection(
+        String resourceGroupName, String resourceName, String privateEndpointConnectionName);
+
+    /**
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -636,7 +702,9 @@ Response<PrivateEndpointConnectionInner> getPrivateEndpointConnectionWithRespons
             PrivateEndpointConnectionInner privateEndpointConnection);
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -659,7 +727,9 @@ Response<PrivateEndpointConnectionInner> getPrivateEndpointConnectionWithRespons
             Context context);
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -679,7 +749,9 @@ PrivateEndpointConnectionInner createOrUpdatePrivateEndpointConnection(
         PrivateEndpointConnectionInner privateEndpointConnection);
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -701,7 +773,9 @@ PrivateEndpointConnectionInner createOrUpdatePrivateEndpointConnection(
         Context context);
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -718,7 +792,9 @@ PrivateEndpointConnectionInner createOrUpdatePrivateEndpointConnection(
             String resourceGroupName, String resourceName, String privateEndpointConnectionName);
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -736,7 +812,9 @@ PrivateEndpointConnectionInner createOrUpdatePrivateEndpointConnection(
             String resourceGroupName, String resourceName, String privateEndpointConnectionName, Context context);
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -752,7 +830,9 @@ PrivateEndpointConnectionInner deletePrivateEndpointConnection(
         String resourceGroupName, String resourceName, String privateEndpointConnectionName);
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/AsyncOperationResultInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/AsyncOperationResultInner.java
index c418189842128..7bbd79018b98c 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/AsyncOperationResultInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/AsyncOperationResultInner.java
@@ -23,6 +23,10 @@ public final class AsyncOperationResultInner {
     @JsonProperty(value = "error")
     private ErrorMessage error;
 
+    /** Creates an instance of AsyncOperationResultInner class. */
+    public AsyncOperationResultInner() {
+    }
+
     /**
      * Get the status property: current status of a long running operation.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/CertificateListDescriptionInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/CertificateListDescriptionInner.java
index 29345932d7b87..e8691c7648b4a 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/CertificateListDescriptionInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/CertificateListDescriptionInner.java
@@ -17,6 +17,10 @@ public final class CertificateListDescriptionInner {
     @JsonProperty(value = "value")
     private List<CertificateResponseInner> value;
 
+    /** Creates an instance of CertificateListDescriptionInner class. */
+    public CertificateListDescriptionInner() {
+    }
+
     /**
      * Get the value property: The array of Certificate objects.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/CertificateResponseInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/CertificateResponseInner.java
index a1bf9c3900d4a..7acae6df0c484 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/CertificateResponseInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/CertificateResponseInner.java
@@ -31,6 +31,10 @@ public final class CertificateResponseInner extends ProxyResource {
     @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
     private SystemData systemData;
 
+    /** Creates an instance of CertificateResponseInner class. */
+    public CertificateResponseInner() {
+    }
+
     /**
      * Get the properties property: properties of a certificate.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/GroupIdInformationInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/GroupIdInformationInner.java
index 065cac030f0b7..1cfb3092bf478 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/GroupIdInformationInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/GroupIdInformationInner.java
@@ -36,6 +36,10 @@ public final class GroupIdInformationInner {
     @JsonProperty(value = "properties", required = true)
     private GroupIdInformationProperties properties;
 
+    /** Creates an instance of GroupIdInformationInner class. */
+    public GroupIdInformationInner() {
+    }
+
     /**
      * Get the id property: The resource identifier.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/IotDpsSkuDefinitionInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/IotDpsSkuDefinitionInner.java
index 4ba84ebf1fba2..3c96d5047a707 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/IotDpsSkuDefinitionInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/IotDpsSkuDefinitionInner.java
@@ -17,6 +17,10 @@ public final class IotDpsSkuDefinitionInner {
     @JsonProperty(value = "name")
     private IotDpsSku name;
 
+    /** Creates an instance of IotDpsSkuDefinitionInner class. */
+    public IotDpsSkuDefinitionInner() {
+    }
+
     /**
      * Get the name property: Sku name.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/NameAvailabilityInfoInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/NameAvailabilityInfoInner.java
index 14279aa9bdd2f..eeb12fd7c0f85 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/NameAvailabilityInfoInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/NameAvailabilityInfoInner.java
@@ -29,6 +29,10 @@ public final class NameAvailabilityInfoInner {
     @JsonProperty(value = "message")
     private String message;
 
+    /** Creates an instance of NameAvailabilityInfoInner class. */
+    public NameAvailabilityInfoInner() {
+    }
+
     /**
      * Get the nameAvailable property: specifies if a name is available or not.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/OperationInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/OperationInner.java
index b2686b117fb0b..adebd9a25e397 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/OperationInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/OperationInner.java
@@ -23,6 +23,10 @@ public final class OperationInner {
     @JsonProperty(value = "display")
     private OperationDisplay display;
 
+    /** Creates an instance of OperationInner class. */
+    public OperationInner() {
+    }
+
     /**
      * Get the name property: Operation name: {provider}/{resource}/{read | write | action | delete}.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/PrivateEndpointConnectionInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/PrivateEndpointConnectionInner.java
index a32616caeea4e..8757cb7f9c322 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/PrivateEndpointConnectionInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/PrivateEndpointConnectionInner.java
@@ -26,6 +26,10 @@ public final class PrivateEndpointConnectionInner extends ProxyResource {
     @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
     private SystemData systemData;
 
+    /** Creates an instance of PrivateEndpointConnectionInner class. */
+    public PrivateEndpointConnectionInner() {
+    }
+
     /**
      * Get the properties property: The properties of a private endpoint connection.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/PrivateLinkResourcesInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/PrivateLinkResourcesInner.java
index 576b664f280ad..8b056e73a0ae4 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/PrivateLinkResourcesInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/PrivateLinkResourcesInner.java
@@ -17,6 +17,10 @@ public final class PrivateLinkResourcesInner {
     @JsonProperty(value = "value")
     private List<GroupIdInformationInner> value;
 
+    /** Creates an instance of PrivateLinkResourcesInner class. */
+    public PrivateLinkResourcesInner() {
+    }
+
     /**
      * Get the value property: The list of available private link resources for a provisioning service.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/ProvisioningServiceDescriptionInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/ProvisioningServiceDescriptionInner.java
index ecbb41e97f904..1630663254d2e 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/ProvisioningServiceDescriptionInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/ProvisioningServiceDescriptionInner.java
@@ -17,9 +17,8 @@
 @Fluent
 public final class ProvisioningServiceDescriptionInner extends Resource {
     /*
-     * The Etag field is *not* required. If it is provided in the response
-     * body, it must also be provided as a header per the normal ETag
-     * convention.
+     * The Etag field is *not* required. If it is provided in the response body, it must also be provided as a header
+     * per the normal ETag convention.
      */
     @JsonProperty(value = "etag")
     private String etag;
@@ -42,6 +41,22 @@ public final class ProvisioningServiceDescriptionInner extends Resource {
     @JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
     private SystemData systemData;
 
+    /*
+     * The resource group of the resource.
+     */
+    @JsonProperty(value = "resourcegroup")
+    private String resourcegroup;
+
+    /*
+     * The subscription id of the resource.
+     */
+    @JsonProperty(value = "subscriptionid")
+    private String subscriptionid;
+
+    /** Creates an instance of ProvisioningServiceDescriptionInner class. */
+    public ProvisioningServiceDescriptionInner() {
+    }
+
     /**
      * Get the etag property: The Etag field is *not* required. If it is provided in the response body, it must also be
      * provided as a header per the normal ETag convention.
@@ -113,6 +128,46 @@ public SystemData systemData() {
         return this.systemData;
     }
 
+    /**
+     * Get the resourcegroup property: The resource group of the resource.
+     *
+     * @return the resourcegroup value.
+     */
+    public String resourcegroup() {
+        return this.resourcegroup;
+    }
+
+    /**
+     * Set the resourcegroup property: The resource group of the resource.
+     *
+     * @param resourcegroup the resourcegroup value to set.
+     * @return the ProvisioningServiceDescriptionInner object itself.
+     */
+    public ProvisioningServiceDescriptionInner withResourcegroup(String resourcegroup) {
+        this.resourcegroup = resourcegroup;
+        return this;
+    }
+
+    /**
+     * Get the subscriptionid property: The subscription id of the resource.
+     *
+     * @return the subscriptionid value.
+     */
+    public String subscriptionid() {
+        return this.subscriptionid;
+    }
+
+    /**
+     * Set the subscriptionid property: The subscription id of the resource.
+     *
+     * @param subscriptionid the subscriptionid value to set.
+     * @return the ProvisioningServiceDescriptionInner object itself.
+     */
+    public ProvisioningServiceDescriptionInner withSubscriptionid(String subscriptionid) {
+        this.subscriptionid = subscriptionid;
+        return this;
+    }
+
     /** {@inheritDoc} */
     @Override
     public ProvisioningServiceDescriptionInner withLocation(String location) {
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/SharedAccessSignatureAuthorizationRuleInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/SharedAccessSignatureAuthorizationRuleInner.java
index e4a666a028180..84fff0a4b2c4a 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/SharedAccessSignatureAuthorizationRuleInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/SharedAccessSignatureAuthorizationRuleInner.java
@@ -36,6 +36,10 @@ public final class SharedAccessSignatureAuthorizationRuleInner {
     @JsonProperty(value = "rights", required = true)
     private AccessRightsDescription rights;
 
+    /** Creates an instance of SharedAccessSignatureAuthorizationRuleInner class. */
+    public SharedAccessSignatureAuthorizationRuleInner() {
+    }
+
     /**
      * Get the keyName property: Name of the key.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/VerificationCodeResponseInner.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/VerificationCodeResponseInner.java
index 6450f3bf494a2..8a4ebc644c9c8 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/VerificationCodeResponseInner.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/fluent/models/VerificationCodeResponseInner.java
@@ -24,6 +24,10 @@ public final class VerificationCodeResponseInner extends ProxyResource {
     @JsonProperty(value = "properties")
     private VerificationCodeResponseProperties properties;
 
+    /** Creates an instance of VerificationCodeResponseInner class. */
+    public VerificationCodeResponseInner() {
+    }
+
     /**
      * Get the etag property: Request etag.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/DpsCertificatesClientImpl.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/DpsCertificatesClientImpl.java
index 08a69bb2550cb..33353cb630eff 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/DpsCertificatesClientImpl.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/DpsCertificatesClientImpl.java
@@ -60,7 +60,7 @@ public final class DpsCertificatesClientImpl implements DpsCertificatesClient {
      */
     @Host("{$host}")
     @ServiceInterface(name = "IotDpsClientDpsCerti")
-    private interface DpsCertificatesService {
+    public interface DpsCertificatesService {
         @Headers({"Content-Type: application/json"})
         @Get(
             "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices"
@@ -315,7 +315,6 @@ private Mono<Response<CertificateResponseInner>> getWithResponseAsync(
      * @param certificateName Name of the certificate to retrieve.
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of the provisioning service the certificate is associated with.
-     * @param ifMatch ETag of the certificate.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -323,7 +322,8 @@ private Mono<Response<CertificateResponseInner>> getWithResponseAsync(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<CertificateResponseInner> getAsync(
-        String certificateName, String resourceGroupName, String provisioningServiceName, String ifMatch) {
+        String certificateName, String resourceGroupName, String provisioningServiceName) {
+        final String ifMatch = null;
         return getWithResponseAsync(certificateName, resourceGroupName, provisioningServiceName, ifMatch)
             .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
@@ -334,17 +334,22 @@ private Mono<CertificateResponseInner> getAsync(
      * @param certificateName Name of the certificate to retrieve.
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of the provisioning service the certificate is associated with.
+     * @param ifMatch ETag of the certificate.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the certificate from the provisioning service on successful completion of {@link Mono}.
+     * @return the certificate from the provisioning service along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<CertificateResponseInner> getAsync(
-        String certificateName, String resourceGroupName, String provisioningServiceName) {
-        final String ifMatch = null;
-        return getWithResponseAsync(certificateName, resourceGroupName, provisioningServiceName, ifMatch)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    public Response<CertificateResponseInner> getWithResponse(
+        String certificateName,
+        String resourceGroupName,
+        String provisioningServiceName,
+        String ifMatch,
+        Context context) {
+        return getWithResponseAsync(certificateName, resourceGroupName, provisioningServiceName, ifMatch, context)
+            .block();
     }
 
     /**
@@ -362,35 +367,14 @@ private Mono<CertificateResponseInner> getAsync(
     public CertificateResponseInner get(
         String certificateName, String resourceGroupName, String provisioningServiceName) {
         final String ifMatch = null;
-        return getAsync(certificateName, resourceGroupName, provisioningServiceName, ifMatch).block();
+        return getWithResponse(certificateName, resourceGroupName, provisioningServiceName, ifMatch, Context.NONE)
+            .getValue();
     }
 
     /**
-     * Get the certificate from the provisioning service.
+     * Upload the certificate to the provisioning service.
      *
-     * @param certificateName Name of the certificate to retrieve.
-     * @param resourceGroupName Resource group identifier.
-     * @param provisioningServiceName Name of the provisioning service the certificate is associated with.
-     * @param ifMatch ETag of the certificate.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorDetailsException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the certificate from the provisioning service along with {@link Response}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<CertificateResponseInner> getWithResponse(
-        String certificateName,
-        String resourceGroupName,
-        String provisioningServiceName,
-        String ifMatch,
-        Context context) {
-        return getWithResponseAsync(certificateName, resourceGroupName, provisioningServiceName, ifMatch, context)
-            .block();
-    }
-
-    /**
-     * Add new certificate or update an existing certificate.
+     * <p>Add new certificate or update an existing certificate.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName The name of the provisioning service.
@@ -462,7 +446,9 @@ private Mono<Response<CertificateResponseInner>> createOrUpdateWithResponseAsync
     }
 
     /**
-     * Add new certificate or update an existing certificate.
+     * Upload the certificate to the provisioning service.
+     *
+     * <p>Add new certificate or update an existing certificate.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName The name of the provisioning service.
@@ -533,14 +519,14 @@ private Mono<Response<CertificateResponseInner>> createOrUpdateWithResponseAsync
     }
 
     /**
-     * Add new certificate or update an existing certificate.
+     * Upload the certificate to the provisioning service.
+     *
+     * <p>Add new certificate or update an existing certificate.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName The name of the provisioning service.
      * @param certificateName The name of the certificate create or update.
      * @param certificateDescription The certificate body.
-     * @param ifMatch ETag of the certificate. This is required to update an existing certificate, and ignored while
-     *     creating a brand new certificate.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -551,39 +537,47 @@ private Mono<CertificateResponseInner> createOrUpdateAsync(
         String resourceGroupName,
         String provisioningServiceName,
         String certificateName,
-        CertificateResponseInner certificateDescription,
-        String ifMatch) {
+        CertificateResponseInner certificateDescription) {
+        final String ifMatch = null;
         return createOrUpdateWithResponseAsync(
                 resourceGroupName, provisioningServiceName, certificateName, certificateDescription, ifMatch)
             .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
-     * Add new certificate or update an existing certificate.
+     * Upload the certificate to the provisioning service.
+     *
+     * <p>Add new certificate or update an existing certificate.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName The name of the provisioning service.
      * @param certificateName The name of the certificate create or update.
      * @param certificateDescription The certificate body.
+     * @param ifMatch ETag of the certificate. This is required to update an existing certificate, and ignored while
+     *     creating a brand new certificate.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the X509 Certificate on successful completion of {@link Mono}.
+     * @return the X509 Certificate along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<CertificateResponseInner> createOrUpdateAsync(
+    public Response<CertificateResponseInner> createOrUpdateWithResponse(
         String resourceGroupName,
         String provisioningServiceName,
         String certificateName,
-        CertificateResponseInner certificateDescription) {
-        final String ifMatch = null;
+        CertificateResponseInner certificateDescription,
+        String ifMatch,
+        Context context) {
         return createOrUpdateWithResponseAsync(
-                resourceGroupName, provisioningServiceName, certificateName, certificateDescription, ifMatch)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+                resourceGroupName, provisioningServiceName, certificateName, certificateDescription, ifMatch, context)
+            .block();
     }
 
     /**
-     * Add new certificate or update an existing certificate.
+     * Upload the certificate to the provisioning service.
+     *
+     * <p>Add new certificate or update an existing certificate.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName The name of the provisioning service.
@@ -601,41 +595,20 @@ public CertificateResponseInner createOrUpdate(
         String certificateName,
         CertificateResponseInner certificateDescription) {
         final String ifMatch = null;
-        return createOrUpdateAsync(
-                resourceGroupName, provisioningServiceName, certificateName, certificateDescription, ifMatch)
-            .block();
+        return createOrUpdateWithResponse(
+                resourceGroupName,
+                provisioningServiceName,
+                certificateName,
+                certificateDescription,
+                ifMatch,
+                Context.NONE)
+            .getValue();
     }
 
     /**
-     * Add new certificate or update an existing certificate.
+     * Delete the Provisioning Service Certificate.
      *
-     * @param resourceGroupName Resource group identifier.
-     * @param provisioningServiceName The name of the provisioning service.
-     * @param certificateName The name of the certificate create or update.
-     * @param certificateDescription The certificate body.
-     * @param ifMatch ETag of the certificate. This is required to update an existing certificate, and ignored while
-     *     creating a brand new certificate.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorDetailsException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the X509 Certificate along with {@link Response}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<CertificateResponseInner> createOrUpdateWithResponse(
-        String resourceGroupName,
-        String provisioningServiceName,
-        String certificateName,
-        CertificateResponseInner certificateDescription,
-        String ifMatch,
-        Context context) {
-        return createOrUpdateWithResponseAsync(
-                resourceGroupName, provisioningServiceName, certificateName, certificateDescription, ifMatch, context)
-            .block();
-    }
-
-    /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * <p>Deletes the specified certificate associated with the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param ifMatch ETag of the certificate.
@@ -725,7 +698,9 @@ private Mono<Response<Void>> deleteWithResponseAsync(
     }
 
     /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * Delete the Provisioning Service Certificate.
+     *
+     * <p>Deletes the specified certificate associated with the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param ifMatch ETag of the certificate.
@@ -814,58 +789,9 @@ private Mono<Response<Void>> deleteWithResponseAsync(
     }
 
     /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * Delete the Provisioning Service Certificate.
      *
-     * @param resourceGroupName Resource group identifier.
-     * @param ifMatch ETag of the certificate.
-     * @param provisioningServiceName The name of the provisioning service.
-     * @param certificateName This is a mandatory field, and is the logical name of the certificate that the
-     *     provisioning service will access by.
-     * @param certificateName1 This is optional, and it is the Common Name of the certificate.
-     * @param certificateRawBytes Raw data within the certificate.
-     * @param certificateIsVerified Indicates if certificate has been verified by owner of the private key.
-     * @param certificatePurpose A description that mentions the purpose of the certificate.
-     * @param certificateCreated Time the certificate is created.
-     * @param certificateLastUpdated Time the certificate is last updated.
-     * @param certificateHasPrivateKey Indicates if the certificate contains a private key.
-     * @param certificateNonce Random number generated to indicate Proof of Possession.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorDetailsException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> deleteAsync(
-        String resourceGroupName,
-        String ifMatch,
-        String provisioningServiceName,
-        String certificateName,
-        String certificateName1,
-        byte[] certificateRawBytes,
-        Boolean certificateIsVerified,
-        CertificatePurpose certificatePurpose,
-        OffsetDateTime certificateCreated,
-        OffsetDateTime certificateLastUpdated,
-        Boolean certificateHasPrivateKey,
-        String certificateNonce) {
-        return deleteWithResponseAsync(
-                resourceGroupName,
-                ifMatch,
-                provisioningServiceName,
-                certificateName,
-                certificateName1,
-                certificateRawBytes,
-                certificateIsVerified,
-                certificatePurpose,
-                certificateCreated,
-                certificateLastUpdated,
-                certificateHasPrivateKey,
-                certificateNonce)
-            .flatMap(ignored -> Mono.empty());
-    }
-
-    /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * <p>Deletes the specified certificate associated with the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param ifMatch ETag of the certificate.
@@ -905,46 +831,9 @@ private Mono<Void> deleteAsync(
     }
 
     /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * Delete the Provisioning Service Certificate.
      *
-     * @param resourceGroupName Resource group identifier.
-     * @param ifMatch ETag of the certificate.
-     * @param provisioningServiceName The name of the provisioning service.
-     * @param certificateName This is a mandatory field, and is the logical name of the certificate that the
-     *     provisioning service will access by.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorDetailsException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(
-        String resourceGroupName, String ifMatch, String provisioningServiceName, String certificateName) {
-        final String certificateName1 = null;
-        final byte[] certificateRawBytes = new byte[0];
-        final Boolean certificateIsVerified = null;
-        final CertificatePurpose certificatePurpose = null;
-        final OffsetDateTime certificateCreated = null;
-        final OffsetDateTime certificateLastUpdated = null;
-        final Boolean certificateHasPrivateKey = null;
-        final String certificateNonce = null;
-        deleteAsync(
-                resourceGroupName,
-                ifMatch,
-                provisioningServiceName,
-                certificateName,
-                certificateName1,
-                certificateRawBytes,
-                certificateIsVerified,
-                certificatePurpose,
-                certificateCreated,
-                certificateLastUpdated,
-                certificateHasPrivateKey,
-                certificateNonce)
-            .block();
-    }
-
-    /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * <p>Deletes the specified certificate associated with the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param ifMatch ETag of the certificate.
@@ -997,6 +886,47 @@ public Response<Void> deleteWithResponse(
             .block();
     }
 
+    /**
+     * Delete the Provisioning Service Certificate.
+     *
+     * <p>Deletes the specified certificate associated with the Provisioning Service.
+     *
+     * @param resourceGroupName Resource group identifier.
+     * @param ifMatch ETag of the certificate.
+     * @param provisioningServiceName The name of the provisioning service.
+     * @param certificateName This is a mandatory field, and is the logical name of the certificate that the
+     *     provisioning service will access by.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ErrorDetailsException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(
+        String resourceGroupName, String ifMatch, String provisioningServiceName, String certificateName) {
+        final String certificateName1 = null;
+        final byte[] certificateRawBytes = new byte[0];
+        final Boolean certificateIsVerified = null;
+        final CertificatePurpose certificatePurpose = null;
+        final OffsetDateTime certificateCreated = null;
+        final OffsetDateTime certificateLastUpdated = null;
+        final Boolean certificateHasPrivateKey = null;
+        final String certificateNonce = null;
+        deleteWithResponse(
+            resourceGroupName,
+            ifMatch,
+            provisioningServiceName,
+            certificateName,
+            certificateName1,
+            certificateRawBytes,
+            certificateIsVerified,
+            certificatePurpose,
+            certificateCreated,
+            certificateLastUpdated,
+            certificateHasPrivateKey,
+            certificateNonce,
+            Context.NONE);
+    }
+
     /**
      * Get all the certificates tied to the provisioning service.
      *
@@ -1118,14 +1048,16 @@ private Mono<CertificateListDescriptionInner> listAsync(String resourceGroupName
      *
      * @param resourceGroupName Name of resource group.
      * @param provisioningServiceName Name of provisioning service to retrieve certificates for.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all the certificates tied to the provisioning service.
+     * @return all the certificates tied to the provisioning service along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public CertificateListDescriptionInner list(String resourceGroupName, String provisioningServiceName) {
-        return listAsync(resourceGroupName, provisioningServiceName).block();
+    public Response<CertificateListDescriptionInner> listWithResponse(
+        String resourceGroupName, String provisioningServiceName, Context context) {
+        return listWithResponseAsync(resourceGroupName, provisioningServiceName, context).block();
     }
 
     /**
@@ -1133,16 +1065,14 @@ public CertificateListDescriptionInner list(String resourceGroupName, String pro
      *
      * @param resourceGroupName Name of resource group.
      * @param provisioningServiceName Name of provisioning service to retrieve certificates for.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all the certificates tied to the provisioning service along with {@link Response}.
+     * @return all the certificates tied to the provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<CertificateListDescriptionInner> listWithResponse(
-        String resourceGroupName, String provisioningServiceName, Context context) {
-        return listWithResponseAsync(resourceGroupName, provisioningServiceName, context).block();
+    public CertificateListDescriptionInner list(String resourceGroupName, String provisioningServiceName) {
+        return listWithResponse(resourceGroupName, provisioningServiceName, Context.NONE).getValue();
     }
 
     /**
@@ -1337,14 +1267,6 @@ private Mono<Response<VerificationCodeResponseInner>> generateVerificationCodeWi
      *     creating a brand new certificate.
      * @param resourceGroupName name of resource group.
      * @param provisioningServiceName Name of provisioning service.
-     * @param certificateName1 Common Name for the certificate.
-     * @param certificateRawBytes Raw data of certificate.
-     * @param certificateIsVerified Indicates if the certificate has been verified by owner of the private key.
-     * @param certificatePurpose Description mentioning the purpose of the certificate.
-     * @param certificateCreated Certificate creation time.
-     * @param certificateLastUpdated Certificate last updated time.
-     * @param certificateHasPrivateKey Indicates if the certificate contains private key.
-     * @param certificateNonce Random number generated to indicate Proof of Possession.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1352,18 +1274,15 @@ private Mono<Response<VerificationCodeResponseInner>> generateVerificationCodeWi
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<VerificationCodeResponseInner> generateVerificationCodeAsync(
-        String certificateName,
-        String ifMatch,
-        String resourceGroupName,
-        String provisioningServiceName,
-        String certificateName1,
-        byte[] certificateRawBytes,
-        Boolean certificateIsVerified,
-        CertificatePurpose certificatePurpose,
-        OffsetDateTime certificateCreated,
-        OffsetDateTime certificateLastUpdated,
-        Boolean certificateHasPrivateKey,
-        String certificateNonce) {
+        String certificateName, String ifMatch, String resourceGroupName, String provisioningServiceName) {
+        final String certificateName1 = null;
+        final byte[] certificateRawBytes = new byte[0];
+        final Boolean certificateIsVerified = null;
+        final CertificatePurpose certificatePurpose = null;
+        final OffsetDateTime certificateCreated = null;
+        final OffsetDateTime certificateLastUpdated = null;
+        final Boolean certificateHasPrivateKey = null;
+        final String certificateNonce = null;
         return generateVerificationCodeWithResponseAsync(
                 certificateName,
                 ifMatch,
@@ -1389,22 +1308,35 @@ private Mono<VerificationCodeResponseInner> generateVerificationCodeAsync(
      *     creating a brand new certificate.
      * @param resourceGroupName name of resource group.
      * @param provisioningServiceName Name of provisioning service.
+     * @param certificateName1 Common Name for the certificate.
+     * @param certificateRawBytes Raw data of certificate.
+     * @param certificateIsVerified Indicates if the certificate has been verified by owner of the private key.
+     * @param certificatePurpose Description mentioning the purpose of the certificate.
+     * @param certificateCreated Certificate creation time.
+     * @param certificateLastUpdated Certificate last updated time.
+     * @param certificateHasPrivateKey Indicates if the certificate contains private key.
+     * @param certificateNonce Random number generated to indicate Proof of Possession.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of the response of the verification code on successful completion of {@link Mono}.
+     * @return description of the response of the verification code along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<VerificationCodeResponseInner> generateVerificationCodeAsync(
-        String certificateName, String ifMatch, String resourceGroupName, String provisioningServiceName) {
-        final String certificateName1 = null;
-        final byte[] certificateRawBytes = new byte[0];
-        final Boolean certificateIsVerified = null;
-        final CertificatePurpose certificatePurpose = null;
-        final OffsetDateTime certificateCreated = null;
-        final OffsetDateTime certificateLastUpdated = null;
-        final Boolean certificateHasPrivateKey = null;
-        final String certificateNonce = null;
+    public Response<VerificationCodeResponseInner> generateVerificationCodeWithResponse(
+        String certificateName,
+        String ifMatch,
+        String resourceGroupName,
+        String provisioningServiceName,
+        String certificateName1,
+        byte[] certificateRawBytes,
+        Boolean certificateIsVerified,
+        CertificatePurpose certificatePurpose,
+        OffsetDateTime certificateCreated,
+        OffsetDateTime certificateLastUpdated,
+        Boolean certificateHasPrivateKey,
+        String certificateNonce,
+        Context context) {
         return generateVerificationCodeWithResponseAsync(
                 certificateName,
                 ifMatch,
@@ -1417,8 +1349,9 @@ private Mono<VerificationCodeResponseInner> generateVerificationCodeAsync(
                 certificateCreated,
                 certificateLastUpdated,
                 certificateHasPrivateKey,
-                certificateNonce)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+                certificateNonce,
+                context)
+            .block();
     }
 
     /**
@@ -1446,61 +1379,7 @@ public VerificationCodeResponseInner generateVerificationCode(
         final OffsetDateTime certificateLastUpdated = null;
         final Boolean certificateHasPrivateKey = null;
         final String certificateNonce = null;
-        return generateVerificationCodeAsync(
-                certificateName,
-                ifMatch,
-                resourceGroupName,
-                provisioningServiceName,
-                certificateName1,
-                certificateRawBytes,
-                certificateIsVerified,
-                certificatePurpose,
-                certificateCreated,
-                certificateLastUpdated,
-                certificateHasPrivateKey,
-                certificateNonce)
-            .block();
-    }
-
-    /**
-     * Generate verification code for Proof of Possession.
-     *
-     * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
-     *     access.
-     * @param ifMatch ETag of the certificate. This is required to update an existing certificate, and ignored while
-     *     creating a brand new certificate.
-     * @param resourceGroupName name of resource group.
-     * @param provisioningServiceName Name of provisioning service.
-     * @param certificateName1 Common Name for the certificate.
-     * @param certificateRawBytes Raw data of certificate.
-     * @param certificateIsVerified Indicates if the certificate has been verified by owner of the private key.
-     * @param certificatePurpose Description mentioning the purpose of the certificate.
-     * @param certificateCreated Certificate creation time.
-     * @param certificateLastUpdated Certificate last updated time.
-     * @param certificateHasPrivateKey Indicates if the certificate contains private key.
-     * @param certificateNonce Random number generated to indicate Proof of Possession.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorDetailsException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of the response of the verification code along with {@link Response}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<VerificationCodeResponseInner> generateVerificationCodeWithResponse(
-        String certificateName,
-        String ifMatch,
-        String resourceGroupName,
-        String provisioningServiceName,
-        String certificateName1,
-        byte[] certificateRawBytes,
-        Boolean certificateIsVerified,
-        CertificatePurpose certificatePurpose,
-        OffsetDateTime certificateCreated,
-        OffsetDateTime certificateLastUpdated,
-        Boolean certificateHasPrivateKey,
-        String certificateNonce,
-        Context context) {
-        return generateVerificationCodeWithResponseAsync(
+        return generateVerificationCodeWithResponse(
                 certificateName,
                 ifMatch,
                 resourceGroupName,
@@ -1513,13 +1392,15 @@ public Response<VerificationCodeResponseInner> generateVerificationCodeWithRespo
                 certificateLastUpdated,
                 certificateHasPrivateKey,
                 certificateNonce,
-                context)
-            .block();
+                Context.NONE)
+            .getValue();
     }
 
     /**
-     * Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre uploaded
-     * certificate.
+     * Verify certificate's private key possession.
+     *
+     * <p>Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre
+     * uploaded certificate.
      *
      * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
      *     access.
@@ -1617,8 +1498,10 @@ private Mono<Response<CertificateResponseInner>> verifyCertificateWithResponseAs
     }
 
     /**
-     * Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre uploaded
-     * certificate.
+     * Verify certificate's private key possession.
+     *
+     * <p>Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre
+     * uploaded certificate.
      *
      * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
      *     access.
@@ -1715,8 +1598,10 @@ private Mono<Response<CertificateResponseInner>> verifyCertificateWithResponseAs
     }
 
     /**
-     * Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre uploaded
-     * certificate.
+     * Verify certificate's private key possession.
+     *
+     * <p>Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre
+     * uploaded certificate.
      *
      * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
      *     access.
@@ -1724,14 +1609,6 @@ private Mono<Response<CertificateResponseInner>> verifyCertificateWithResponseAs
      * @param resourceGroupName Resource group name.
      * @param provisioningServiceName Provisioning service name.
      * @param request The name of the certificate.
-     * @param certificateName1 Common Name for the certificate.
-     * @param certificateRawBytes Raw data of certificate.
-     * @param certificateIsVerified Indicates if the certificate has been verified by owner of the private key.
-     * @param certificatePurpose Describe the purpose of the certificate.
-     * @param certificateCreated Certificate creation time.
-     * @param certificateLastUpdated Certificate last updated time.
-     * @param certificateHasPrivateKey Indicates if the certificate contains private key.
-     * @param certificateNonce Random number generated to indicate Proof of Possession.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1743,15 +1620,15 @@ private Mono<CertificateResponseInner> verifyCertificateAsync(
         String ifMatch,
         String resourceGroupName,
         String provisioningServiceName,
-        VerificationCodeRequest request,
-        String certificateName1,
-        byte[] certificateRawBytes,
-        Boolean certificateIsVerified,
-        CertificatePurpose certificatePurpose,
-        OffsetDateTime certificateCreated,
-        OffsetDateTime certificateLastUpdated,
-        Boolean certificateHasPrivateKey,
-        String certificateNonce) {
+        VerificationCodeRequest request) {
+        final String certificateName1 = null;
+        final byte[] certificateRawBytes = new byte[0];
+        final Boolean certificateIsVerified = null;
+        final CertificatePurpose certificatePurpose = null;
+        final OffsetDateTime certificateCreated = null;
+        final OffsetDateTime certificateLastUpdated = null;
+        final Boolean certificateHasPrivateKey = null;
+        final String certificateNonce = null;
         return verifyCertificateWithResponseAsync(
                 certificateName,
                 ifMatch,
@@ -1770,8 +1647,10 @@ private Mono<CertificateResponseInner> verifyCertificateAsync(
     }
 
     /**
-     * Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre uploaded
-     * certificate.
+     * Verify certificate's private key possession.
+     *
+     * <p>Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre
+     * uploaded certificate.
      *
      * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
      *     access.
@@ -1779,26 +1658,36 @@ private Mono<CertificateResponseInner> verifyCertificateAsync(
      * @param resourceGroupName Resource group name.
      * @param provisioningServiceName Provisioning service name.
      * @param request The name of the certificate.
+     * @param certificateName1 Common Name for the certificate.
+     * @param certificateRawBytes Raw data of certificate.
+     * @param certificateIsVerified Indicates if the certificate has been verified by owner of the private key.
+     * @param certificatePurpose Describe the purpose of the certificate.
+     * @param certificateCreated Certificate creation time.
+     * @param certificateLastUpdated Certificate last updated time.
+     * @param certificateHasPrivateKey Indicates if the certificate contains private key.
+     * @param certificateNonce Random number generated to indicate Proof of Possession.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the X509 Certificate on successful completion of {@link Mono}.
+     * @return the X509 Certificate along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<CertificateResponseInner> verifyCertificateAsync(
+    public Response<CertificateResponseInner> verifyCertificateWithResponse(
         String certificateName,
         String ifMatch,
         String resourceGroupName,
         String provisioningServiceName,
-        VerificationCodeRequest request) {
-        final String certificateName1 = null;
-        final byte[] certificateRawBytes = new byte[0];
-        final Boolean certificateIsVerified = null;
-        final CertificatePurpose certificatePurpose = null;
-        final OffsetDateTime certificateCreated = null;
-        final OffsetDateTime certificateLastUpdated = null;
-        final Boolean certificateHasPrivateKey = null;
-        final String certificateNonce = null;
+        VerificationCodeRequest request,
+        String certificateName1,
+        byte[] certificateRawBytes,
+        Boolean certificateIsVerified,
+        CertificatePurpose certificatePurpose,
+        OffsetDateTime certificateCreated,
+        OffsetDateTime certificateLastUpdated,
+        Boolean certificateHasPrivateKey,
+        String certificateNonce,
+        Context context) {
         return verifyCertificateWithResponseAsync(
                 certificateName,
                 ifMatch,
@@ -1812,13 +1701,16 @@ private Mono<CertificateResponseInner> verifyCertificateAsync(
                 certificateCreated,
                 certificateLastUpdated,
                 certificateHasPrivateKey,
-                certificateNonce)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+                certificateNonce,
+                context)
+            .block();
     }
 
     /**
-     * Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre uploaded
-     * certificate.
+     * Verify certificate's private key possession.
+     *
+     * <p>Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre
+     * uploaded certificate.
      *
      * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
      *     access.
@@ -1846,64 +1738,7 @@ public CertificateResponseInner verifyCertificate(
         final OffsetDateTime certificateLastUpdated = null;
         final Boolean certificateHasPrivateKey = null;
         final String certificateNonce = null;
-        return verifyCertificateAsync(
-                certificateName,
-                ifMatch,
-                resourceGroupName,
-                provisioningServiceName,
-                request,
-                certificateName1,
-                certificateRawBytes,
-                certificateIsVerified,
-                certificatePurpose,
-                certificateCreated,
-                certificateLastUpdated,
-                certificateHasPrivateKey,
-                certificateNonce)
-            .block();
-    }
-
-    /**
-     * Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre uploaded
-     * certificate.
-     *
-     * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
-     *     access.
-     * @param ifMatch ETag of the certificate.
-     * @param resourceGroupName Resource group name.
-     * @param provisioningServiceName Provisioning service name.
-     * @param request The name of the certificate.
-     * @param certificateName1 Common Name for the certificate.
-     * @param certificateRawBytes Raw data of certificate.
-     * @param certificateIsVerified Indicates if the certificate has been verified by owner of the private key.
-     * @param certificatePurpose Describe the purpose of the certificate.
-     * @param certificateCreated Certificate creation time.
-     * @param certificateLastUpdated Certificate last updated time.
-     * @param certificateHasPrivateKey Indicates if the certificate contains private key.
-     * @param certificateNonce Random number generated to indicate Proof of Possession.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorDetailsException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the X509 Certificate along with {@link Response}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<CertificateResponseInner> verifyCertificateWithResponse(
-        String certificateName,
-        String ifMatch,
-        String resourceGroupName,
-        String provisioningServiceName,
-        VerificationCodeRequest request,
-        String certificateName1,
-        byte[] certificateRawBytes,
-        Boolean certificateIsVerified,
-        CertificatePurpose certificatePurpose,
-        OffsetDateTime certificateCreated,
-        OffsetDateTime certificateLastUpdated,
-        Boolean certificateHasPrivateKey,
-        String certificateNonce,
-        Context context) {
-        return verifyCertificateWithResponseAsync(
+        return verifyCertificateWithResponse(
                 certificateName,
                 ifMatch,
                 resourceGroupName,
@@ -1917,7 +1752,7 @@ public Response<CertificateResponseInner> verifyCertificateWithResponse(
                 certificateLastUpdated,
                 certificateHasPrivateKey,
                 certificateNonce,
-                context)
-            .block();
+                Context.NONE)
+            .getValue();
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/DpsCertificatesImpl.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/DpsCertificatesImpl.java
index 939aa410ebbbe..5cec4ef2294ae 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/DpsCertificatesImpl.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/DpsCertificatesImpl.java
@@ -34,16 +34,6 @@ public DpsCertificatesImpl(
         this.serviceManager = serviceManager;
     }
 
-    public CertificateResponse get(String certificateName, String resourceGroupName, String provisioningServiceName) {
-        CertificateResponseInner inner =
-            this.serviceClient().get(certificateName, resourceGroupName, provisioningServiceName);
-        if (inner != null) {
-            return new CertificateResponseImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<CertificateResponse> getWithResponse(
         String certificateName,
         String resourceGroupName,
@@ -65,9 +55,14 @@ public Response<CertificateResponse> getWithResponse(
         }
     }
 
-    public void delete(
-        String resourceGroupName, String ifMatch, String provisioningServiceName, String certificateName) {
-        this.serviceClient().delete(resourceGroupName, ifMatch, provisioningServiceName, certificateName);
+    public CertificateResponse get(String certificateName, String resourceGroupName, String provisioningServiceName) {
+        CertificateResponseInner inner =
+            this.serviceClient().get(certificateName, resourceGroupName, provisioningServiceName);
+        if (inner != null) {
+            return new CertificateResponseImpl(inner, this.manager());
+        } else {
+            return null;
+        }
     }
 
     public Response<Void> deleteWithResponse(
@@ -102,13 +97,9 @@ public Response<Void> deleteWithResponse(
                 context);
     }
 
-    public CertificateListDescription list(String resourceGroupName, String provisioningServiceName) {
-        CertificateListDescriptionInner inner = this.serviceClient().list(resourceGroupName, provisioningServiceName);
-        if (inner != null) {
-            return new CertificateListDescriptionImpl(inner, this.manager());
-        } else {
-            return null;
-        }
+    public void delete(
+        String resourceGroupName, String ifMatch, String provisioningServiceName, String certificateName) {
+        this.serviceClient().delete(resourceGroupName, ifMatch, provisioningServiceName, certificateName);
     }
 
     public Response<CertificateListDescription> listWithResponse(
@@ -126,14 +117,10 @@ public Response<CertificateListDescription> listWithResponse(
         }
     }
 
-    public VerificationCodeResponse generateVerificationCode(
-        String certificateName, String ifMatch, String resourceGroupName, String provisioningServiceName) {
-        VerificationCodeResponseInner inner =
-            this
-                .serviceClient()
-                .generateVerificationCode(certificateName, ifMatch, resourceGroupName, provisioningServiceName);
+    public CertificateListDescription list(String resourceGroupName, String provisioningServiceName) {
+        CertificateListDescriptionInner inner = this.serviceClient().list(resourceGroupName, provisioningServiceName);
         if (inner != null) {
-            return new VerificationCodeResponseImpl(inner, this.manager());
+            return new CertificateListDescriptionImpl(inner, this.manager());
         } else {
             return null;
         }
@@ -181,18 +168,14 @@ public Response<VerificationCodeResponse> generateVerificationCodeWithResponse(
         }
     }
 
-    public CertificateResponse verifyCertificate(
-        String certificateName,
-        String ifMatch,
-        String resourceGroupName,
-        String provisioningServiceName,
-        VerificationCodeRequest request) {
-        CertificateResponseInner inner =
+    public VerificationCodeResponse generateVerificationCode(
+        String certificateName, String ifMatch, String resourceGroupName, String provisioningServiceName) {
+        VerificationCodeResponseInner inner =
             this
                 .serviceClient()
-                .verifyCertificate(certificateName, ifMatch, resourceGroupName, provisioningServiceName, request);
+                .generateVerificationCode(certificateName, ifMatch, resourceGroupName, provisioningServiceName);
         if (inner != null) {
-            return new CertificateResponseImpl(inner, this.manager());
+            return new VerificationCodeResponseImpl(inner, this.manager());
         } else {
             return null;
         }
@@ -242,6 +225,23 @@ public Response<CertificateResponse> verifyCertificateWithResponse(
         }
     }
 
+    public CertificateResponse verifyCertificate(
+        String certificateName,
+        String ifMatch,
+        String resourceGroupName,
+        String provisioningServiceName,
+        VerificationCodeRequest request) {
+        CertificateResponseInner inner =
+            this
+                .serviceClient()
+                .verifyCertificate(certificateName, ifMatch, resourceGroupName, provisioningServiceName, request);
+        if (inner != null) {
+            return new CertificateResponseImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     public CertificateResponse getById(String id) {
         String certificateName = Utils.getValueFromIdByName(id, "certificates");
         if (certificateName == null) {
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsClientBuilder.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsClientBuilder.java
index a2cebb7e2bd58..3d7b97483de52 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsClientBuilder.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsClientBuilder.java
@@ -119,24 +119,26 @@ public IotDpsClientBuilder serializerAdapter(SerializerAdapter serializerAdapter
      * @return an instance of IotDpsClientImpl.
      */
     public IotDpsClientImpl buildClient() {
-        if (endpoint == null) {
-            this.endpoint = "https://management.azure.com";
-        }
-        if (environment == null) {
-            this.environment = AzureEnvironment.AZURE;
-        }
-        if (pipeline == null) {
-            this.pipeline = new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build();
-        }
-        if (defaultPollInterval == null) {
-            this.defaultPollInterval = Duration.ofSeconds(30);
-        }
-        if (serializerAdapter == null) {
-            this.serializerAdapter = SerializerFactory.createDefaultManagementSerializerAdapter();
-        }
+        String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com";
+        AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE;
+        HttpPipeline localPipeline =
+            (pipeline != null)
+                ? pipeline
+                : new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build();
+        Duration localDefaultPollInterval =
+            (defaultPollInterval != null) ? defaultPollInterval : Duration.ofSeconds(30);
+        SerializerAdapter localSerializerAdapter =
+            (serializerAdapter != null)
+                ? serializerAdapter
+                : SerializerFactory.createDefaultManagementSerializerAdapter();
         IotDpsClientImpl client =
             new IotDpsClientImpl(
-                pipeline, serializerAdapter, defaultPollInterval, environment, subscriptionId, endpoint);
+                localPipeline,
+                localSerializerAdapter,
+                localDefaultPollInterval,
+                localEnvironment,
+                subscriptionId,
+                localEndpoint);
         return client;
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsClientImpl.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsClientImpl.java
index eb8498c847559..f291a3fe34255 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsClientImpl.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsClientImpl.java
@@ -168,7 +168,7 @@ public IotDpsResourcesClient getIotDpsResources() {
         this.defaultPollInterval = defaultPollInterval;
         this.subscriptionId = subscriptionId;
         this.endpoint = endpoint;
-        this.apiVersion = "2022-02-05";
+        this.apiVersion = "2022-12-12";
         this.operations = new OperationsClientImpl(this);
         this.dpsCertificates = new DpsCertificatesClientImpl(this);
         this.iotDpsResources = new IotDpsResourcesClientImpl(this);
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsResourcesClientImpl.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsResourcesClientImpl.java
index fbb9bb4d1ec6d..84c6db620a69b 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsResourcesClientImpl.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsResourcesClientImpl.java
@@ -78,7 +78,7 @@ public final class IotDpsResourcesClientImpl implements IotDpsResourcesClient {
      */
     @Host("{$host}")
     @ServiceInterface(name = "IotDpsClientIotDpsRe")
-    private interface IotDpsResourcesService {
+    public interface IotDpsResourcesService {
         @Headers({"Content-Type: application/json"})
         @Get(
             "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices"
@@ -378,7 +378,9 @@ Mono<Response<SharedAccessSignatureAuthorizationRuleListResult>> listKeysNext(
     }
 
     /**
-     * Get the metadata of the provisioning service without SAS keys.
+     * Get the non-security related metadata of the provisioning service.
+     *
+     * <p>Get the metadata of the provisioning service without SAS keys.
      *
      * @param resourceGroupName Resource group name.
      * @param provisioningServiceName Name of the provisioning service to retrieve.
@@ -429,7 +431,9 @@ private Mono<Response<ProvisioningServiceDescriptionInner>> getByResourceGroupWi
     }
 
     /**
-     * Get the metadata of the provisioning service without SAS keys.
+     * Get the non-security related metadata of the provisioning service.
+     *
+     * <p>Get the metadata of the provisioning service without SAS keys.
      *
      * @param resourceGroupName Resource group name.
      * @param provisioningServiceName Name of the provisioning service to retrieve.
@@ -478,7 +482,9 @@ private Mono<Response<ProvisioningServiceDescriptionInner>> getByResourceGroupWi
     }
 
     /**
-     * Get the metadata of the provisioning service without SAS keys.
+     * Get the non-security related metadata of the provisioning service.
+     *
+     * <p>Get the metadata of the provisioning service without SAS keys.
      *
      * @param resourceGroupName Resource group name.
      * @param provisioningServiceName Name of the provisioning service to retrieve.
@@ -495,42 +501,48 @@ private Mono<ProvisioningServiceDescriptionInner> getByResourceGroupAsync(
     }
 
     /**
-     * Get the metadata of the provisioning service without SAS keys.
+     * Get the non-security related metadata of the provisioning service.
+     *
+     * <p>Get the metadata of the provisioning service without SAS keys.
      *
      * @param resourceGroupName Resource group name.
      * @param provisioningServiceName Name of the provisioning service to retrieve.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the metadata of the provisioning service without SAS keys.
+     * @return the metadata of the provisioning service without SAS keys along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public ProvisioningServiceDescriptionInner getByResourceGroup(
-        String resourceGroupName, String provisioningServiceName) {
-        return getByResourceGroupAsync(resourceGroupName, provisioningServiceName).block();
+    public Response<ProvisioningServiceDescriptionInner> getByResourceGroupWithResponse(
+        String resourceGroupName, String provisioningServiceName, Context context) {
+        return getByResourceGroupWithResponseAsync(resourceGroupName, provisioningServiceName, context).block();
     }
 
     /**
-     * Get the metadata of the provisioning service without SAS keys.
+     * Get the non-security related metadata of the provisioning service.
+     *
+     * <p>Get the metadata of the provisioning service without SAS keys.
      *
      * @param resourceGroupName Resource group name.
      * @param provisioningServiceName Name of the provisioning service to retrieve.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the metadata of the provisioning service without SAS keys along with {@link Response}.
+     * @return the metadata of the provisioning service without SAS keys.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<ProvisioningServiceDescriptionInner> getByResourceGroupWithResponse(
-        String resourceGroupName, String provisioningServiceName, Context context) {
-        return getByResourceGroupWithResponseAsync(resourceGroupName, provisioningServiceName, context).block();
+    public ProvisioningServiceDescriptionInner getByResourceGroup(
+        String resourceGroupName, String provisioningServiceName) {
+        return getByResourceGroupWithResponse(resourceGroupName, provisioningServiceName, Context.NONE).getValue();
     }
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -591,9 +603,11 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
     }
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -653,9 +667,11 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
     }
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -684,9 +700,11 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
     }
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -718,9 +736,11 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
     }
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -736,13 +756,17 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
             String resourceGroupName,
             String provisioningServiceName,
             ProvisioningServiceDescriptionInner iotDpsDescription) {
-        return beginCreateOrUpdateAsync(resourceGroupName, provisioningServiceName, iotDpsDescription).getSyncPoller();
+        return this
+            .beginCreateOrUpdateAsync(resourceGroupName, provisioningServiceName, iotDpsDescription)
+            .getSyncPoller();
     }
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -760,14 +784,17 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
             String provisioningServiceName,
             ProvisioningServiceDescriptionInner iotDpsDescription,
             Context context) {
-        return beginCreateOrUpdateAsync(resourceGroupName, provisioningServiceName, iotDpsDescription, context)
+        return this
+            .beginCreateOrUpdateAsync(resourceGroupName, provisioningServiceName, iotDpsDescription, context)
             .getSyncPoller();
     }
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -788,9 +815,11 @@ private Mono<ProvisioningServiceDescriptionInner> createOrUpdateAsync(
     }
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -813,9 +842,11 @@ private Mono<ProvisioningServiceDescriptionInner> createOrUpdateAsync(
     }
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -834,9 +865,11 @@ public ProvisioningServiceDescriptionInner createOrUpdate(
     }
 
     /**
-     * Create or update the metadata of the provisioning service. The usual pattern to modify a property is to retrieve
-     * the provisioning service metadata and security metadata, and then combine them with the modified values in a new
-     * body to update the provisioning service.
+     * Create or update the metadata of the provisioning service.
+     *
+     * <p>Create or update the metadata of the provisioning service. The usual pattern to modify a property is to
+     * retrieve the provisioning service metadata and security metadata, and then combine them with the modified values
+     * in a new body to update the provisioning service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -857,7 +890,9 @@ public ProvisioningServiceDescriptionInner createOrUpdate(
     }
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -917,7 +952,9 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
     }
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -978,7 +1015,9 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
     }
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -1005,7 +1044,9 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
     }
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -1037,7 +1078,9 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
     }
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -1050,11 +1093,15 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ProvisioningServiceDescriptionInner>, ProvisioningServiceDescriptionInner> beginUpdate(
         String resourceGroupName, String provisioningServiceName, TagsResource provisioningServiceTags) {
-        return beginUpdateAsync(resourceGroupName, provisioningServiceName, provisioningServiceTags).getSyncPoller();
+        return this
+            .beginUpdateAsync(resourceGroupName, provisioningServiceName, provisioningServiceTags)
+            .getSyncPoller();
     }
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -1071,12 +1118,15 @@ public SyncPoller<PollResult<ProvisioningServiceDescriptionInner>, ProvisioningS
         String provisioningServiceName,
         TagsResource provisioningServiceTags,
         Context context) {
-        return beginUpdateAsync(resourceGroupName, provisioningServiceName, provisioningServiceTags, context)
+        return this
+            .beginUpdateAsync(resourceGroupName, provisioningServiceName, provisioningServiceTags, context)
             .getSyncPoller();
     }
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -1095,7 +1145,9 @@ private Mono<ProvisioningServiceDescriptionInner> updateAsync(
     }
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -1118,7 +1170,9 @@ private Mono<ProvisioningServiceDescriptionInner> updateAsync(
     }
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -1135,7 +1189,9 @@ public ProvisioningServiceDescriptionInner update(
     }
 
     /**
-     * Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
+     * Update an existing provisioning service's tags.
+     *
+     * <p>Update an existing provisioning service's tags. to update other fields use the CreateOrUpdate method.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to create or update.
@@ -1156,7 +1212,9 @@ public ProvisioningServiceDescriptionInner update(
     }
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -1206,7 +1264,9 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
     }
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -1254,7 +1314,9 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
     }
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -1274,7 +1336,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
     }
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -1296,7 +1360,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
     }
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -1307,11 +1373,13 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String provisioningServiceName) {
-        return beginDeleteAsync(resourceGroupName, provisioningServiceName).getSyncPoller();
+        return this.beginDeleteAsync(resourceGroupName, provisioningServiceName).getSyncPoller();
     }
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -1324,11 +1392,13 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String provisioningServiceName, Context context) {
-        return beginDeleteAsync(resourceGroupName, provisioningServiceName, context).getSyncPoller();
+        return this.beginDeleteAsync(resourceGroupName, provisioningServiceName, context).getSyncPoller();
     }
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -1345,7 +1415,9 @@ private Mono<Void> deleteAsync(String resourceGroupName, String provisioningServ
     }
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -1363,7 +1435,9 @@ private Mono<Void> deleteAsync(String resourceGroupName, String provisioningServ
     }
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -1377,7 +1451,9 @@ public void delete(String resourceGroupName, String provisioningServiceName) {
     }
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -1392,7 +1468,9 @@ public void delete(String resourceGroupName, String provisioningServiceName, Con
     }
 
     /**
-     * List all the provisioning services for a given subscription id.
+     * Get all the provisioning services in a subscription.
+     *
+     * <p>List all the provisioning services for a given subscription id.
      *
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1437,7 +1515,9 @@ private Mono<PagedResponse<ProvisioningServiceDescriptionInner>> listSinglePageA
     }
 
     /**
-     * List all the provisioning services for a given subscription id.
+     * Get all the provisioning services in a subscription.
+     *
+     * <p>List all the provisioning services for a given subscription id.
      *
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
@@ -1481,7 +1561,9 @@ private Mono<PagedResponse<ProvisioningServiceDescriptionInner>> listSinglePageA
     }
 
     /**
-     * List all the provisioning services for a given subscription id.
+     * Get all the provisioning services in a subscription.
+     *
+     * <p>List all the provisioning services for a given subscription id.
      *
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1494,7 +1576,9 @@ private PagedFlux<ProvisioningServiceDescriptionInner> listAsync() {
     }
 
     /**
-     * List all the provisioning services for a given subscription id.
+     * Get all the provisioning services in a subscription.
+     *
+     * <p>List all the provisioning services for a given subscription id.
      *
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
@@ -1509,7 +1593,9 @@ private PagedFlux<ProvisioningServiceDescriptionInner> listAsync(Context context
     }
 
     /**
-     * List all the provisioning services for a given subscription id.
+     * Get all the provisioning services in a subscription.
+     *
+     * <p>List all the provisioning services for a given subscription id.
      *
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1521,7 +1607,9 @@ public PagedIterable<ProvisioningServiceDescriptionInner> list() {
     }
 
     /**
-     * List all the provisioning services for a given subscription id.
+     * Get all the provisioning services in a subscription.
+     *
+     * <p>List all the provisioning services for a given subscription id.
      *
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
@@ -1861,15 +1949,23 @@ private Mono<AsyncOperationResultInner> getOperationResultAsync(
      * @param provisioningServiceName Name of provisioning service that the operation is running on.
      * @param asyncinfo Async header used to poll on the status of the operation, obtained while creating the long
      *     running operation.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a long running operation, such as create, update or delete a provisioning service.
+     * @return the status of a long running operation, such as create, update or delete a provisioning service along
+     *     with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public AsyncOperationResultInner getOperationResult(
-        String operationId, String resourceGroupName, String provisioningServiceName, String asyncinfo) {
-        return getOperationResultAsync(operationId, resourceGroupName, provisioningServiceName, asyncinfo).block();
+    public Response<AsyncOperationResultInner> getOperationResultWithResponse(
+        String operationId,
+        String resourceGroupName,
+        String provisioningServiceName,
+        String asyncinfo,
+        Context context) {
+        return getOperationResultWithResponseAsync(
+                operationId, resourceGroupName, provisioningServiceName, asyncinfo, context)
+            .block();
     }
 
     /**
@@ -1880,27 +1976,23 @@ public AsyncOperationResultInner getOperationResult(
      * @param provisioningServiceName Name of provisioning service that the operation is running on.
      * @param asyncinfo Async header used to poll on the status of the operation, obtained while creating the long
      *     running operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a long running operation, such as create, update or delete a provisioning service along
-     *     with {@link Response}.
+     * @return the status of a long running operation, such as create, update or delete a provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<AsyncOperationResultInner> getOperationResultWithResponse(
-        String operationId,
-        String resourceGroupName,
-        String provisioningServiceName,
-        String asyncinfo,
-        Context context) {
-        return getOperationResultWithResponseAsync(
-                operationId, resourceGroupName, provisioningServiceName, asyncinfo, context)
-            .block();
+    public AsyncOperationResultInner getOperationResult(
+        String operationId, String resourceGroupName, String provisioningServiceName, String asyncinfo) {
+        return getOperationResultWithResponse(
+                operationId, resourceGroupName, provisioningServiceName, asyncinfo, Context.NONE)
+            .getValue();
     }
 
     /**
-     * Gets the list of valid SKUs and tiers for a provisioning service.
+     * Get the list of valid SKUs for a provisioning service.
+     *
+     * <p>Gets the list of valid SKUs and tiers for a provisioning service.
      *
      * @param provisioningServiceName Name of provisioning service.
      * @param resourceGroupName Name of resource group.
@@ -1960,7 +2052,9 @@ private Mono<PagedResponse<IotDpsSkuDefinitionInner>> listValidSkusSinglePageAsy
     }
 
     /**
-     * Gets the list of valid SKUs and tiers for a provisioning service.
+     * Get the list of valid SKUs for a provisioning service.
+     *
+     * <p>Gets the list of valid SKUs and tiers for a provisioning service.
      *
      * @param provisioningServiceName Name of provisioning service.
      * @param resourceGroupName Name of resource group.
@@ -2018,7 +2112,9 @@ private Mono<PagedResponse<IotDpsSkuDefinitionInner>> listValidSkusSinglePageAsy
     }
 
     /**
-     * Gets the list of valid SKUs and tiers for a provisioning service.
+     * Get the list of valid SKUs for a provisioning service.
+     *
+     * <p>Gets the list of valid SKUs and tiers for a provisioning service.
      *
      * @param provisioningServiceName Name of provisioning service.
      * @param resourceGroupName Name of resource group.
@@ -2036,7 +2132,9 @@ private PagedFlux<IotDpsSkuDefinitionInner> listValidSkusAsync(
     }
 
     /**
-     * Gets the list of valid SKUs and tiers for a provisioning service.
+     * Get the list of valid SKUs for a provisioning service.
+     *
+     * <p>Gets the list of valid SKUs and tiers for a provisioning service.
      *
      * @param provisioningServiceName Name of provisioning service.
      * @param resourceGroupName Name of resource group.
@@ -2055,7 +2153,9 @@ private PagedFlux<IotDpsSkuDefinitionInner> listValidSkusAsync(
     }
 
     /**
-     * Gets the list of valid SKUs and tiers for a provisioning service.
+     * Get the list of valid SKUs for a provisioning service.
+     *
+     * <p>Gets the list of valid SKUs and tiers for a provisioning service.
      *
      * @param provisioningServiceName Name of provisioning service.
      * @param resourceGroupName Name of resource group.
@@ -2072,7 +2172,9 @@ public PagedIterable<IotDpsSkuDefinitionInner> listValidSkus(
     }
 
     /**
-     * Gets the list of valid SKUs and tiers for a provisioning service.
+     * Get the list of valid SKUs for a provisioning service.
+     *
+     * <p>Gets the list of valid SKUs and tiers for a provisioning service.
      *
      * @param provisioningServiceName Name of provisioning service.
      * @param resourceGroupName Name of resource group.
@@ -2090,8 +2192,10 @@ public PagedIterable<IotDpsSkuDefinitionInner> listValidSkus(
     }
 
     /**
-     * Check if a provisioning service name is available. This will validate if the name is syntactically valid and if
-     * the name is usable.
+     * Check if a provisioning service name is available.
+     *
+     * <p>Check if a provisioning service name is available. This will validate if the name is syntactically valid and
+     * if the name is usable.
      *
      * @param arguments Set the name parameter in the OperationInputs structure to the name of the provisioning service
      *     to check.
@@ -2136,8 +2240,10 @@ private Mono<Response<NameAvailabilityInfoInner>> checkProvisioningServiceNameAv
     }
 
     /**
-     * Check if a provisioning service name is available. This will validate if the name is syntactically valid and if
-     * the name is usable.
+     * Check if a provisioning service name is available.
+     *
+     * <p>Check if a provisioning service name is available. This will validate if the name is syntactically valid and
+     * if the name is usable.
      *
      * @param arguments Set the name parameter in the OperationInputs structure to the name of the provisioning service
      *     to check.
@@ -2180,8 +2286,10 @@ private Mono<Response<NameAvailabilityInfoInner>> checkProvisioningServiceNameAv
     }
 
     /**
-     * Check if a provisioning service name is available. This will validate if the name is syntactically valid and if
-     * the name is usable.
+     * Check if a provisioning service name is available.
+     *
+     * <p>Check if a provisioning service name is available. This will validate if the name is syntactically valid and
+     * if the name is usable.
      *
      * @param arguments Set the name parameter in the OperationInputs structure to the name of the provisioning service
      *     to check.
@@ -2197,41 +2305,47 @@ private Mono<NameAvailabilityInfoInner> checkProvisioningServiceNameAvailability
     }
 
     /**
-     * Check if a provisioning service name is available. This will validate if the name is syntactically valid and if
-     * the name is usable.
+     * Check if a provisioning service name is available.
+     *
+     * <p>Check if a provisioning service name is available. This will validate if the name is syntactically valid and
+     * if the name is usable.
      *
      * @param arguments Set the name parameter in the OperationInputs structure to the name of the provisioning service
      *     to check.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of name availability.
+     * @return description of name availability along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public NameAvailabilityInfoInner checkProvisioningServiceNameAvailability(OperationInputs arguments) {
-        return checkProvisioningServiceNameAvailabilityAsync(arguments).block();
+    public Response<NameAvailabilityInfoInner> checkProvisioningServiceNameAvailabilityWithResponse(
+        OperationInputs arguments, Context context) {
+        return checkProvisioningServiceNameAvailabilityWithResponseAsync(arguments, context).block();
     }
 
     /**
-     * Check if a provisioning service name is available. This will validate if the name is syntactically valid and if
-     * the name is usable.
+     * Check if a provisioning service name is available.
+     *
+     * <p>Check if a provisioning service name is available. This will validate if the name is syntactically valid and
+     * if the name is usable.
      *
      * @param arguments Set the name parameter in the OperationInputs structure to the name of the provisioning service
      *     to check.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of name availability along with {@link Response}.
+     * @return description of name availability.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<NameAvailabilityInfoInner> checkProvisioningServiceNameAvailabilityWithResponse(
-        OperationInputs arguments, Context context) {
-        return checkProvisioningServiceNameAvailabilityWithResponseAsync(arguments, context).block();
+    public NameAvailabilityInfoInner checkProvisioningServiceNameAvailability(OperationInputs arguments) {
+        return checkProvisioningServiceNameAvailabilityWithResponse(arguments, Context.NONE).getValue();
     }
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @param provisioningServiceName The provisioning service name to get the shared access keys for.
      * @param resourceGroupName resource group name.
@@ -2290,7 +2404,9 @@ private Mono<PagedResponse<SharedAccessSignatureAuthorizationRuleInner>> listKey
     }
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @param provisioningServiceName The provisioning service name to get the shared access keys for.
      * @param resourceGroupName resource group name.
@@ -2347,7 +2463,9 @@ private Mono<PagedResponse<SharedAccessSignatureAuthorizationRuleInner>> listKey
     }
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @param provisioningServiceName The provisioning service name to get the shared access keys for.
      * @param resourceGroupName resource group name.
@@ -2365,7 +2483,9 @@ private PagedFlux<SharedAccessSignatureAuthorizationRuleInner> listKeysAsync(
     }
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @param provisioningServiceName The provisioning service name to get the shared access keys for.
      * @param resourceGroupName resource group name.
@@ -2384,7 +2504,9 @@ private PagedFlux<SharedAccessSignatureAuthorizationRuleInner> listKeysAsync(
     }
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @param provisioningServiceName The provisioning service name to get the shared access keys for.
      * @param resourceGroupName resource group name.
@@ -2400,7 +2522,9 @@ public PagedIterable<SharedAccessSignatureAuthorizationRuleInner> listKeys(
     }
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @param provisioningServiceName The provisioning service name to get the shared access keys for.
      * @param resourceGroupName resource group name.
@@ -2417,7 +2541,9 @@ public PagedIterable<SharedAccessSignatureAuthorizationRuleInner> listKeys(
     }
 
     /**
-     * List primary and secondary keys for a specific key name.
+     * Get a shared access policy by name from a provisioning service.
+     *
+     * <p>List primary and secondary keys for a specific key name.
      *
      * @param provisioningServiceName Name of the provisioning service.
      * @param keyName Logical key name to get key-values for.
@@ -2473,7 +2599,9 @@ private Mono<Response<SharedAccessSignatureAuthorizationRuleInner>> listKeysForK
     }
 
     /**
-     * List primary and secondary keys for a specific key name.
+     * Get a shared access policy by name from a provisioning service.
+     *
+     * <p>List primary and secondary keys for a specific key name.
      *
      * @param provisioningServiceName Name of the provisioning service.
      * @param keyName Logical key name to get key-values for.
@@ -2527,7 +2655,9 @@ private Mono<Response<SharedAccessSignatureAuthorizationRuleInner>> listKeysForK
     }
 
     /**
-     * List primary and secondary keys for a specific key name.
+     * Get a shared access policy by name from a provisioning service.
+     *
+     * <p>List primary and secondary keys for a specific key name.
      *
      * @param provisioningServiceName Name of the provisioning service.
      * @param keyName Logical key name to get key-values for.
@@ -2545,43 +2675,50 @@ private Mono<SharedAccessSignatureAuthorizationRuleInner> listKeysForKeyNameAsyn
     }
 
     /**
-     * List primary and secondary keys for a specific key name.
+     * Get a shared access policy by name from a provisioning service.
+     *
+     * <p>List primary and secondary keys for a specific key name.
      *
      * @param provisioningServiceName Name of the provisioning service.
      * @param keyName Logical key name to get key-values for.
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of the shared access key.
+     * @return description of the shared access key along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public SharedAccessSignatureAuthorizationRuleInner listKeysForKeyName(
-        String provisioningServiceName, String keyName, String resourceGroupName) {
-        return listKeysForKeyNameAsync(provisioningServiceName, keyName, resourceGroupName).block();
+    public Response<SharedAccessSignatureAuthorizationRuleInner> listKeysForKeyNameWithResponse(
+        String provisioningServiceName, String keyName, String resourceGroupName, Context context) {
+        return listKeysForKeyNameWithResponseAsync(provisioningServiceName, keyName, resourceGroupName, context)
+            .block();
     }
 
     /**
-     * List primary and secondary keys for a specific key name.
+     * Get a shared access policy by name from a provisioning service.
+     *
+     * <p>List primary and secondary keys for a specific key name.
      *
      * @param provisioningServiceName Name of the provisioning service.
      * @param keyName Logical key name to get key-values for.
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of the shared access key along with {@link Response}.
+     * @return description of the shared access key.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SharedAccessSignatureAuthorizationRuleInner> listKeysForKeyNameWithResponse(
-        String provisioningServiceName, String keyName, String resourceGroupName, Context context) {
-        return listKeysForKeyNameWithResponseAsync(provisioningServiceName, keyName, resourceGroupName, context)
-            .block();
+    public SharedAccessSignatureAuthorizationRuleInner listKeysForKeyName(
+        String provisioningServiceName, String keyName, String resourceGroupName) {
+        return listKeysForKeyNameWithResponse(provisioningServiceName, keyName, resourceGroupName, Context.NONE)
+            .getValue();
     }
 
     /**
-     * List private link resources for the given provisioning service.
+     * List private link resources
+     *
+     * <p>List private link resources for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -2630,7 +2767,9 @@ private Mono<Response<PrivateLinkResourcesInner>> listPrivateLinkResourcesWithRe
     }
 
     /**
-     * List private link resources for the given provisioning service.
+     * List private link resources
+     *
+     * <p>List private link resources for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -2677,7 +2816,9 @@ private Mono<Response<PrivateLinkResourcesInner>> listPrivateLinkResourcesWithRe
     }
 
     /**
-     * List private link resources for the given provisioning service.
+     * List private link resources
+     *
+     * <p>List private link resources for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -2694,39 +2835,45 @@ private Mono<PrivateLinkResourcesInner> listPrivateLinkResourcesAsync(
     }
 
     /**
-     * List private link resources for the given provisioning service.
+     * List private link resources
+     *
+     * <p>List private link resources for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the available private link resources for a provisioning service.
+     * @return the available private link resources for a provisioning service along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public PrivateLinkResourcesInner listPrivateLinkResources(String resourceGroupName, String resourceName) {
-        return listPrivateLinkResourcesAsync(resourceGroupName, resourceName).block();
+    public Response<PrivateLinkResourcesInner> listPrivateLinkResourcesWithResponse(
+        String resourceGroupName, String resourceName, Context context) {
+        return listPrivateLinkResourcesWithResponseAsync(resourceGroupName, resourceName, context).block();
     }
 
     /**
-     * List private link resources for the given provisioning service.
+     * List private link resources
+     *
+     * <p>List private link resources for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the available private link resources for a provisioning service along with {@link Response}.
+     * @return the available private link resources for a provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<PrivateLinkResourcesInner> listPrivateLinkResourcesWithResponse(
-        String resourceGroupName, String resourceName, Context context) {
-        return listPrivateLinkResourcesWithResponseAsync(resourceGroupName, resourceName, context).block();
+    public PrivateLinkResourcesInner listPrivateLinkResources(String resourceGroupName, String resourceName) {
+        return listPrivateLinkResourcesWithResponse(resourceGroupName, resourceName, Context.NONE).getValue();
     }
 
     /**
-     * Get the specified private link resource for the given provisioning service.
+     * Get the specified private link resource
+     *
+     * <p>Get the specified private link resource for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -2780,7 +2927,9 @@ private Mono<Response<GroupIdInformationInner>> getPrivateLinkResourcesWithRespo
     }
 
     /**
-     * Get the specified private link resource for the given provisioning service.
+     * Get the specified private link resource
+     *
+     * <p>Get the specified private link resource for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -2832,7 +2981,9 @@ private Mono<Response<GroupIdInformationInner>> getPrivateLinkResourcesWithRespo
     }
 
     /**
-     * Get the specified private link resource for the given provisioning service.
+     * Get the specified private link resource
+     *
+     * <p>Get the specified private link resource for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -2851,42 +3002,48 @@ private Mono<GroupIdInformationInner> getPrivateLinkResourcesAsync(
     }
 
     /**
-     * Get the specified private link resource for the given provisioning service.
+     * Get the specified private link resource
+     *
+     * <p>Get the specified private link resource for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
      * @param groupId The name of the private link resource.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException 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 link resource for the given provisioning service.
+     * @return the specified private link resource for the given provisioning service along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public GroupIdInformationInner getPrivateLinkResources(
-        String resourceGroupName, String resourceName, String groupId) {
-        return getPrivateLinkResourcesAsync(resourceGroupName, resourceName, groupId).block();
+    public Response<GroupIdInformationInner> getPrivateLinkResourcesWithResponse(
+        String resourceGroupName, String resourceName, String groupId, Context context) {
+        return getPrivateLinkResourcesWithResponseAsync(resourceGroupName, resourceName, groupId, context).block();
     }
 
     /**
-     * Get the specified private link resource for the given provisioning service.
+     * Get the specified private link resource
+     *
+     * <p>Get the specified private link resource for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
      * @param groupId The name of the private link resource.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException 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 link resource for the given provisioning service along with {@link Response}.
+     * @return the specified private link resource for the given provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<GroupIdInformationInner> getPrivateLinkResourcesWithResponse(
-        String resourceGroupName, String resourceName, String groupId, Context context) {
-        return getPrivateLinkResourcesWithResponseAsync(resourceGroupName, resourceName, groupId, context).block();
+    public GroupIdInformationInner getPrivateLinkResources(
+        String resourceGroupName, String resourceName, String groupId) {
+        return getPrivateLinkResourcesWithResponse(resourceGroupName, resourceName, groupId, Context.NONE).getValue();
     }
 
     /**
-     * List private endpoint connection properties.
+     * List private endpoint connections
+     *
+     * <p>List private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -2935,7 +3092,9 @@ private Mono<Response<List<PrivateEndpointConnectionInner>>> listPrivateEndpoint
     }
 
     /**
-     * List private endpoint connection properties.
+     * List private endpoint connections
+     *
+     * <p>List private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -2982,7 +3141,9 @@ private Mono<Response<List<PrivateEndpointConnectionInner>>> listPrivateEndpoint
     }
 
     /**
-     * List private endpoint connection properties.
+     * List private endpoint connections
+     *
+     * <p>List private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3000,40 +3161,46 @@ private Mono<List<PrivateEndpointConnectionInner>> listPrivateEndpointConnection
     }
 
     /**
-     * List private endpoint connection properties.
+     * List private endpoint connections
+     *
+     * <p>List private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException 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 of private endpoint connections for a provisioning service.
+     * @return the list of private endpoint connections for a provisioning service along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public List<PrivateEndpointConnectionInner> listPrivateEndpointConnections(
-        String resourceGroupName, String resourceName) {
-        return listPrivateEndpointConnectionsAsync(resourceGroupName, resourceName).block();
+    public Response<List<PrivateEndpointConnectionInner>> listPrivateEndpointConnectionsWithResponse(
+        String resourceGroupName, String resourceName, Context context) {
+        return listPrivateEndpointConnectionsWithResponseAsync(resourceGroupName, resourceName, context).block();
     }
 
     /**
-     * List private endpoint connection properties.
+     * List private endpoint connections
+     *
+     * <p>List private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException 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 of private endpoint connections for a provisioning service along with {@link Response}.
+     * @return the list of private endpoint connections for a provisioning service.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<List<PrivateEndpointConnectionInner>> listPrivateEndpointConnectionsWithResponse(
-        String resourceGroupName, String resourceName, Context context) {
-        return listPrivateEndpointConnectionsWithResponseAsync(resourceGroupName, resourceName, context).block();
+    public List<PrivateEndpointConnectionInner> listPrivateEndpointConnections(
+        String resourceGroupName, String resourceName) {
+        return listPrivateEndpointConnectionsWithResponse(resourceGroupName, resourceName, Context.NONE).getValue();
     }
 
     /**
-     * Get private endpoint connection properties.
+     * Get private endpoint connection
+     *
+     * <p>Get private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3090,7 +3257,9 @@ private Mono<Response<PrivateEndpointConnectionInner>> getPrivateEndpointConnect
     }
 
     /**
-     * Get private endpoint connection properties.
+     * Get private endpoint connection
+     *
+     * <p>Get private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3145,7 +3314,9 @@ private Mono<Response<PrivateEndpointConnectionInner>> getPrivateEndpointConnect
     }
 
     /**
-     * Get private endpoint connection properties.
+     * Get private endpoint connection
+     *
+     * <p>Get private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3164,45 +3335,52 @@ private Mono<PrivateEndpointConnectionInner> getPrivateEndpointConnectionAsync(
     }
 
     /**
-     * Get private endpoint connection properties.
+     * Get private endpoint connection
+     *
+     * <p>Get private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
      * @param privateEndpointConnectionName The name of the private endpoint connection.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return private endpoint connection properties.
+     * @return private endpoint connection properties along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public PrivateEndpointConnectionInner getPrivateEndpointConnection(
-        String resourceGroupName, String resourceName, String privateEndpointConnectionName) {
-        return getPrivateEndpointConnectionAsync(resourceGroupName, resourceName, privateEndpointConnectionName)
+    public Response<PrivateEndpointConnectionInner> getPrivateEndpointConnectionWithResponse(
+        String resourceGroupName, String resourceName, String privateEndpointConnectionName, Context context) {
+        return getPrivateEndpointConnectionWithResponseAsync(
+                resourceGroupName, resourceName, privateEndpointConnectionName, context)
             .block();
     }
 
     /**
-     * Get private endpoint connection properties.
+     * Get private endpoint connection
+     *
+     * <p>Get private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
      * @param privateEndpointConnectionName The name of the private endpoint connection.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return private endpoint connection properties along with {@link Response}.
+     * @return private endpoint connection properties.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<PrivateEndpointConnectionInner> getPrivateEndpointConnectionWithResponse(
-        String resourceGroupName, String resourceName, String privateEndpointConnectionName, Context context) {
-        return getPrivateEndpointConnectionWithResponseAsync(
-                resourceGroupName, resourceName, privateEndpointConnectionName, context)
-            .block();
+    public PrivateEndpointConnectionInner getPrivateEndpointConnection(
+        String resourceGroupName, String resourceName, String privateEndpointConnectionName) {
+        return getPrivateEndpointConnectionWithResponse(
+                resourceGroupName, resourceName, privateEndpointConnectionName, Context.NONE)
+            .getValue();
     }
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3272,7 +3450,9 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdatePrivateEndpointConnection
     }
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3341,7 +3521,9 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdatePrivateEndpointConnection
     }
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3373,7 +3555,9 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdatePrivateEndpointConnection
     }
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3408,7 +3592,9 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdatePrivateEndpointConnection
     }
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3426,13 +3612,16 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdatePrivateEndpointConnection
             String resourceName,
             String privateEndpointConnectionName,
             PrivateEndpointConnectionInner privateEndpointConnection) {
-        return beginCreateOrUpdatePrivateEndpointConnectionAsync(
+        return this
+            .beginCreateOrUpdatePrivateEndpointConnectionAsync(
                 resourceGroupName, resourceName, privateEndpointConnectionName, privateEndpointConnection)
             .getSyncPoller();
     }
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3452,13 +3641,16 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdatePrivateEndpointConnection
             String privateEndpointConnectionName,
             PrivateEndpointConnectionInner privateEndpointConnection,
             Context context) {
-        return beginCreateOrUpdatePrivateEndpointConnectionAsync(
+        return this
+            .beginCreateOrUpdatePrivateEndpointConnectionAsync(
                 resourceGroupName, resourceName, privateEndpointConnectionName, privateEndpointConnection, context)
             .getSyncPoller();
     }
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3482,7 +3674,9 @@ private Mono<PrivateEndpointConnectionInner> createOrUpdatePrivateEndpointConnec
     }
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3508,7 +3702,9 @@ private Mono<PrivateEndpointConnectionInner> createOrUpdatePrivateEndpointConnec
     }
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3531,7 +3727,9 @@ public PrivateEndpointConnectionInner createOrUpdatePrivateEndpointConnection(
     }
 
     /**
-     * Create or update the status of a private endpoint connection with the specified name.
+     * Create or update private endpoint connection
+     *
+     * <p>Create or update the status of a private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3556,7 +3754,9 @@ public PrivateEndpointConnectionInner createOrUpdatePrivateEndpointConnection(
     }
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3613,7 +3813,9 @@ private Mono<Response<Flux<ByteBuffer>>> deletePrivateEndpointConnectionWithResp
     }
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3668,7 +3870,9 @@ private Mono<Response<Flux<ByteBuffer>>> deletePrivateEndpointConnectionWithResp
     }
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3696,7 +3900,9 @@ private Mono<Response<Flux<ByteBuffer>>> deletePrivateEndpointConnectionWithResp
     }
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3726,7 +3932,9 @@ private Mono<Response<Flux<ByteBuffer>>> deletePrivateEndpointConnectionWithResp
     }
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3740,12 +3948,15 @@ private Mono<Response<Flux<ByteBuffer>>> deletePrivateEndpointConnectionWithResp
     public SyncPoller<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner>
         beginDeletePrivateEndpointConnection(
             String resourceGroupName, String resourceName, String privateEndpointConnectionName) {
-        return beginDeletePrivateEndpointConnectionAsync(resourceGroupName, resourceName, privateEndpointConnectionName)
+        return this
+            .beginDeletePrivateEndpointConnectionAsync(resourceGroupName, resourceName, privateEndpointConnectionName)
             .getSyncPoller();
     }
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3760,13 +3971,16 @@ private Mono<Response<Flux<ByteBuffer>>> deletePrivateEndpointConnectionWithResp
     public SyncPoller<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner>
         beginDeletePrivateEndpointConnection(
             String resourceGroupName, String resourceName, String privateEndpointConnectionName, Context context) {
-        return beginDeletePrivateEndpointConnectionAsync(
+        return this
+            .beginDeletePrivateEndpointConnectionAsync(
                 resourceGroupName, resourceName, privateEndpointConnectionName, context)
             .getSyncPoller();
     }
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3785,7 +3999,9 @@ private Mono<PrivateEndpointConnectionInner> deletePrivateEndpointConnectionAsyn
     }
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3806,7 +4022,9 @@ private Mono<PrivateEndpointConnectionInner> deletePrivateEndpointConnectionAsyn
     }
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3824,7 +4042,9 @@ public PrivateEndpointConnectionInner deletePrivateEndpointConnection(
     }
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -3846,7 +4066,8 @@ public PrivateEndpointConnectionInner deletePrivateEndpointConnection(
     /**
      * Get the next page of items.
      *
-     * @param nextLink The nextLink parameter.
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -3884,7 +4105,8 @@ private Mono<PagedResponse<ProvisioningServiceDescriptionInner>> listBySubscript
     /**
      * Get the next page of items.
      *
-     * @param nextLink The nextLink parameter.
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
@@ -3922,7 +4144,8 @@ private Mono<PagedResponse<ProvisioningServiceDescriptionInner>> listBySubscript
     /**
      * Get the next page of items.
      *
-     * @param nextLink The nextLink parameter.
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -3960,7 +4183,8 @@ private Mono<PagedResponse<ProvisioningServiceDescriptionInner>> listByResourceG
     /**
      * Get the next page of items.
      *
-     * @param nextLink The nextLink parameter.
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
@@ -3998,7 +4222,8 @@ private Mono<PagedResponse<ProvisioningServiceDescriptionInner>> listByResourceG
     /**
      * Get the next page of items.
      *
-     * @param nextLink The nextLink parameter.
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -4033,7 +4258,8 @@ private Mono<PagedResponse<IotDpsSkuDefinitionInner>> listValidSkusNextSinglePag
     /**
      * Get the next page of items.
      *
-     * @param nextLink The nextLink parameter.
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
@@ -4070,7 +4296,8 @@ private Mono<PagedResponse<IotDpsSkuDefinitionInner>> listValidSkusNextSinglePag
     /**
      * Get the next page of items.
      *
-     * @param nextLink The nextLink parameter.
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -4106,7 +4333,8 @@ private Mono<PagedResponse<SharedAccessSignatureAuthorizationRuleInner>> listKey
     /**
      * Get the next page of items.
      *
-     * @param nextLink The nextLink parameter.
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsResourcesImpl.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsResourcesImpl.java
index 3b534d8a5e993..4b30fd94878ef 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsResourcesImpl.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/IotDpsResourcesImpl.java
@@ -46,16 +46,6 @@ public IotDpsResourcesImpl(
         this.serviceManager = serviceManager;
     }
 
-    public ProvisioningServiceDescription getByResourceGroup(String resourceGroupName, String provisioningServiceName) {
-        ProvisioningServiceDescriptionInner inner =
-            this.serviceClient().getByResourceGroup(resourceGroupName, provisioningServiceName);
-        if (inner != null) {
-            return new ProvisioningServiceDescriptionImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<ProvisioningServiceDescription> getByResourceGroupWithResponse(
         String resourceGroupName, String provisioningServiceName, Context context) {
         Response<ProvisioningServiceDescriptionInner> inner =
@@ -71,6 +61,16 @@ public Response<ProvisioningServiceDescription> getByResourceGroupWithResponse(
         }
     }
 
+    public ProvisioningServiceDescription getByResourceGroup(String resourceGroupName, String provisioningServiceName) {
+        ProvisioningServiceDescriptionInner inner =
+            this.serviceClient().getByResourceGroup(resourceGroupName, provisioningServiceName);
+        if (inner != null) {
+            return new ProvisioningServiceDescriptionImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     public void deleteByResourceGroup(String resourceGroupName, String provisioningServiceName) {
         this.serviceClient().delete(resourceGroupName, provisioningServiceName);
     }
@@ -102,17 +102,6 @@ public PagedIterable<ProvisioningServiceDescription> listByResourceGroup(
         return Utils.mapPage(inner, inner1 -> new ProvisioningServiceDescriptionImpl(inner1, this.manager()));
     }
 
-    public AsyncOperationResult getOperationResult(
-        String operationId, String resourceGroupName, String provisioningServiceName, String asyncinfo) {
-        AsyncOperationResultInner inner =
-            this.serviceClient().getOperationResult(operationId, resourceGroupName, provisioningServiceName, asyncinfo);
-        if (inner != null) {
-            return new AsyncOperationResultImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<AsyncOperationResult> getOperationResultWithResponse(
         String operationId,
         String resourceGroupName,
@@ -135,6 +124,17 @@ public Response<AsyncOperationResult> getOperationResultWithResponse(
         }
     }
 
+    public AsyncOperationResult getOperationResult(
+        String operationId, String resourceGroupName, String provisioningServiceName, String asyncinfo) {
+        AsyncOperationResultInner inner =
+            this.serviceClient().getOperationResult(operationId, resourceGroupName, provisioningServiceName, asyncinfo);
+        if (inner != null) {
+            return new AsyncOperationResultImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     public PagedIterable<IotDpsSkuDefinition> listValidSkus(String provisioningServiceName, String resourceGroupName) {
         PagedIterable<IotDpsSkuDefinitionInner> inner =
             this.serviceClient().listValidSkus(provisioningServiceName, resourceGroupName);
@@ -148,15 +148,6 @@ public PagedIterable<IotDpsSkuDefinition> listValidSkus(
         return Utils.mapPage(inner, inner1 -> new IotDpsSkuDefinitionImpl(inner1, this.manager()));
     }
 
-    public NameAvailabilityInfo checkProvisioningServiceNameAvailability(OperationInputs arguments) {
-        NameAvailabilityInfoInner inner = this.serviceClient().checkProvisioningServiceNameAvailability(arguments);
-        if (inner != null) {
-            return new NameAvailabilityInfoImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<NameAvailabilityInfo> checkProvisioningServiceNameAvailabilityWithResponse(
         OperationInputs arguments, Context context) {
         Response<NameAvailabilityInfoInner> inner =
@@ -172,6 +163,15 @@ public Response<NameAvailabilityInfo> checkProvisioningServiceNameAvailabilityWi
         }
     }
 
+    public NameAvailabilityInfo checkProvisioningServiceNameAvailability(OperationInputs arguments) {
+        NameAvailabilityInfoInner inner = this.serviceClient().checkProvisioningServiceNameAvailability(arguments);
+        if (inner != null) {
+            return new NameAvailabilityInfoImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     public PagedIterable<SharedAccessSignatureAuthorizationRule> listKeys(
         String provisioningServiceName, String resourceGroupName) {
         PagedIterable<SharedAccessSignatureAuthorizationRuleInner> inner =
@@ -186,17 +186,6 @@ public PagedIterable<SharedAccessSignatureAuthorizationRule> listKeys(
         return Utils.mapPage(inner, inner1 -> new SharedAccessSignatureAuthorizationRuleImpl(inner1, this.manager()));
     }
 
-    public SharedAccessSignatureAuthorizationRule listKeysForKeyName(
-        String provisioningServiceName, String keyName, String resourceGroupName) {
-        SharedAccessSignatureAuthorizationRuleInner inner =
-            this.serviceClient().listKeysForKeyName(provisioningServiceName, keyName, resourceGroupName);
-        if (inner != null) {
-            return new SharedAccessSignatureAuthorizationRuleImpl(inner, this.manager());
-        } else {
-            return null;
-        }
-    }
-
     public Response<SharedAccessSignatureAuthorizationRule> listKeysForKeyNameWithResponse(
         String provisioningServiceName, String keyName, String resourceGroupName, Context context) {
         Response<SharedAccessSignatureAuthorizationRuleInner> inner =
@@ -214,11 +203,12 @@ public Response<SharedAccessSignatureAuthorizationRule> listKeysForKeyNameWithRe
         }
     }
 
-    public PrivateLinkResources listPrivateLinkResources(String resourceGroupName, String resourceName) {
-        PrivateLinkResourcesInner inner =
-            this.serviceClient().listPrivateLinkResources(resourceGroupName, resourceName);
+    public SharedAccessSignatureAuthorizationRule listKeysForKeyName(
+        String provisioningServiceName, String keyName, String resourceGroupName) {
+        SharedAccessSignatureAuthorizationRuleInner inner =
+            this.serviceClient().listKeysForKeyName(provisioningServiceName, keyName, resourceGroupName);
         if (inner != null) {
-            return new PrivateLinkResourcesImpl(inner, this.manager());
+            return new SharedAccessSignatureAuthorizationRuleImpl(inner, this.manager());
         } else {
             return null;
         }
@@ -239,11 +229,11 @@ public Response<PrivateLinkResources> listPrivateLinkResourcesWithResponse(
         }
     }
 
-    public GroupIdInformation getPrivateLinkResources(String resourceGroupName, String resourceName, String groupId) {
-        GroupIdInformationInner inner =
-            this.serviceClient().getPrivateLinkResources(resourceGroupName, resourceName, groupId);
+    public PrivateLinkResources listPrivateLinkResources(String resourceGroupName, String resourceName) {
+        PrivateLinkResourcesInner inner =
+            this.serviceClient().listPrivateLinkResources(resourceGroupName, resourceName);
         if (inner != null) {
-            return new GroupIdInformationImpl(inner, this.manager());
+            return new PrivateLinkResourcesImpl(inner, this.manager());
         } else {
             return null;
         }
@@ -264,19 +254,13 @@ public Response<GroupIdInformation> getPrivateLinkResourcesWithResponse(
         }
     }
 
-    public List<PrivateEndpointConnection> listPrivateEndpointConnections(
-        String resourceGroupName, String resourceName) {
-        List<PrivateEndpointConnectionInner> inner =
-            this.serviceClient().listPrivateEndpointConnections(resourceGroupName, resourceName);
+    public GroupIdInformation getPrivateLinkResources(String resourceGroupName, String resourceName, String groupId) {
+        GroupIdInformationInner inner =
+            this.serviceClient().getPrivateLinkResources(resourceGroupName, resourceName, groupId);
         if (inner != null) {
-            return Collections
-                .unmodifiableList(
-                    inner
-                        .stream()
-                        .map(inner1 -> new PrivateEndpointConnectionImpl(inner1, this.manager()))
-                        .collect(Collectors.toList()));
+            return new GroupIdInformationImpl(inner, this.manager());
         } else {
-            return Collections.emptyList();
+            return null;
         }
     }
 
@@ -299,16 +283,19 @@ public Response<List<PrivateEndpointConnection>> listPrivateEndpointConnectionsW
         }
     }
 
-    public PrivateEndpointConnection getPrivateEndpointConnection(
-        String resourceGroupName, String resourceName, String privateEndpointConnectionName) {
-        PrivateEndpointConnectionInner inner =
-            this
-                .serviceClient()
-                .getPrivateEndpointConnection(resourceGroupName, resourceName, privateEndpointConnectionName);
+    public List<PrivateEndpointConnection> listPrivateEndpointConnections(
+        String resourceGroupName, String resourceName) {
+        List<PrivateEndpointConnectionInner> inner =
+            this.serviceClient().listPrivateEndpointConnections(resourceGroupName, resourceName);
         if (inner != null) {
-            return new PrivateEndpointConnectionImpl(inner, this.manager());
+            return Collections
+                .unmodifiableList(
+                    inner
+                        .stream()
+                        .map(inner1 -> new PrivateEndpointConnectionImpl(inner1, this.manager()))
+                        .collect(Collectors.toList()));
         } else {
-            return null;
+            return Collections.emptyList();
         }
     }
 
@@ -330,6 +317,19 @@ public Response<PrivateEndpointConnection> getPrivateEndpointConnectionWithRespo
         }
     }
 
+    public PrivateEndpointConnection getPrivateEndpointConnection(
+        String resourceGroupName, String resourceName, String privateEndpointConnectionName) {
+        PrivateEndpointConnectionInner inner =
+            this
+                .serviceClient()
+                .getPrivateEndpointConnection(resourceGroupName, resourceName, privateEndpointConnectionName);
+        if (inner != null) {
+            return new PrivateEndpointConnectionImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     public PrivateEndpointConnection deletePrivateEndpointConnection(
         String resourceGroupName, String resourceName, String privateEndpointConnectionName) {
         PrivateEndpointConnectionInner inner =
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/OperationsClientImpl.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/OperationsClientImpl.java
index 4897443c0cceb..54aadc08beb2d 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/OperationsClientImpl.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/OperationsClientImpl.java
@@ -55,7 +55,7 @@ public final class OperationsClientImpl implements OperationsClient {
      */
     @Host("{$host}")
     @ServiceInterface(name = "IotDpsClientOperatio")
-    private interface OperationsService {
+    public interface OperationsService {
         @Headers({"Content-Type: application/json"})
         @Get("/providers/Microsoft.Devices/operations")
         @ExpectedResponses({200})
@@ -202,7 +202,8 @@ public PagedIterable<OperationInner> list(Context context) {
     /**
      * Get the next page of items.
      *
-     * @param nextLink The nextLink parameter.
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -238,7 +239,8 @@ private Mono<PagedResponse<OperationInner>> listNextSinglePageAsync(String nextL
     /**
      * Get the next page of items.
      *
-     * @param nextLink The nextLink parameter.
+     * @param nextLink The URL to get the next list of items
+     *     <p>The nextLink parameter.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorDetailsException thrown if the request is rejected by server.
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/ProvisioningServiceDescriptionImpl.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/ProvisioningServiceDescriptionImpl.java
index 2d77d1009e73c..fce529142f9d0 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/ProvisioningServiceDescriptionImpl.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/implementation/ProvisioningServiceDescriptionImpl.java
@@ -66,6 +66,14 @@ public SystemData systemData() {
         return this.innerModel().systemData();
     }
 
+    public String resourcegroup() {
+        return this.innerModel().resourcegroup();
+    }
+
+    public String subscriptionid() {
+        return this.innerModel().subscriptionid();
+    }
+
     public Region region() {
         return Region.fromName(this.regionName());
     }
@@ -217,6 +225,16 @@ public ProvisioningServiceDescriptionImpl withEtag(String etag) {
         return this;
     }
 
+    public ProvisioningServiceDescriptionImpl withResourcegroup(String resourcegroup) {
+        this.innerModel().withResourcegroup(resourcegroup);
+        return this;
+    }
+
+    public ProvisioningServiceDescriptionImpl withSubscriptionid(String subscriptionid) {
+        this.innerModel().withSubscriptionid(subscriptionid);
+        return this;
+    }
+
     private boolean isInCreateMode() {
         return this.innerModel().id() == null;
     }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/AccessRightsDescription.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/AccessRightsDescription.java
index dad5522ac4053..249f901b1bcca 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/AccessRightsDescription.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/AccessRightsDescription.java
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import java.util.Collection;
 
-/** Defines values for AccessRightsDescription. */
+/** Rights that this key has. */
 public final class AccessRightsDescription extends ExpandableStringEnum<AccessRightsDescription> {
     /** Static value ServiceConfig for AccessRightsDescription. */
     public static final AccessRightsDescription SERVICE_CONFIG = fromString("ServiceConfig");
@@ -28,6 +28,15 @@ public final class AccessRightsDescription extends ExpandableStringEnum<AccessRi
     /** Static value RegistrationStatusWrite for AccessRightsDescription. */
     public static final AccessRightsDescription REGISTRATION_STATUS_WRITE = fromString("RegistrationStatusWrite");
 
+    /**
+     * Creates a new instance of AccessRightsDescription value.
+     *
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public AccessRightsDescription() {
+    }
+
     /**
      * Creates or finds a AccessRightsDescription from its string representation.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/AllocationPolicy.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/AllocationPolicy.java
index acb82d8456c9b..b2b153a05db37 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/AllocationPolicy.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/AllocationPolicy.java
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import java.util.Collection;
 
-/** Defines values for AllocationPolicy. */
+/** Allocation policy to be used by this provisioning service. */
 public final class AllocationPolicy extends ExpandableStringEnum<AllocationPolicy> {
     /** Static value Hashed for AllocationPolicy. */
     public static final AllocationPolicy HASHED = fromString("Hashed");
@@ -19,6 +19,15 @@ public final class AllocationPolicy extends ExpandableStringEnum<AllocationPolic
     /** Static value Static for AllocationPolicy. */
     public static final AllocationPolicy STATIC = fromString("Static");
 
+    /**
+     * Creates a new instance of AllocationPolicy value.
+     *
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public AllocationPolicy() {
+    }
+
     /**
      * Creates or finds a AllocationPolicy from its string representation.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/CertificateProperties.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/CertificateProperties.java
index d5719d1a731ab..86e8c021e11b0 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/CertificateProperties.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/CertificateProperties.java
@@ -38,8 +38,7 @@ public final class CertificateProperties {
     private Boolean isVerified;
 
     /*
-     * base-64 representation of X509 certificate .cer file or just .pem file
-     * content.
+     * base-64 representation of X509 certificate .cer file or just .pem file content.
      */
     @JsonProperty(value = "certificate")
     private byte[] certificate;
@@ -56,6 +55,10 @@ public final class CertificateProperties {
     @JsonProperty(value = "updated", access = JsonProperty.Access.WRITE_ONLY)
     private DateTimeRfc1123 updated;
 
+    /** Creates an instance of CertificateProperties class. */
+    public CertificateProperties() {
+    }
+
     /**
      * Get the subject property: The certificate's subject name.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/CertificatePurpose.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/CertificatePurpose.java
index b0c8b5774291b..4566fef863c92 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/CertificatePurpose.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/CertificatePurpose.java
@@ -16,6 +16,15 @@ public final class CertificatePurpose extends ExpandableStringEnum<CertificatePu
     /** Static value serverAuthentication for CertificatePurpose. */
     public static final CertificatePurpose SERVER_AUTHENTICATION = fromString("serverAuthentication");
 
+    /**
+     * Creates a new instance of CertificatePurpose value.
+     *
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public CertificatePurpose() {
+    }
+
     /**
      * Creates or finds a CertificatePurpose from its string representation.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/DpsCertificates.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/DpsCertificates.java
index 1cce7f4ecd06a..df382db159eef 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/DpsCertificates.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/DpsCertificates.java
@@ -10,20 +10,6 @@
 
 /** Resource collection API of DpsCertificates. */
 public interface DpsCertificates {
-    /**
-     * Get the certificate from the provisioning service.
-     *
-     * @param certificateName Name of the certificate to retrieve.
-     * @param resourceGroupName Resource group identifier.
-     * @param provisioningServiceName Name of the provisioning service the certificate is associated with.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
-     *     is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the certificate from the provisioning service.
-     */
-    CertificateResponse get(String certificateName, String resourceGroupName, String provisioningServiceName);
-
     /**
      * Get the certificate from the provisioning service.
      *
@@ -46,22 +32,23 @@ Response<CertificateResponse> getWithResponse(
         Context context);
 
     /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * Get the certificate from the provisioning service.
      *
+     * @param certificateName Name of the certificate to retrieve.
      * @param resourceGroupName Resource group identifier.
-     * @param ifMatch ETag of the certificate.
-     * @param provisioningServiceName The name of the provisioning service.
-     * @param certificateName This is a mandatory field, and is the logical name of the certificate that the
-     *     provisioning service will access by.
+     * @param provisioningServiceName Name of the provisioning service the certificate is associated with.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the certificate from the provisioning service.
      */
-    void delete(String resourceGroupName, String ifMatch, String provisioningServiceName, String certificateName);
+    CertificateResponse get(String certificateName, String resourceGroupName, String provisioningServiceName);
 
     /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * Delete the Provisioning Service Certificate.
+     *
+     * <p>Deletes the specified certificate associated with the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param ifMatch ETag of the certificate.
@@ -99,17 +86,21 @@ Response<Void> deleteWithResponse(
         Context context);
 
     /**
-     * Get all the certificates tied to the provisioning service.
+     * Delete the Provisioning Service Certificate.
      *
-     * @param resourceGroupName Name of resource group.
-     * @param provisioningServiceName Name of provisioning service to retrieve certificates for.
+     * <p>Deletes the specified certificate associated with the Provisioning Service.
+     *
+     * @param resourceGroupName Resource group identifier.
+     * @param ifMatch ETag of the certificate.
+     * @param provisioningServiceName The name of the provisioning service.
+     * @param certificateName This is a mandatory field, and is the logical name of the certificate that the
+     *     provisioning service will access by.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all the certificates tied to the provisioning service.
      */
-    CertificateListDescription list(String resourceGroupName, String provisioningServiceName);
+    void delete(String resourceGroupName, String ifMatch, String provisioningServiceName, String certificateName);
 
     /**
      * Get all the certificates tied to the provisioning service.
@@ -127,22 +118,17 @@ Response<CertificateListDescription> listWithResponse(
         String resourceGroupName, String provisioningServiceName, Context context);
 
     /**
-     * Generate verification code for Proof of Possession.
+     * Get all the certificates tied to the provisioning service.
      *
-     * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
-     *     access.
-     * @param ifMatch ETag of the certificate. This is required to update an existing certificate, and ignored while
-     *     creating a brand new certificate.
-     * @param resourceGroupName name of resource group.
-     * @param provisioningServiceName Name of provisioning service.
+     * @param resourceGroupName Name of resource group.
+     * @param provisioningServiceName Name of provisioning service to retrieve certificates for.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of the response of the verification code.
+     * @return all the certificates tied to the provisioning service.
      */
-    VerificationCodeResponse generateVerificationCode(
-        String certificateName, String ifMatch, String resourceGroupName, String provisioningServiceName);
+    CertificateListDescription list(String resourceGroupName, String provisioningServiceName);
 
     /**
      * Generate verification code for Proof of Possession.
@@ -184,31 +170,28 @@ Response<VerificationCodeResponse> generateVerificationCodeWithResponse(
         Context context);
 
     /**
-     * Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre uploaded
-     * certificate.
+     * Generate verification code for Proof of Possession.
      *
      * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
      *     access.
-     * @param ifMatch ETag of the certificate.
-     * @param resourceGroupName Resource group name.
-     * @param provisioningServiceName Provisioning service name.
-     * @param request The name of the certificate.
+     * @param ifMatch ETag of the certificate. This is required to update an existing certificate, and ignored while
+     *     creating a brand new certificate.
+     * @param resourceGroupName name of resource group.
+     * @param provisioningServiceName Name of provisioning service.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the X509 Certificate.
+     * @return description of the response of the verification code.
      */
-    CertificateResponse verifyCertificate(
-        String certificateName,
-        String ifMatch,
-        String resourceGroupName,
-        String provisioningServiceName,
-        VerificationCodeRequest request);
+    VerificationCodeResponse generateVerificationCode(
+        String certificateName, String ifMatch, String resourceGroupName, String provisioningServiceName);
 
     /**
-     * Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre uploaded
-     * certificate.
+     * Verify certificate's private key possession.
+     *
+     * <p>Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre
+     * uploaded certificate.
      *
      * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
      *     access.
@@ -247,6 +230,31 @@ Response<CertificateResponse> verifyCertificateWithResponse(
         String certificateNonce,
         Context context);
 
+    /**
+     * Verify certificate's private key possession.
+     *
+     * <p>Verifies the certificate's private key possession by providing the leaf cert issued by the verifying pre
+     * uploaded certificate.
+     *
+     * @param certificateName The mandatory logical name of the certificate, that the provisioning service uses to
+     *     access.
+     * @param ifMatch ETag of the certificate.
+     * @param resourceGroupName Resource group name.
+     * @param provisioningServiceName Provisioning service name.
+     * @param request The name of the certificate.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
+     *     is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the X509 Certificate.
+     */
+    CertificateResponse verifyCertificate(
+        String certificateName,
+        String ifMatch,
+        String resourceGroupName,
+        String provisioningServiceName,
+        VerificationCodeRequest request);
+
     /**
      * Get the certificate from the provisioning service.
      *
@@ -274,7 +282,9 @@ Response<CertificateResponse> verifyCertificateWithResponse(
     Response<CertificateResponse> getByIdWithResponse(String id, String ifMatch, Context context);
 
     /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * Delete the Provisioning Service Certificate.
+     *
+     * <p>Deletes the specified certificate associated with the Provisioning Service.
      *
      * @param id the resource ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
@@ -285,7 +295,9 @@ Response<CertificateResponse> verifyCertificateWithResponse(
     void deleteById(String id);
 
     /**
-     * Deletes the specified certificate associated with the Provisioning Service.
+     * Delete the Provisioning Service Certificate.
+     *
+     * <p>Deletes the specified certificate associated with the Provisioning Service.
      *
      * @param id the resource ID.
      * @param ifMatch ETag of the certificate.
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorDetails.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorDetails.java
index 0f4928f5f0688..26c6b0c7d9276 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorDetails.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorDetails.java
@@ -17,6 +17,10 @@ public final class ErrorDetails extends ManagementError {
     @JsonProperty(value = "httpStatusCode", access = JsonProperty.Access.WRITE_ONLY)
     private String httpStatusCode;
 
+    /** Creates an instance of ErrorDetails class. */
+    public ErrorDetails() {
+    }
+
     /**
      * Get the httpStatusCode property: The HTTP status code.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorDetailsException.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorDetailsException.java
index aa035cedaeb55..846a031fa5015 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorDetailsException.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorDetailsException.java
@@ -30,6 +30,7 @@ public ErrorDetailsException(String message, HttpResponse response, ErrorDetails
         super(message, response, value);
     }
 
+    /** {@inheritDoc} */
     @Override
     public ErrorDetails getValue() {
         return (ErrorDetails) super.getValue();
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorMessage.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorMessage.java
index 445879e7faf36..84722dd88f914 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorMessage.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ErrorMessage.java
@@ -28,6 +28,10 @@ public final class ErrorMessage {
     @JsonProperty(value = "details")
     private String details;
 
+    /** Creates an instance of ErrorMessage class. */
+    public ErrorMessage() {
+    }
+
     /**
      * Get the code property: standard error code.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/GroupIdInformationProperties.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/GroupIdInformationProperties.java
index 477d0b1d6e88f..7d1c073fe8d8e 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/GroupIdInformationProperties.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/GroupIdInformationProperties.java
@@ -29,6 +29,10 @@ public final class GroupIdInformationProperties {
     @JsonProperty(value = "requiredZoneNames")
     private List<String> requiredZoneNames;
 
+    /** Creates an instance of GroupIdInformationProperties class. */
+    public GroupIdInformationProperties() {
+    }
+
     /**
      * Get the groupId property: The group id.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsPropertiesDescription.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsPropertiesDescription.java
index 5b5a1b03de6db..9839280dae555 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsPropertiesDescription.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsPropertiesDescription.java
@@ -84,12 +84,21 @@ public final class IotDpsPropertiesDescription {
 
     /*
      * Optional.
-     * Indicates if the DPS instance has Data Residency enabled, removing the
-     * cross geo-pair disaster recovery.
+     * Indicates if the DPS instance has Data Residency enabled, removing the cross geo-pair disaster recovery.
      */
     @JsonProperty(value = "enableDataResidency")
     private Boolean enableDataResidency;
 
+    /*
+     * Portal endpoint to enable CORS for this provisioning service.
+     */
+    @JsonProperty(value = "portalOperationsHostName")
+    private String portalOperationsHostname;
+
+    /** Creates an instance of IotDpsPropertiesDescription class. */
+    public IotDpsPropertiesDescription() {
+    }
+
     /**
      * Get the state property: Current state of the provisioning service.
      *
@@ -301,6 +310,26 @@ public IotDpsPropertiesDescription withEnableDataResidency(Boolean enableDataRes
         return this;
     }
 
+    /**
+     * Get the portalOperationsHostname property: Portal endpoint to enable CORS for this provisioning service.
+     *
+     * @return the portalOperationsHostname value.
+     */
+    public String portalOperationsHostname() {
+        return this.portalOperationsHostname;
+    }
+
+    /**
+     * Set the portalOperationsHostname property: Portal endpoint to enable CORS for this provisioning service.
+     *
+     * @param portalOperationsHostname the portalOperationsHostname value to set.
+     * @return the IotDpsPropertiesDescription object itself.
+     */
+    public IotDpsPropertiesDescription withPortalOperationsHostname(String portalOperationsHostname) {
+        this.portalOperationsHostname = portalOperationsHostname;
+        return this;
+    }
+
     /**
      * Validates the instance.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsResources.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsResources.java
index 29a19e399a320..aede9ee8efe0d 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsResources.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsResources.java
@@ -12,35 +12,41 @@
 /** Resource collection API of IotDpsResources. */
 public interface IotDpsResources {
     /**
-     * Get the metadata of the provisioning service without SAS keys.
+     * Get the non-security related metadata of the provisioning service.
+     *
+     * <p>Get the metadata of the provisioning service without SAS keys.
      *
      * @param resourceGroupName Resource group name.
      * @param provisioningServiceName Name of the provisioning service to retrieve.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the metadata of the provisioning service without SAS keys.
+     * @return the metadata of the provisioning service without SAS keys along with {@link Response}.
      */
-    ProvisioningServiceDescription getByResourceGroup(String resourceGroupName, String provisioningServiceName);
+    Response<ProvisioningServiceDescription> getByResourceGroupWithResponse(
+        String resourceGroupName, String provisioningServiceName, Context context);
 
     /**
-     * Get the metadata of the provisioning service without SAS keys.
+     * Get the non-security related metadata of the provisioning service.
+     *
+     * <p>Get the metadata of the provisioning service without SAS keys.
      *
      * @param resourceGroupName Resource group name.
      * @param provisioningServiceName Name of the provisioning service to retrieve.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the metadata of the provisioning service without SAS keys along with {@link Response}.
+     * @return the metadata of the provisioning service without SAS keys.
      */
-    Response<ProvisioningServiceDescription> getByResourceGroupWithResponse(
-        String resourceGroupName, String provisioningServiceName, Context context);
+    ProvisioningServiceDescription getByResourceGroup(String resourceGroupName, String provisioningServiceName);
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -52,7 +58,9 @@ Response<ProvisioningServiceDescription> getByResourceGroupWithResponse(
     void deleteByResourceGroup(String resourceGroupName, String provisioningServiceName);
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param resourceGroupName Resource group identifier.
      * @param provisioningServiceName Name of provisioning service to delete.
@@ -65,7 +73,9 @@ Response<ProvisioningServiceDescription> getByResourceGroupWithResponse(
     void delete(String resourceGroupName, String provisioningServiceName, Context context);
 
     /**
-     * List all the provisioning services for a given subscription id.
+     * Get all the provisioning services in a subscription.
+     *
+     * <p>List all the provisioning services for a given subscription id.
      *
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
@@ -75,7 +85,9 @@ Response<ProvisioningServiceDescription> getByResourceGroupWithResponse(
     PagedIterable<ProvisioningServiceDescription> list();
 
     /**
-     * List all the provisioning services for a given subscription id.
+     * Get all the provisioning services in a subscription.
+     *
+     * <p>List all the provisioning services for a given subscription id.
      *
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
@@ -121,14 +133,20 @@ Response<ProvisioningServiceDescription> getByResourceGroupWithResponse(
      * @param provisioningServiceName Name of provisioning service that the operation is running on.
      * @param asyncinfo Async header used to poll on the status of the operation, obtained while creating the long
      *     running operation.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a long running operation, such as create, update or delete a provisioning service.
+     * @return the status of a long running operation, such as create, update or delete a provisioning service along
+     *     with {@link Response}.
      */
-    AsyncOperationResult getOperationResult(
-        String operationId, String resourceGroupName, String provisioningServiceName, String asyncinfo);
+    Response<AsyncOperationResult> getOperationResultWithResponse(
+        String operationId,
+        String resourceGroupName,
+        String provisioningServiceName,
+        String asyncinfo,
+        Context context);
 
     /**
      * Gets the status of a long running operation, such as create, update or delete a provisioning service.
@@ -138,23 +156,19 @@ AsyncOperationResult getOperationResult(
      * @param provisioningServiceName Name of provisioning service that the operation is running on.
      * @param asyncinfo Async header used to poll on the status of the operation, obtained while creating the long
      *     running operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a long running operation, such as create, update or delete a provisioning service along
-     *     with {@link Response}.
+     * @return the status of a long running operation, such as create, update or delete a provisioning service.
      */
-    Response<AsyncOperationResult> getOperationResultWithResponse(
-        String operationId,
-        String resourceGroupName,
-        String provisioningServiceName,
-        String asyncinfo,
-        Context context);
+    AsyncOperationResult getOperationResult(
+        String operationId, String resourceGroupName, String provisioningServiceName, String asyncinfo);
 
     /**
-     * Gets the list of valid SKUs and tiers for a provisioning service.
+     * Get the list of valid SKUs for a provisioning service.
+     *
+     * <p>Gets the list of valid SKUs and tiers for a provisioning service.
      *
      * @param provisioningServiceName Name of provisioning service.
      * @param resourceGroupName Name of resource group.
@@ -168,7 +182,9 @@ Response<AsyncOperationResult> getOperationResultWithResponse(
     PagedIterable<IotDpsSkuDefinition> listValidSkus(String provisioningServiceName, String resourceGroupName);
 
     /**
-     * Gets the list of valid SKUs and tiers for a provisioning service.
+     * Get the list of valid SKUs for a provisioning service.
+     *
+     * <p>Gets the list of valid SKUs and tiers for a provisioning service.
      *
      * @param provisioningServiceName Name of provisioning service.
      * @param resourceGroupName Name of resource group.
@@ -184,37 +200,43 @@ PagedIterable<IotDpsSkuDefinition> listValidSkus(
         String provisioningServiceName, String resourceGroupName, Context context);
 
     /**
-     * Check if a provisioning service name is available. This will validate if the name is syntactically valid and if
-     * the name is usable.
+     * Check if a provisioning service name is available.
+     *
+     * <p>Check if a provisioning service name is available. This will validate if the name is syntactically valid and
+     * if the name is usable.
      *
      * @param arguments Set the name parameter in the OperationInputs structure to the name of the provisioning service
      *     to check.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of name availability.
+     * @return description of name availability along with {@link Response}.
      */
-    NameAvailabilityInfo checkProvisioningServiceNameAvailability(OperationInputs arguments);
+    Response<NameAvailabilityInfo> checkProvisioningServiceNameAvailabilityWithResponse(
+        OperationInputs arguments, Context context);
 
     /**
-     * Check if a provisioning service name is available. This will validate if the name is syntactically valid and if
-     * the name is usable.
+     * Check if a provisioning service name is available.
+     *
+     * <p>Check if a provisioning service name is available. This will validate if the name is syntactically valid and
+     * if the name is usable.
      *
      * @param arguments Set the name parameter in the OperationInputs structure to the name of the provisioning service
      *     to check.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of name availability along with {@link Response}.
+     * @return description of name availability.
      */
-    Response<NameAvailabilityInfo> checkProvisioningServiceNameAvailabilityWithResponse(
-        OperationInputs arguments, Context context);
+    NameAvailabilityInfo checkProvisioningServiceNameAvailability(OperationInputs arguments);
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @param provisioningServiceName The provisioning service name to get the shared access keys for.
      * @param resourceGroupName resource group name.
@@ -228,7 +250,9 @@ PagedIterable<SharedAccessSignatureAuthorizationRule> listKeys(
         String provisioningServiceName, String resourceGroupName);
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @param provisioningServiceName The provisioning service name to get the shared access keys for.
      * @param resourceGroupName resource group name.
@@ -243,22 +267,9 @@ PagedIterable<SharedAccessSignatureAuthorizationRule> listKeys(
         String provisioningServiceName, String resourceGroupName, Context context);
 
     /**
-     * List primary and secondary keys for a specific key name.
+     * Get a shared access policy by name from a provisioning service.
      *
-     * @param provisioningServiceName Name of the provisioning service.
-     * @param keyName Logical key name to get key-values for.
-     * @param resourceGroupName The name of the resource group that contains the provisioning service.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
-     *     is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return description of the shared access key.
-     */
-    SharedAccessSignatureAuthorizationRule listKeysForKeyName(
-        String provisioningServiceName, String keyName, String resourceGroupName);
-
-    /**
-     * List primary and secondary keys for a specific key name.
+     * <p>List primary and secondary keys for a specific key name.
      *
      * @param provisioningServiceName Name of the provisioning service.
      * @param keyName Logical key name to get key-values for.
@@ -274,20 +285,26 @@ Response<SharedAccessSignatureAuthorizationRule> listKeysForKeyNameWithResponse(
         String provisioningServiceName, String keyName, String resourceGroupName, Context context);
 
     /**
-     * List private link resources for the given provisioning service.
+     * Get a shared access policy by name from a provisioning service.
+     *
+     * <p>List primary and secondary keys for a specific key name.
      *
+     * @param provisioningServiceName Name of the provisioning service.
+     * @param keyName Logical key name to get key-values for.
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
-     * @param resourceName The name of the provisioning service.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the available private link resources for a provisioning service.
+     * @return description of the shared access key.
      */
-    PrivateLinkResources listPrivateLinkResources(String resourceGroupName, String resourceName);
+    SharedAccessSignatureAuthorizationRule listKeysForKeyName(
+        String provisioningServiceName, String keyName, String resourceGroupName);
 
     /**
-     * List private link resources for the given provisioning service.
+     * List private link resources
+     *
+     * <p>List private link resources for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -302,21 +319,24 @@ Response<PrivateLinkResources> listPrivateLinkResourcesWithResponse(
         String resourceGroupName, String resourceName, Context context);
 
     /**
-     * Get the specified private link resource for the given provisioning service.
+     * List private link resources
+     *
+     * <p>List private link resources for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
-     * @param groupId The name of the private link resource.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException 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 link resource for the given provisioning service.
+     * @return the available private link resources for a provisioning service.
      */
-    GroupIdInformation getPrivateLinkResources(String resourceGroupName, String resourceName, String groupId);
+    PrivateLinkResources listPrivateLinkResources(String resourceGroupName, String resourceName);
 
     /**
-     * Get the specified private link resource for the given provisioning service.
+     * Get the specified private link resource
+     *
+     * <p>Get the specified private link resource for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -332,20 +352,25 @@ Response<GroupIdInformation> getPrivateLinkResourcesWithResponse(
         String resourceGroupName, String resourceName, String groupId, Context context);
 
     /**
-     * List private endpoint connection properties.
+     * Get the specified private link resource
+     *
+     * <p>Get the specified private link resource for the given provisioning service.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
+     * @param groupId The name of the private link resource.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException 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 of private endpoint connections for a provisioning service.
+     * @return the specified private link resource for the given provisioning service.
      */
-    List<PrivateEndpointConnection> listPrivateEndpointConnections(String resourceGroupName, String resourceName);
+    GroupIdInformation getPrivateLinkResources(String resourceGroupName, String resourceName, String groupId);
 
     /**
-     * List private endpoint connection properties.
+     * List private endpoint connections
+     *
+     * <p>List private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -360,22 +385,24 @@ Response<List<PrivateEndpointConnection>> listPrivateEndpointConnectionsWithResp
         String resourceGroupName, String resourceName, Context context);
 
     /**
-     * Get private endpoint connection properties.
+     * List private endpoint connections
+     *
+     * <p>List private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
-     * @param privateEndpointConnectionName The name of the private endpoint connection.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return private endpoint connection properties.
+     * @return the list of private endpoint connections for a provisioning service.
      */
-    PrivateEndpointConnection getPrivateEndpointConnection(
-        String resourceGroupName, String resourceName, String privateEndpointConnectionName);
+    List<PrivateEndpointConnection> listPrivateEndpointConnections(String resourceGroupName, String resourceName);
 
     /**
-     * Get private endpoint connection properties.
+     * Get private endpoint connection
+     *
+     * <p>Get private endpoint connection properties.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -391,7 +418,26 @@ Response<PrivateEndpointConnection> getPrivateEndpointConnectionWithResponse(
         String resourceGroupName, String resourceName, String privateEndpointConnectionName, Context context);
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Get private endpoint connection
+     *
+     * <p>Get private endpoint connection properties.
+     *
+     * @param resourceGroupName The name of the resource group that contains the provisioning service.
+     * @param resourceName The name of the provisioning service.
+     * @param privateEndpointConnectionName The name of the private endpoint connection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
+     *     is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return private endpoint connection properties.
+     */
+    PrivateEndpointConnection getPrivateEndpointConnection(
+        String resourceGroupName, String resourceName, String privateEndpointConnectionName);
+
+    /**
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -406,7 +452,9 @@ PrivateEndpointConnection deletePrivateEndpointConnection(
         String resourceGroupName, String resourceName, String privateEndpointConnectionName);
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param resourceGroupName The name of the resource group that contains the provisioning service.
      * @param resourceName The name of the provisioning service.
@@ -422,7 +470,9 @@ PrivateEndpointConnection deletePrivateEndpointConnection(
         String resourceGroupName, String resourceName, String privateEndpointConnectionName, Context context);
 
     /**
-     * Get the metadata of the provisioning service without SAS keys.
+     * Get the non-security related metadata of the provisioning service.
+     *
+     * <p>Get the metadata of the provisioning service without SAS keys.
      *
      * @param id the resource ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
@@ -434,7 +484,9 @@ PrivateEndpointConnection deletePrivateEndpointConnection(
     ProvisioningServiceDescription getById(String id);
 
     /**
-     * Get the metadata of the provisioning service without SAS keys.
+     * Get the non-security related metadata of the provisioning service.
+     *
+     * <p>Get the metadata of the provisioning service without SAS keys.
      *
      * @param id the resource ID.
      * @param context The context to associate with this operation.
@@ -447,7 +499,9 @@ PrivateEndpointConnection deletePrivateEndpointConnection(
     Response<ProvisioningServiceDescription> getByIdWithResponse(String id, Context context);
 
     /**
-     * Get private endpoint connection properties.
+     * Get private endpoint connection
+     *
+     * <p>Get private endpoint connection properties.
      *
      * @param id the resource ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
@@ -459,7 +513,9 @@ PrivateEndpointConnection deletePrivateEndpointConnection(
     PrivateEndpointConnection getPrivateEndpointConnectionById(String id);
 
     /**
-     * Get private endpoint connection properties.
+     * Get private endpoint connection
+     *
+     * <p>Get private endpoint connection properties.
      *
      * @param id the resource ID.
      * @param context The context to associate with this operation.
@@ -472,7 +528,9 @@ PrivateEndpointConnection deletePrivateEndpointConnection(
     Response<PrivateEndpointConnection> getPrivateEndpointConnectionByIdWithResponse(String id, Context context);
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param id the resource ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
@@ -483,7 +541,9 @@ PrivateEndpointConnection deletePrivateEndpointConnection(
     void deleteById(String id);
 
     /**
-     * Deletes the Provisioning Service.
+     * Delete the Provisioning Service
+     *
+     * <p>Deletes the Provisioning Service.
      *
      * @param id the resource ID.
      * @param context The context to associate with this operation.
@@ -495,7 +555,9 @@ PrivateEndpointConnection deletePrivateEndpointConnection(
     void deleteByIdWithResponse(String id, Context context);
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param id the resource ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
@@ -507,7 +569,9 @@ PrivateEndpointConnection deletePrivateEndpointConnection(
     PrivateEndpointConnection deletePrivateEndpointConnectionById(String id);
 
     /**
-     * Delete private endpoint connection with the specified name.
+     * Delete private endpoint connection
+     *
+     * <p>Delete private endpoint connection with the specified name.
      *
      * @param id the resource ID.
      * @param context The context to associate with this operation.
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSku.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSku.java
index ae5b6674b50d9..2c6b14f255b31 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSku.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSku.java
@@ -8,11 +8,20 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import java.util.Collection;
 
-/** Defines values for IotDpsSku. */
+/** Sku name. */
 public final class IotDpsSku extends ExpandableStringEnum<IotDpsSku> {
     /** Static value S1 for IotDpsSku. */
     public static final IotDpsSku S1 = fromString("S1");
 
+    /**
+     * Creates a new instance of IotDpsSku value.
+     *
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public IotDpsSku() {
+    }
+
     /**
      * Creates or finds a IotDpsSku from its string representation.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSkuDefinitionListResult.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSkuDefinitionListResult.java
index c40374b340856..4488cd2c84e6c 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSkuDefinitionListResult.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSkuDefinitionListResult.java
@@ -24,6 +24,10 @@ public final class IotDpsSkuDefinitionListResult {
     @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY)
     private String nextLink;
 
+    /** Creates an instance of IotDpsSkuDefinitionListResult class. */
+    public IotDpsSkuDefinitionListResult() {
+    }
+
     /**
      * Get the value property: The list of SKUs.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSkuInfo.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSkuInfo.java
index e3ee97107daf9..61bd73feb4930 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSkuInfo.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotDpsSkuInfo.java
@@ -28,6 +28,10 @@ public final class IotDpsSkuInfo {
     @JsonProperty(value = "capacity")
     private Long capacity;
 
+    /** Creates an instance of IotDpsSkuInfo class. */
+    public IotDpsSkuInfo() {
+    }
+
     /**
      * Get the name property: Sku name.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotHubDefinitionDescription.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotHubDefinitionDescription.java
index 44c8a4a51be6d..6449e0a629d1f 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotHubDefinitionDescription.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IotHubDefinitionDescription.java
@@ -41,6 +41,10 @@ public final class IotHubDefinitionDescription {
     @JsonProperty(value = "location", required = true)
     private String location;
 
+    /** Creates an instance of IotHubDefinitionDescription class. */
+    public IotHubDefinitionDescription() {
+    }
+
     /**
      * Get the applyAllocationPolicy property: flag for applying allocationPolicy or not for a given iot hub.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterActionType.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterActionType.java
index 35885518f9492..de77ac0f09099 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterActionType.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterActionType.java
@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-/** Defines values for IpFilterActionType. */
+/** The desired action for requests captured by this rule. */
 public enum IpFilterActionType {
     /** Enum value Accept. */
     ACCEPT("Accept"),
@@ -30,6 +30,9 @@ public enum IpFilterActionType {
      */
     @JsonCreator
     public static IpFilterActionType fromString(String value) {
+        if (value == null) {
+            return null;
+        }
         IpFilterActionType[] items = IpFilterActionType.values();
         for (IpFilterActionType item : items) {
             if (item.toString().equalsIgnoreCase(value)) {
@@ -39,6 +42,7 @@ public static IpFilterActionType fromString(String value) {
         return null;
     }
 
+    /** {@inheritDoc} */
     @JsonValue
     @Override
     public String toString() {
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterRule.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterRule.java
index cc2b3eee9d3b6..118d5f95f75e5 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterRule.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterRule.java
@@ -24,8 +24,7 @@ public final class IpFilterRule {
     private IpFilterActionType action;
 
     /*
-     * A string that contains the IP address range in CIDR notation for the
-     * rule.
+     * A string that contains the IP address range in CIDR notation for the rule.
      */
     @JsonProperty(value = "ipMask", required = true)
     private String ipMask;
@@ -36,6 +35,10 @@ public final class IpFilterRule {
     @JsonProperty(value = "target")
     private IpFilterTargetType target;
 
+    /** Creates an instance of IpFilterRule class. */
+    public IpFilterRule() {
+    }
+
     /**
      * Get the filterName property: The name of the IP filter rule.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterTargetType.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterTargetType.java
index f0eac5bd167fe..b39a3f7547f59 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterTargetType.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/IpFilterTargetType.java
@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-/** Defines values for IpFilterTargetType. */
+/** Target for requests captured by this rule. */
 public enum IpFilterTargetType {
     /** Enum value all. */
     ALL("all"),
@@ -33,6 +33,9 @@ public enum IpFilterTargetType {
      */
     @JsonCreator
     public static IpFilterTargetType fromString(String value) {
+        if (value == null) {
+            return null;
+        }
         IpFilterTargetType[] items = IpFilterTargetType.values();
         for (IpFilterTargetType item : items) {
             if (item.toString().equalsIgnoreCase(value)) {
@@ -42,6 +45,7 @@ public static IpFilterTargetType fromString(String value) {
         return null;
     }
 
+    /** {@inheritDoc} */
     @JsonValue
     @Override
     public String toString() {
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/NameUnavailabilityReason.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/NameUnavailabilityReason.java
index 0efb7656ef2cd..97d6b9b03d79a 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/NameUnavailabilityReason.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/NameUnavailabilityReason.java
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import java.util.Collection;
 
-/** Defines values for NameUnavailabilityReason. */
+/** specifies the reason a name is unavailable. */
 public final class NameUnavailabilityReason extends ExpandableStringEnum<NameUnavailabilityReason> {
     /** Static value Invalid for NameUnavailabilityReason. */
     public static final NameUnavailabilityReason INVALID = fromString("Invalid");
@@ -16,6 +16,15 @@ public final class NameUnavailabilityReason extends ExpandableStringEnum<NameUna
     /** Static value AlreadyExists for NameUnavailabilityReason. */
     public static final NameUnavailabilityReason ALREADY_EXISTS = fromString("AlreadyExists");
 
+    /**
+     * Creates a new instance of NameUnavailabilityReason value.
+     *
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public NameUnavailabilityReason() {
+    }
+
     /**
      * Creates or finds a NameUnavailabilityReason from its string representation.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationDisplay.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationDisplay.java
index 9001b06b1c7f3..f68fb6acbae02 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationDisplay.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationDisplay.java
@@ -28,6 +28,10 @@ public final class OperationDisplay {
     @JsonProperty(value = "operation", access = JsonProperty.Access.WRITE_ONLY)
     private String operation;
 
+    /** Creates an instance of OperationDisplay class. */
+    public OperationDisplay() {
+    }
+
     /**
      * Get the provider property: Service provider: Microsoft Devices.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationInputs.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationInputs.java
index 0a6480dec4c9d..96522beee1d2e 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationInputs.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationInputs.java
@@ -17,6 +17,10 @@ public final class OperationInputs {
     @JsonProperty(value = "name", required = true)
     private String name;
 
+    /** Creates an instance of OperationInputs class. */
+    public OperationInputs() {
+    }
+
     /**
      * Get the name property: The name of the Provisioning Service to check.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationListResult.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationListResult.java
index 5bec755cd362b..ae572d0e9440d 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationListResult.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/OperationListResult.java
@@ -16,8 +16,7 @@
 @Immutable
 public final class OperationListResult {
     /*
-     * Provisioning service operations supported by the Microsoft.Devices
-     * resource provider.
+     * Provisioning service operations supported by the Microsoft.Devices resource provider.
      */
     @JsonProperty(value = "value", access = JsonProperty.Access.WRITE_ONLY)
     private List<OperationInner> value;
@@ -28,6 +27,10 @@ public final class OperationListResult {
     @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY)
     private String nextLink;
 
+    /** Creates an instance of OperationListResult class. */
+    public OperationListResult() {
+    }
+
     /**
      * Get the value property: Provisioning service operations supported by the Microsoft.Devices resource provider.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateEndpoint.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateEndpoint.java
index 938847324af2f..c7cebffb5bb2f 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateEndpoint.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateEndpoint.java
@@ -16,6 +16,10 @@ public final class PrivateEndpoint {
     @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
     private String id;
 
+    /** Creates an instance of PrivateEndpoint class. */
+    public PrivateEndpoint() {
+    }
+
     /**
      * Get the id property: The resource identifier.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateEndpointConnectionProperties.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateEndpointConnectionProperties.java
index e115ec13f5478..5229e740f16ec 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateEndpointConnectionProperties.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateEndpointConnectionProperties.java
@@ -23,6 +23,10 @@ public final class PrivateEndpointConnectionProperties {
     @JsonProperty(value = "privateLinkServiceConnectionState", required = true)
     private PrivateLinkServiceConnectionState privateLinkServiceConnectionState;
 
+    /** Creates an instance of PrivateEndpointConnectionProperties class. */
+    public PrivateEndpointConnectionProperties() {
+    }
+
     /**
      * Get the privateEndpoint property: The private endpoint property of a private endpoint connection.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateLinkServiceConnectionState.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateLinkServiceConnectionState.java
index 20dd311462880..ab7d7eff58421 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateLinkServiceConnectionState.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateLinkServiceConnectionState.java
@@ -29,6 +29,10 @@ public final class PrivateLinkServiceConnectionState {
     @JsonProperty(value = "actionsRequired")
     private String actionsRequired;
 
+    /** Creates an instance of PrivateLinkServiceConnectionState class. */
+    public PrivateLinkServiceConnectionState() {
+    }
+
     /**
      * Get the status property: The status of a private endpoint connection.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateLinkServiceConnectionStatus.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateLinkServiceConnectionStatus.java
index cf689f55a9560..c0141e84b9095 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateLinkServiceConnectionStatus.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PrivateLinkServiceConnectionStatus.java
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import java.util.Collection;
 
-/** Defines values for PrivateLinkServiceConnectionStatus. */
+/** The status of a private endpoint connection. */
 public final class PrivateLinkServiceConnectionStatus extends ExpandableStringEnum<PrivateLinkServiceConnectionStatus> {
     /** Static value Pending for PrivateLinkServiceConnectionStatus. */
     public static final PrivateLinkServiceConnectionStatus PENDING = fromString("Pending");
@@ -22,6 +22,15 @@ public final class PrivateLinkServiceConnectionStatus extends ExpandableStringEn
     /** Static value Disconnected for PrivateLinkServiceConnectionStatus. */
     public static final PrivateLinkServiceConnectionStatus DISCONNECTED = fromString("Disconnected");
 
+    /**
+     * Creates a new instance of PrivateLinkServiceConnectionStatus value.
+     *
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public PrivateLinkServiceConnectionStatus() {
+    }
+
     /**
      * Creates or finds a PrivateLinkServiceConnectionStatus from its string representation.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ProvisioningServiceDescription.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ProvisioningServiceDescription.java
index 30f8c70f47019..d1cfa93f57221 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ProvisioningServiceDescription.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ProvisioningServiceDescription.java
@@ -77,6 +77,20 @@ public interface ProvisioningServiceDescription {
      */
     SystemData systemData();
 
+    /**
+     * Gets the resourcegroup property: The resource group of the resource.
+     *
+     * @return the resourcegroup value.
+     */
+    String resourcegroup();
+
+    /**
+     * Gets the subscriptionid property: The subscription id of the resource.
+     *
+     * @return the subscriptionid value.
+     */
+    String subscriptionid();
+
     /**
      * Gets the region of the resource.
      *
@@ -172,7 +186,11 @@ interface WithSku {
          * The stage of the ProvisioningServiceDescription definition which contains all the minimum required properties
          * for the resource to be created, but also allows for any other optional properties to be specified.
          */
-        interface WithCreate extends DefinitionStages.WithTags, DefinitionStages.WithEtag {
+        interface WithCreate
+            extends DefinitionStages.WithTags,
+                DefinitionStages.WithEtag,
+                DefinitionStages.WithResourcegroup,
+                DefinitionStages.WithSubscriptionid {
             /**
              * Executes the create request.
              *
@@ -210,6 +228,26 @@ interface WithEtag {
              */
             WithCreate withEtag(String etag);
         }
+        /** The stage of the ProvisioningServiceDescription definition allowing to specify resourcegroup. */
+        interface WithResourcegroup {
+            /**
+             * Specifies the resourcegroup property: The resource group of the resource..
+             *
+             * @param resourcegroup The resource group of the resource.
+             * @return the next definition stage.
+             */
+            WithCreate withResourcegroup(String resourcegroup);
+        }
+        /** The stage of the ProvisioningServiceDescription definition allowing to specify subscriptionid. */
+        interface WithSubscriptionid {
+            /**
+             * Specifies the subscriptionid property: The subscription id of the resource..
+             *
+             * @param subscriptionid The subscription id of the resource.
+             * @return the next definition stage.
+             */
+            WithCreate withSubscriptionid(String subscriptionid);
+        }
     }
     /**
      * Begins update for the ProvisioningServiceDescription resource.
@@ -264,7 +302,9 @@ interface WithTags {
     ProvisioningServiceDescription refresh(Context context);
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @throws com.azure.resourcemanager.deviceprovisioningservices.models.ErrorDetailsException thrown if the request
      *     is rejected by server.
@@ -274,7 +314,9 @@ interface WithTags {
     PagedIterable<SharedAccessSignatureAuthorizationRule> listKeys();
 
     /**
-     * List the primary and secondary keys for a provisioning service.
+     * Get the security metadata for a provisioning service.
+     *
+     * <p>List the primary and secondary keys for a provisioning service.
      *
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ProvisioningServiceDescriptionListResult.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ProvisioningServiceDescriptionListResult.java
index f7b01423bc15b..56f08876805e2 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ProvisioningServiceDescriptionListResult.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/ProvisioningServiceDescriptionListResult.java
@@ -24,6 +24,10 @@ public final class ProvisioningServiceDescriptionListResult {
     @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY)
     private String nextLink;
 
+    /** Creates an instance of ProvisioningServiceDescriptionListResult class. */
+    public ProvisioningServiceDescriptionListResult() {
+    }
+
     /**
      * Get the value property: List of provisioning service descriptions.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PublicNetworkAccess.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PublicNetworkAccess.java
index 6279c4e390bac..5ca80a20bdd0b 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PublicNetworkAccess.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/PublicNetworkAccess.java
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import java.util.Collection;
 
-/** Defines values for PublicNetworkAccess. */
+/** Whether requests from Public Network are allowed. */
 public final class PublicNetworkAccess extends ExpandableStringEnum<PublicNetworkAccess> {
     /** Static value Enabled for PublicNetworkAccess. */
     public static final PublicNetworkAccess ENABLED = fromString("Enabled");
@@ -16,6 +16,15 @@ public final class PublicNetworkAccess extends ExpandableStringEnum<PublicNetwor
     /** Static value Disabled for PublicNetworkAccess. */
     public static final PublicNetworkAccess DISABLED = fromString("Disabled");
 
+    /**
+     * Creates a new instance of PublicNetworkAccess value.
+     *
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public PublicNetworkAccess() {
+    }
+
     /**
      * Creates or finds a PublicNetworkAccess from its string representation.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/SharedAccessSignatureAuthorizationRuleListResult.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/SharedAccessSignatureAuthorizationRuleListResult.java
index 2c9c6d0898bb9..7804a4cdfc8e2 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/SharedAccessSignatureAuthorizationRuleListResult.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/SharedAccessSignatureAuthorizationRuleListResult.java
@@ -24,6 +24,10 @@ public final class SharedAccessSignatureAuthorizationRuleListResult {
     @JsonProperty(value = "nextLink", access = JsonProperty.Access.WRITE_ONLY)
     private String nextLink;
 
+    /** Creates an instance of SharedAccessSignatureAuthorizationRuleListResult class. */
+    public SharedAccessSignatureAuthorizationRuleListResult() {
+    }
+
     /**
      * Get the value property: The list of shared access policies.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/State.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/State.java
index 637ebf9b50c5b..c98a488e9ab86 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/State.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/State.java
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import java.util.Collection;
 
-/** Defines values for State. */
+/** Current state of the provisioning service. */
 public final class State extends ExpandableStringEnum<State> {
     /** Static value Activating for State. */
     public static final State ACTIVATING = fromString("Activating");
@@ -46,6 +46,15 @@ public final class State extends ExpandableStringEnum<State> {
     /** Static value FailoverFailed for State. */
     public static final State FAILOVER_FAILED = fromString("FailoverFailed");
 
+    /**
+     * Creates a new instance of State value.
+     *
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public State() {
+    }
+
     /**
      * Creates or finds a State from its string representation.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/TagsResource.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/TagsResource.java
index 2832dd682cf29..eb628ad0b30f7 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/TagsResource.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/TagsResource.java
@@ -22,6 +22,10 @@ public final class TagsResource {
     @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, String> tags;
 
+    /** Creates an instance of TagsResource class. */
+    public TagsResource() {
+    }
+
     /**
      * Get the tags property: Resource tags.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/VerificationCodeRequest.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/VerificationCodeRequest.java
index 648f16e443e53..e634a1ac80c8d 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/VerificationCodeRequest.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/VerificationCodeRequest.java
@@ -11,12 +11,15 @@
 @Fluent
 public final class VerificationCodeRequest {
     /*
-     * base-64 representation of X509 certificate .cer file or just .pem file
-     * content.
+     * base-64 representation of X509 certificate .cer file or just .pem file content.
      */
     @JsonProperty(value = "certificate")
     private String certificate;
 
+    /** Creates an instance of VerificationCodeRequest class. */
+    public VerificationCodeRequest() {
+    }
+
     /**
      * Get the certificate property: base-64 representation of X509 certificate .cer file or just .pem file content.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/VerificationCodeResponseProperties.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/VerificationCodeResponseProperties.java
index ee0a2ebe4ac42..753c2816b85b4 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/VerificationCodeResponseProperties.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/main/java/com/azure/resourcemanager/deviceprovisioningservices/models/VerificationCodeResponseProperties.java
@@ -42,8 +42,7 @@ public final class VerificationCodeResponseProperties {
     private Boolean isVerified;
 
     /*
-     * base-64 representation of X509 certificate .cer file or just .pem file
-     * content.
+     * base-64 representation of X509 certificate .cer file or just .pem file content.
      */
     @JsonProperty(value = "certificate")
     private byte[] certificate;
@@ -60,6 +59,10 @@ public final class VerificationCodeResponseProperties {
     @JsonProperty(value = "updated")
     private String updated;
 
+    /** Creates an instance of VerificationCodeResponseProperties class. */
+    public VerificationCodeResponseProperties() {
+    }
+
     /**
      * Get the verificationCode property: Verification code.
      *
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateCreateOrUpdateSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateCreateOrUpdateSamples.java
index ef1101538033d..ea38372e6cf79 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateCreateOrUpdateSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateCreateOrUpdateSamples.java
@@ -9,7 +9,7 @@
 /** Samples for DpsCertificate CreateOrUpdate. */
 public final class DpsCertificateCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSCertificateCreateOrUpdate.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSCertificateCreateOrUpdate.json
      */
     /**
      * Sample code: DPSCreateOrUpdateCertificate.
@@ -22,8 +22,7 @@ public static void dPSCreateOrUpdateCertificate(
             .dpsCertificates()
             .define("cert")
             .withExistingProvisioningService("myResourceGroup", "myFirstProvisioningService")
-            .withProperties(
-                new CertificateProperties().withCertificate("############################################".getBytes()))
+            .withProperties(new CertificateProperties().withCertificate("MA==".getBytes()))
             .create();
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateDeleteSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateDeleteSamples.java
index 7f5251a9bbe0c..7c844c981380b 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateDeleteSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateDeleteSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for DpsCertificate Delete. */
 public final class DpsCertificateDeleteSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSDeleteCertificate.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSDeleteCertificate.json
      */
     /**
      * Sample code: DPSDeleteCertificate.
@@ -33,6 +31,6 @@ public static void dPSDeleteCertificate(
                 null,
                 null,
                 null,
-                Context.NONE);
+                com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateGenerateVerificationCodeSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateGenerateVerificationCodeSamples.java
index 0d8efcac9b257..b767989a1092b 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateGenerateVerificationCodeSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateGenerateVerificationCodeSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for DpsCertificate GenerateVerificationCode. */
 public final class DpsCertificateGenerateVerificationCodeSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGenerateVerificationCode.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGenerateVerificationCode.json
      */
     /**
      * Sample code: DPSGenerateVerificationCode.
@@ -33,6 +31,6 @@ public static void dPSGenerateVerificationCode(
                 null,
                 null,
                 null,
-                Context.NONE);
+                com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateGetSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateGetSamples.java
index 7d4556efdedb8..5a15488b79ce9 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateGetSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateGetSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for DpsCertificate Get. */
 public final class DpsCertificateGetSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetCertificate.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetCertificate.json
      */
     /**
      * Sample code: DPSGetCertificate.
@@ -19,6 +17,7 @@ public final class DpsCertificateGetSamples {
     public static void dPSGetCertificate(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
         manager
             .dpsCertificates()
-            .getWithResponse("cert", "myResourceGroup", "myFirstProvisioningService", null, Context.NONE);
+            .getWithResponse(
+                "cert", "myResourceGroup", "myFirstProvisioningService", null, com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateListSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateListSamples.java
index 3444d60e1311f..71c364ea3c3d5 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateListSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateListSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for DpsCertificate List. */
 public final class DpsCertificateListSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetCertificates.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetCertificates.json
      */
     /**
      * Sample code: DPSGetCertificates.
@@ -17,6 +15,8 @@ public final class DpsCertificateListSamples {
      * @param manager Entry point to IotDpsManager.
      */
     public static void dPSGetCertificates(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.dpsCertificates().listWithResponse("myResourceGroup", "myFirstProvisioningService", Context.NONE);
+        manager
+            .dpsCertificates()
+            .listWithResponse("myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateVerifyCertificateSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateVerifyCertificateSamples.java
index 5d22a3c00e201..e82a10a4485e8 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateVerifyCertificateSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/DpsCertificateVerifyCertificateSamples.java
@@ -4,13 +4,12 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
 import com.azure.resourcemanager.deviceprovisioningservices.models.VerificationCodeRequest;
 
 /** Samples for DpsCertificate VerifyCertificate. */
 public final class DpsCertificateVerifyCertificateSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSVerifyCertificate.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSVerifyCertificate.json
      */
     /**
      * Sample code: DPSVerifyCertificate.
@@ -35,6 +34,6 @@ public static void dPSVerifyCertificate(
                 null,
                 null,
                 null,
-                Context.NONE);
+                com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCheckProvisioningServiceNameAvailabilit.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCheckProvisioningServiceNameAvailabilit.java
index 43b776b1fb969..722659e1679ef 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCheckProvisioningServiceNameAvailabilit.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCheckProvisioningServiceNameAvailabilit.java
@@ -4,13 +4,12 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
 import com.azure.resourcemanager.deviceprovisioningservices.models.OperationInputs;
 
 /** Samples for IotDpsResource CheckProvisioningServiceNameAvailability. */
 public final class IotDpsResourceCheckProvisioningServiceNameAvailabilit {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSCheckNameAvailability.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSCheckNameAvailability.json
      */
     /**
      * Sample code: DPSCheckName.
@@ -21,6 +20,6 @@ public static void dPSCheckName(com.azure.resourcemanager.deviceprovisioningserv
         manager
             .iotDpsResources()
             .checkProvisioningServiceNameAvailabilityWithResponse(
-                new OperationInputs().withName("test213123"), Context.NONE);
+                new OperationInputs().withName("test213123"), com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCreateOrUpdatePrivateEndpointConnection.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCreateOrUpdatePrivateEndpointConnection.java
index 5728f23ed58d3..bdc27305e04bd 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCreateOrUpdatePrivateEndpointConnection.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCreateOrUpdatePrivateEndpointConnection.java
@@ -11,7 +11,7 @@
 /** Samples for IotDpsResource CreateOrUpdatePrivateEndpointConnection. */
 public final class IotDpsResourceCreateOrUpdatePrivateEndpointConnection {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSCreateOrUpdatePrivateEndpointConnection.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSCreateOrUpdatePrivateEndpointConnection.json
      */
     /**
      * Sample code: PrivateEndpointConnection_CreateOrUpdate.
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCreateOrUpdateSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCreateOrUpdateSamples.java
index 3d4d87305d32f..9ee209acb0871 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCreateOrUpdateSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
 /** Samples for IotDpsResource CreateOrUpdate. */
 public final class IotDpsResourceCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSCreate.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSCreate.json
      */
     /**
      * Sample code: DPSCreate.
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceDeletePrivateEndpointConnectionSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceDeletePrivateEndpointConnectionSamples.java
index 1301de34dae86..3ebed1c819d30 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceDeletePrivateEndpointConnectionSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceDeletePrivateEndpointConnectionSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource DeletePrivateEndpointConnection. */
 public final class IotDpsResourceDeletePrivateEndpointConnectionSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSDeletePrivateEndpointConnection.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSDeletePrivateEndpointConnection.json
      */
     /**
      * Sample code: PrivateEndpointConnection_Delete.
@@ -21,6 +19,9 @@ public static void privateEndpointConnectionDelete(
         manager
             .iotDpsResources()
             .deletePrivateEndpointConnection(
-                "myResourceGroup", "myFirstProvisioningService", "myPrivateEndpointConnection", Context.NONE);
+                "myResourceGroup",
+                "myFirstProvisioningService",
+                "myPrivateEndpointConnection",
+                com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceDeleteSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceDeleteSamples.java
index 0924e0f55e735..922a687622b0f 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceDeleteSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceDeleteSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource Delete. */
 public final class IotDpsResourceDeleteSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSDelete.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSDelete.json
      */
     /**
      * Sample code: DPSDelete.
@@ -17,6 +15,8 @@ public final class IotDpsResourceDeleteSamples {
      * @param manager Entry point to IotDpsManager.
      */
     public static void dPSDelete(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.iotDpsResources().delete("myResourceGroup", "myFirstProvisioningService", Context.NONE);
+        manager
+            .iotDpsResources()
+            .delete("myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetByResourceGroupSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetByResourceGroupSamples.java
index 649e59f218632..1a508a933aa8b 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetByResourceGroupSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetByResourceGroupSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource GetByResourceGroup. */
 public final class IotDpsResourceGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGet.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGet.json
      */
     /**
      * Sample code: DPSGet.
@@ -19,6 +17,7 @@ public final class IotDpsResourceGetByResourceGroupSamples {
     public static void dPSGet(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
         manager
             .iotDpsResources()
-            .getByResourceGroupWithResponse("myResourceGroup", "myFirstProvisioningService", Context.NONE);
+            .getByResourceGroupWithResponse(
+                "myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetOperationResultSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetOperationResultSamples.java
index 1100e211ddfe6..cbcb4cb910c02 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetOperationResultSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetOperationResultSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource GetOperationResult. */
 public final class IotDpsResourceGetOperationResultSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetOperationResult.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetOperationResult.json
      */
     /**
      * Sample code: DPSGetOperationResult.
@@ -25,6 +23,6 @@ public static void dPSGetOperationResult(
                 "myResourceGroup",
                 "myFirstProvisioningService",
                 "1508265712453",
-                Context.NONE);
+                com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetPrivateEndpointConnectionSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetPrivateEndpointConnectionSamples.java
index 9780c022109e9..35840fde5e6de 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetPrivateEndpointConnectionSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetPrivateEndpointConnectionSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource GetPrivateEndpointConnection. */
 public final class IotDpsResourceGetPrivateEndpointConnectionSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetPrivateEndpointConnection.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetPrivateEndpointConnection.json
      */
     /**
      * Sample code: PrivateEndpointConnection_Get.
@@ -21,6 +19,9 @@ public static void privateEndpointConnectionGet(
         manager
             .iotDpsResources()
             .getPrivateEndpointConnectionWithResponse(
-                "myResourceGroup", "myFirstProvisioningService", "myPrivateEndpointConnection", Context.NONE);
+                "myResourceGroup",
+                "myFirstProvisioningService",
+                "myPrivateEndpointConnection",
+                com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetPrivateLinkResourcesSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetPrivateLinkResourcesSamples.java
index 8649b366bc516..d5efbe7281bc6 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetPrivateLinkResourcesSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceGetPrivateLinkResourcesSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource GetPrivateLinkResources. */
 public final class IotDpsResourceGetPrivateLinkResourcesSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetPrivateLinkResources.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetPrivateLinkResources.json
      */
     /**
      * Sample code: PrivateLinkResources_List.
@@ -21,6 +19,6 @@ public static void privateLinkResourcesList(
         manager
             .iotDpsResources()
             .getPrivateLinkResourcesWithResponse(
-                "myResourceGroup", "myFirstProvisioningService", "iotDps", Context.NONE);
+                "myResourceGroup", "myFirstProvisioningService", "iotDps", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListByResourceGroupSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListByResourceGroupSamples.java
index e4ce538297840..ff08fb9543ff3 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListByResourceGroupSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListByResourceGroupSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListByResourceGroup. */
 public final class IotDpsResourceListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSListByResourceGroup.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSListByResourceGroup.json
      */
     /**
      * Sample code: DPSListByResourceGroup.
@@ -18,6 +16,6 @@ public final class IotDpsResourceListByResourceGroupSamples {
      */
     public static void dPSListByResourceGroup(
         com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.iotDpsResources().listByResourceGroup("myResourceGroup", Context.NONE);
+        manager.iotDpsResources().listByResourceGroup("myResourceGroup", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListKeysForKeyNameSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListKeysForKeyNameSamples.java
index fc76222807ee7..2140fb03a5d33 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListKeysForKeyNameSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListKeysForKeyNameSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListKeysForKeyName. */
 public final class IotDpsResourceListKeysForKeyNameSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetKey.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetKey.json
      */
     /**
      * Sample code: DPSGetKey.
@@ -19,6 +17,7 @@ public final class IotDpsResourceListKeysForKeyNameSamples {
     public static void dPSGetKey(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
         manager
             .iotDpsResources()
-            .listKeysForKeyNameWithResponse("myFirstProvisioningService", "testKey", "myResourceGroup", Context.NONE);
+            .listKeysForKeyNameWithResponse(
+                "myFirstProvisioningService", "testKey", "myResourceGroup", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListKeysSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListKeysSamples.java
index d85b8e8af5bc6..181ab25a9c674 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListKeysSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListKeysSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListKeys. */
 public final class IotDpsResourceListKeysSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSListKeys.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSListKeys.json
      */
     /**
      * Sample code: DPSListKeys.
@@ -17,6 +15,8 @@ public final class IotDpsResourceListKeysSamples {
      * @param manager Entry point to IotDpsManager.
      */
     public static void dPSListKeys(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.iotDpsResources().listKeys("myFirstProvisioningService", "myResourceGroup", Context.NONE);
+        manager
+            .iotDpsResources()
+            .listKeys("myFirstProvisioningService", "myResourceGroup", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListPrivateEndpointConnectionsSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListPrivateEndpointConnectionsSamples.java
index 0497ecaafc2fd..649cf547130e5 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListPrivateEndpointConnectionsSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListPrivateEndpointConnectionsSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListPrivateEndpointConnections. */
 public final class IotDpsResourceListPrivateEndpointConnectionsSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSListPrivateEndpointConnections.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSListPrivateEndpointConnections.json
      */
     /**
      * Sample code: PrivateEndpointConnections_List.
@@ -20,6 +18,7 @@ public static void privateEndpointConnectionsList(
         com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
         manager
             .iotDpsResources()
-            .listPrivateEndpointConnectionsWithResponse("myResourceGroup", "myFirstProvisioningService", Context.NONE);
+            .listPrivateEndpointConnectionsWithResponse(
+                "myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListPrivateLinkResourcesSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListPrivateLinkResourcesSamples.java
index 9d089531e3a7d..09e0402def87c 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListPrivateLinkResourcesSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListPrivateLinkResourcesSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListPrivateLinkResources. */
 public final class IotDpsResourceListPrivateLinkResourcesSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSListPrivateLinkResources.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSListPrivateLinkResources.json
      */
     /**
      * Sample code: PrivateLinkResources_List.
@@ -20,6 +18,7 @@ public static void privateLinkResourcesList(
         com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
         manager
             .iotDpsResources()
-            .listPrivateLinkResourcesWithResponse("myResourceGroup", "myFirstProvisioningService", Context.NONE);
+            .listPrivateLinkResourcesWithResponse(
+                "myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListSamples.java
index b1934a1dd9d86..40d49515536a3 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource List. */
 public final class IotDpsResourceListSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSListBySubscription.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSListBySubscription.json
      */
     /**
      * Sample code: DPSListBySubscription.
@@ -18,6 +16,6 @@ public final class IotDpsResourceListSamples {
      */
     public static void dPSListBySubscription(
         com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.iotDpsResources().list(Context.NONE);
+        manager.iotDpsResources().list(com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListValidSkusSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListValidSkusSamples.java
index 9e26579712bda..35283e3129640 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListValidSkusSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceListValidSkusSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for IotDpsResource ListValidSkus. */
 public final class IotDpsResourceListValidSkusSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSGetValidSku.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSGetValidSku.json
      */
     /**
      * Sample code: DPSGetValidSku.
@@ -17,6 +15,8 @@ public final class IotDpsResourceListValidSkusSamples {
      * @param manager Entry point to IotDpsManager.
      */
     public static void dPSGetValidSku(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.iotDpsResources().listValidSkus("myFirstProvisioningService", "myResourceGroup", Context.NONE);
+        manager
+            .iotDpsResources()
+            .listValidSkus("myFirstProvisioningService", "myResourceGroup", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceUpdateSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceUpdateSamples.java
index bb050c2aecb13..f17fd8405ccaf 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceUpdateSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/IotDpsResourceUpdateSamples.java
@@ -4,7 +4,6 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
 import com.azure.resourcemanager.deviceprovisioningservices.models.ProvisioningServiceDescription;
 import java.util.HashMap;
 import java.util.Map;
@@ -12,7 +11,7 @@
 /** Samples for IotDpsResource Update. */
 public final class IotDpsResourceUpdateSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSPatch.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSPatch.json
      */
     /**
      * Sample code: DPSPatch.
@@ -23,7 +22,8 @@ public static void dPSPatch(com.azure.resourcemanager.deviceprovisioningservices
         ProvisioningServiceDescription resource =
             manager
                 .iotDpsResources()
-                .getByResourceGroupWithResponse("myResourceGroup", "myFirstProvisioningService", Context.NONE)
+                .getByResourceGroupWithResponse(
+                    "myResourceGroup", "myFirstProvisioningService", com.azure.core.util.Context.NONE)
                 .getValue();
         resource.update().withTags(mapOf("foo", "bar")).apply();
     }
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/OperationsListSamples.java b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/OperationsListSamples.java
index d74e69caf9865..1b6fcf541efbf 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/OperationsListSamples.java
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/src/samples/java/com/azure/resourcemanager/deviceprovisioningservices/generated/OperationsListSamples.java
@@ -4,12 +4,10 @@
 
 package com.azure.resourcemanager.deviceprovisioningservices.generated;
 
-import com.azure.core.util.Context;
-
 /** Samples for Operations List. */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-02-05/examples/DPSOperations.json
+     * x-ms-original-file: specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2022-12-12/examples/DPSOperations.json
      */
     /**
      * Sample code: DPSOperations.
@@ -17,6 +15,6 @@ public final class OperationsListSamples {
      * @param manager Entry point to IotDpsManager.
      */
     public static void dPSOperations(com.azure.resourcemanager.deviceprovisioningservices.IotDpsManager manager) {
-        manager.operations().list(Context.NONE);
+        manager.operations().list(com.azure.core.util.Context.NONE);
     }
 }