diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/CHANGELOG.md b/sdk/servicefabric/azure-resourcemanager-servicefabric/CHANGELOG.md
index b539b5f41cda..77e4d7422858 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/CHANGELOG.md
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Release History
 
-## 1.0.0-beta.3 (Unreleased)
+## 1.0.0-beta.1 (2022-01-29)
+
+- Azure Resource Manager ServiceFabric client library for Java. This package contains Microsoft Azure SDK for ServiceFabric Management SDK. Service Fabric Management Client. Package tag package-2021-06. 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/servicefabric/azure-resourcemanager-servicefabric/README.md b/sdk/servicefabric/azure-resourcemanager-servicefabric/README.md
index 17f98ec8b292..0016b9e3fd16 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/README.md
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-servicefabric</artifactId>
-    <version>1.0.0-beta.2</version>
+    <version>1.0.0-beta.3</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/SAMPLE.md b/sdk/servicefabric/azure-resourcemanager-servicefabric/SAMPLE.md
index 7f5ed87fecf1..31c97baf160e 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/SAMPLE.md
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/SAMPLE.md
@@ -40,6 +40,10 @@
 - [ListUpgradableVersions](#clusters_listupgradableversions)
 - [Update](#clusters_update)
 
+## Operations
+
+- [List](#operations_list)
+
 ## Services
 
 - [CreateOrUpdate](#services_createorupdate)
@@ -56,9 +60,7 @@ import java.util.Map;
 /** Samples for ApplicationTypeVersions CreateOrUpdate. */
 public final class ApplicationTypeVersionsCreateOrUpdateSamples {
     /*
-     * operationId: ApplicationTypeVersions_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put an application type version
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeVersionPutOperation_example.json
      */
     /**
      * Sample code: Put an application type version.
@@ -97,9 +99,7 @@ import com.azure.core.util.Context;
 /** Samples for ApplicationTypeVersions Delete. */
 public final class ApplicationTypeVersionsDeleteSamples {
     /*
-     * operationId: ApplicationTypeVersions_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete an application type version
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeVersionDeleteOperation_example.json
      */
     /**
      * Sample code: Delete an application type version.
@@ -121,9 +121,7 @@ import com.azure.core.util.Context;
 /** Samples for ApplicationTypeVersions Get. */
 public final class ApplicationTypeVersionsGetSamples {
     /*
-     * operationId: ApplicationTypeVersions_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get an application type version
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeVersionGetOperation_example.json
      */
     /**
      * Sample code: Get an application type version.
@@ -145,9 +143,7 @@ import com.azure.core.util.Context;
 /** Samples for ApplicationTypeVersions List. */
 public final class ApplicationTypeVersionsListSamples {
     /*
-     * operationId: ApplicationTypeVersions_List
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a list of application type version resources
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeVersionListOperation_example.json
      */
     /**
      * Sample code: Get a list of application type version resources.
@@ -170,9 +166,7 @@ import java.util.Map;
 /** Samples for ApplicationTypes CreateOrUpdate. */
 public final class ApplicationTypesCreateOrUpdateSamples {
     /*
-     * operationId: ApplicationTypes_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put an application type
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeNamePutOperation_example.json
      */
     /**
      * Sample code: Put an application type.
@@ -209,9 +203,7 @@ import com.azure.core.util.Context;
 /** Samples for ApplicationTypes Delete. */
 public final class ApplicationTypesDeleteSamples {
     /*
-     * operationId: ApplicationTypes_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete an application type
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeNameDeleteOperation_example.json
      */
     /**
      * Sample code: Delete an application type.
@@ -232,9 +224,7 @@ import com.azure.core.util.Context;
 /** Samples for ApplicationTypes Get. */
 public final class ApplicationTypesGetSamples {
     /*
-     * operationId: ApplicationTypes_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get an application type
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeNameGetOperation_example.json
      */
     /**
      * Sample code: Get an application type.
@@ -255,9 +245,7 @@ import com.azure.core.util.Context;
 /** Samples for ApplicationTypes List. */
 public final class ApplicationTypesListSamples {
     /*
-     * operationId: ApplicationTypes_List
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a list of application type name resources
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeNameListOperation_example.json
      */
     /**
      * Sample code: Get a list of application type name resources.
@@ -288,9 +276,7 @@ import java.util.Map;
 /** Samples for Applications CreateOrUpdate. */
 public final class ApplicationsCreateOrUpdateSamples {
     /*
-     * operationId: Applications_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put an application with maximum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationPutOperation_example_max.json
      */
     /**
      * Sample code: Put an application with maximum parameters.
@@ -344,9 +330,7 @@ public final class ApplicationsCreateOrUpdateSamples {
     }
 
     /*
-     * operationId: Applications_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put an application with minimum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationPutOperation_example_min.json
      */
     /**
      * Sample code: Put an application with minimum parameters.
@@ -368,9 +352,7 @@ public final class ApplicationsCreateOrUpdateSamples {
     }
 
     /*
-     * operationId: Applications_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put an application with recreate option
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationPutOperation_recreate_example.json
      */
     /**
      * Sample code: Put an application with recreate option.
@@ -412,9 +394,7 @@ import com.azure.core.util.Context;
 /** Samples for Applications Delete. */
 public final class ApplicationsDeleteSamples {
     /*
-     * operationId: Applications_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete an application
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationDeleteOperation_example.json
      */
     /**
      * Sample code: Delete an application.
@@ -435,9 +415,7 @@ import com.azure.core.util.Context;
 /** Samples for Applications Get. */
 public final class ApplicationsGetSamples {
     /*
-     * operationId: Applications_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get an application
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationGetOperation_example.json
      */
     /**
      * Sample code: Get an application.
@@ -458,9 +436,7 @@ import com.azure.core.util.Context;
 /** Samples for Applications List. */
 public final class ApplicationsListSamples {
     /*
-     * operationId: Applications_List
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a list of application resources
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationListOperation_example.json
      */
     /**
      * Sample code: Get a list of application resources.
@@ -485,9 +461,7 @@ import java.util.Arrays;
 /** Samples for Applications Update. */
 public final class ApplicationsUpdateSamples {
     /*
-     * operationId: Applications_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: Patch an application
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationPatchOperation_example.json
      */
     /**
      * Sample code: Patch an application.
@@ -522,9 +496,7 @@ import com.azure.core.util.Context;
 /** Samples for ClusterVersions Get. */
 public final class ClusterVersionsGetSamples {
     /*
-     * operationId: ClusterVersions_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get cluster version
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterVersionsGet_example.json
      */
     /**
      * Sample code: Get cluster version.
@@ -546,9 +518,7 @@ import com.azure.resourcemanager.servicefabric.models.ClusterVersionsEnvironment
 /** Samples for ClusterVersions GetByEnvironment. */
 public final class ClusterVersionsGetByEnvironmentSamples {
     /*
-     * operationId: ClusterVersions_GetByEnvironment
-     * api-version: 2021-06-01
-     * x-ms-examples: Get cluster version by environment
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterVersionsGetByEnvironment_example.json
      */
     /**
      * Sample code: Get cluster version by environment.
@@ -572,9 +542,7 @@ import com.azure.core.util.Context;
 /** Samples for ClusterVersions List. */
 public final class ClusterVersionsListSamples {
     /*
-     * operationId: ClusterVersions_List
-     * api-version: 2021-06-01
-     * x-ms-examples: List cluster versions
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterVersionsList_example.json
      */
     /**
      * Sample code: List cluster versions.
@@ -596,9 +564,7 @@ import com.azure.resourcemanager.servicefabric.models.ClusterVersionsEnvironment
 /** Samples for ClusterVersions ListByEnvironment. */
 public final class ClusterVersionsListByEnvironmentSamples {
     /*
-     * operationId: ClusterVersions_ListByEnvironment
-     * api-version: 2021-06-01
-     * x-ms-examples: List cluster versions by environment
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterVersionsListByEnvironment.json
      */
     /**
      * Sample code: List cluster versions by environment.
@@ -656,9 +622,7 @@ import java.util.Map;
 /** Samples for Clusters CreateOrUpdate. */
 public final class ClustersCreateOrUpdateSamples {
     /*
-     * operationId: Clusters_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put a cluster with maximum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterPutOperation_example_max.json
      */
     /**
      * Sample code: Put a cluster with maximum parameters.
@@ -835,9 +799,7 @@ public final class ClustersCreateOrUpdateSamples {
     }
 
     /*
-     * operationId: Clusters_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put a cluster with minimum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterPutOperation_example_min.json
      */
     /**
      * Sample code: Put a cluster with minimum parameters.
@@ -910,9 +872,7 @@ import com.azure.core.util.Context;
 /** Samples for Clusters Delete. */
 public final class ClustersDeleteSamples {
     /*
-     * operationId: Clusters_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete a cluster
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterDeleteOperation_example.json
      */
     /**
      * Sample code: Delete a cluster.
@@ -933,9 +893,7 @@ import com.azure.core.util.Context;
 /** Samples for Clusters GetByResourceGroup. */
 public final class ClustersGetByResourceGroupSamples {
     /*
-     * operationId: Clusters_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a cluster
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterGetOperation_example.json
      */
     /**
      * Sample code: Get a cluster.
@@ -956,9 +914,7 @@ import com.azure.core.util.Context;
 /** Samples for Clusters List. */
 public final class ClustersListSamples {
     /*
-     * operationId: Clusters_List
-     * api-version: 2021-06-01
-     * x-ms-examples: List clusters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterListOperation_example.json
      */
     /**
      * Sample code: List clusters.
@@ -979,9 +935,7 @@ import com.azure.core.util.Context;
 /** Samples for Clusters ListByResourceGroup. */
 public final class ClustersListByResourceGroupSamples {
     /*
-     * operationId: Clusters_ListByResourceGroup
-     * api-version: 2021-06-01
-     * x-ms-examples: List cluster by resource group
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterListByResourceGroupOperation_example.json
      */
     /**
      * Sample code: List cluster by resource group.
@@ -1004,9 +958,7 @@ import com.azure.resourcemanager.servicefabric.models.UpgradableVersionsDescript
 /** Samples for Clusters ListUpgradableVersions. */
 public final class ClustersListUpgradableVersionsSamples {
     /*
-     * operationId: Clusters_ListUpgradableVersions
-     * api-version: 2021-06-01
-     * x-ms-examples: Get minimum and maximum code versions
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ListUpgradableVersionsMinMax_example.json
      */
     /**
      * Sample code: Get minimum and maximum code versions.
@@ -1019,9 +971,7 @@ public final class ClustersListUpgradableVersionsSamples {
     }
 
     /*
-     * operationId: Clusters_ListUpgradableVersions
-     * api-version: 2021-06-01
-     * x-ms-examples: Get upgrade path
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ListUpgradableVersionsPath_example.json
      */
     /**
      * Sample code: Get upgrade path.
@@ -1059,9 +1009,7 @@ import java.util.Map;
 /** Samples for Clusters Update. */
 public final class ClustersUpdateSamples {
     /*
-     * operationId: Clusters_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: Patch a cluster
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterPatchOperation_example.json
      */
     /**
      * Sample code: Patch a cluster.
@@ -1118,6 +1066,27 @@ public final class ClustersUpdateSamples {
 }
 ```
 
+### Operations_List
+
+```java
+import com.azure.core.util.Context;
+
+/** Samples for Operations List. */
+public final class OperationsListSamples {
+    /*
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ListOperations.json
+     */
+    /**
+     * Sample code: ListOperations.
+     *
+     * @param manager Entry point to ServiceFabricManager.
+     */
+    public static void listOperations(com.azure.resourcemanager.servicefabric.ServiceFabricManager manager) {
+        manager.operations().list(Context.NONE);
+    }
+}
+```
+
 ### Services_CreateOrUpdate
 
 ```java
@@ -1135,9 +1104,7 @@ import java.util.Map;
 /** Samples for Services CreateOrUpdate. */
 public final class ServicesCreateOrUpdateSamples {
     /*
-     * operationId: Services_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put a service with minimum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServicePutOperation_example_min.json
      */
     /**
      * Sample code: Put a service with minimum parameters.
@@ -1157,9 +1124,7 @@ public final class ServicesCreateOrUpdateSamples {
     }
 
     /*
-     * operationId: Services_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put a service with maximum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServicePutOperation_example_max.json
      */
     /**
      * Sample code: Put a service with maximum parameters.
@@ -1214,9 +1179,7 @@ import com.azure.core.util.Context;
 /** Samples for Services Delete. */
 public final class ServicesDeleteSamples {
     /*
-     * operationId: Services_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete a service
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServiceDeleteOperation_example.json
      */
     /**
      * Sample code: Delete a service.
@@ -1237,9 +1200,7 @@ import com.azure.core.util.Context;
 /** Samples for Services Get. */
 public final class ServicesGetSamples {
     /*
-     * operationId: Services_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a service
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServiceGetOperation_example.json
      */
     /**
      * Sample code: Get a service.
@@ -1260,9 +1221,7 @@ import com.azure.core.util.Context;
 /** Samples for Services List. */
 public final class ServicesListSamples {
     /*
-     * operationId: Services_List
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a list of service resources
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServiceListOperation_example.json
      */
     /**
      * Sample code: Get a list of service resources.
@@ -1285,9 +1244,7 @@ import com.azure.resourcemanager.servicefabric.models.ServiceResource;
 /** Samples for Services Update. */
 public final class ServicesUpdateSamples {
     /*
-     * operationId: Services_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: Patch a service
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServicePatchOperation_example.json
      */
     /**
      * Sample code: Patch a service.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/ServiceFabricManager.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/ServiceFabricManager.java
index 04067ded676b..34e2a6bed1ca 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/ServiceFabricManager.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/ServiceFabricManager.java
@@ -8,6 +8,7 @@
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelineBuilder;
+import com.azure.core.http.HttpPipelinePosition;
 import com.azure.core.http.policy.AddDatePolicy;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.http.policy.HttpLoggingPolicy;
@@ -41,6 +42,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /** Entry point to ServiceFabricManager. Service Fabric Management Client. */
 public final class ServiceFabricManager {
@@ -194,7 +196,7 @@ public ServiceFabricManager authenticate(TokenCredential credential, AzureProfil
                 .append("-")
                 .append("com.azure.resourcemanager.servicefabric")
                 .append("/")
-                .append("1.0.0-beta.2");
+                .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")
@@ -217,11 +219,24 @@ public ServiceFabricManager authenticate(TokenCredential credential, AzureProfil
             List<HttpPipelinePolicy> policies = new ArrayList<>();
             policies.add(new UserAgentPolicy(userAgentBuilder.toString()));
             policies.add(new RequestIdPolicy());
+            policies
+                .addAll(
+                    this
+                        .policies
+                        .stream()
+                        .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL)
+                        .collect(Collectors.toList()));
             HttpPolicyProviders.addBeforeRetryPolicies(policies);
             policies.add(retryPolicy);
             policies.add(new AddDatePolicy());
             policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
-            policies.addAll(this.policies);
+            policies
+                .addAll(
+                    this
+                        .policies
+                        .stream()
+                        .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
+                        .collect(Collectors.toList()));
             HttpPolicyProviders.addAfterRetryPolicies(policies);
             policies.add(new HttpLoggingPolicy(httpLogOptions));
             HttpPipeline httpPipeline =
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationTypeVersionsClient.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationTypeVersionsClient.java
index 95b6614416a5..f29d8880880c 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationTypeVersionsClient.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationTypeVersionsClient.java
@@ -12,6 +12,7 @@
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.servicefabric.fluent.models.ApplicationTypeVersionResourceInner;
 import com.azure.resourcemanager.servicefabric.fluent.models.ApplicationTypeVersionResourceListInner;
+import reactor.core.publisher.Mono;
 
 /** An instance of this class provides access to all the operations defined in ApplicationTypeVersionsClient. */
 public interface ApplicationTypeVersionsClient {
@@ -46,7 +47,7 @@ ApplicationTypeVersionResourceInner get(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type version resource created or in the process of being created in the
-     *     Service Fabric application type name resource.
+     *     Service Fabric application type name resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ApplicationTypeVersionResourceInner> getWithResponse(
@@ -63,9 +64,10 @@ Response<ApplicationTypeVersionResourceInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an application type version resource for the specified application type name resource.
+     * @return an application type version resource for the specified application type name resource along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdate(
             String resourceGroupName,
@@ -86,9 +88,10 @@ Response<ApplicationTypeVersionResourceInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an application type version resource for the specified application type name resource.
+     * @return an application type version resource for the specified application type name resource along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdate(
             String resourceGroupName,
@@ -152,9 +155,9 @@ ApplicationTypeVersionResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationTypeName, String version);
 
@@ -169,9 +172,9 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationTypeName, String version, Context context);
 
@@ -234,7 +237,7 @@ ApplicationTypeVersionResourceListInner list(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type version resources created or in the process of being created in the Service Fabric
-     *     application type name resource.
+     *     application type name resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ApplicationTypeVersionResourceListInner> listWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationTypesClient.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationTypesClient.java
index b4b6d2f5e55d..dcaa745f70f0 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationTypesClient.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationTypesClient.java
@@ -12,6 +12,7 @@
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.servicefabric.fluent.models.ApplicationTypeResourceInner;
 import com.azure.resourcemanager.servicefabric.fluent.models.ApplicationTypeResourceListInner;
+import reactor.core.publisher.Mono;
 
 /** An instance of this class provides access to all the operations defined in ApplicationTypesClient. */
 public interface ApplicationTypesClient {
@@ -43,7 +44,7 @@ public interface ApplicationTypesClient {
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type name resource created or in the process of being created in the Service
-     *     Fabric cluster resource.
+     *     Fabric cluster resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ApplicationTypeResourceInner> getWithResponse(
@@ -79,7 +80,7 @@ ApplicationTypeResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application type name resource.
+     * @return the application type name resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ApplicationTypeResourceInner> createOrUpdateWithResponse(
@@ -98,9 +99,9 @@ Response<ApplicationTypeResourceInner> createOrUpdateWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationTypeName);
 
@@ -114,9 +115,9 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationTypeName, Context context);
 
@@ -173,7 +174,7 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type name resources created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ApplicationTypeResourceListInner> listWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationsClient.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationsClient.java
index c2132aa03556..dbb1194159ec 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationsClient.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ApplicationsClient.java
@@ -13,6 +13,7 @@
 import com.azure.resourcemanager.servicefabric.fluent.models.ApplicationResourceInner;
 import com.azure.resourcemanager.servicefabric.fluent.models.ApplicationResourceListInner;
 import com.azure.resourcemanager.servicefabric.models.ApplicationResourceUpdate;
+import reactor.core.publisher.Mono;
 
 /** An instance of this class provides access to all the operations defined in ApplicationsClient. */
 public interface ApplicationsClient {
@@ -44,7 +45,7 @@ public interface ApplicationsClient {
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application resource created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ApplicationResourceInner> getWithResponse(
@@ -60,9 +61,9 @@ Response<ApplicationResourceInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginCreateOrUpdate(
         String resourceGroupName, String clusterName, String applicationName, ApplicationResourceInner parameters);
 
@@ -77,9 +78,9 @@ SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> begin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -134,9 +135,9 @@ ApplicationResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginUpdate(
         String resourceGroupName, String clusterName, String applicationName, ApplicationResourceUpdate parameters);
 
@@ -151,9 +152,9 @@ SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> begin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -207,9 +208,9 @@ ApplicationResourceInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationName);
 
@@ -223,9 +224,9 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationName, Context context);
 
@@ -280,7 +281,7 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application resources created or in the process of being created in the Service Fabric cluster
-     *     resource.
+     *     resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ApplicationResourceListInner> listWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ClusterVersionsClient.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ClusterVersionsClient.java
index 85144b21b1cc..8db180f30620 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ClusterVersionsClient.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ClusterVersionsClient.java
@@ -35,7 +35,7 @@ public interface ClusterVersionsClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version.
+     * @return information about an available Service Fabric cluster code version along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ClusterCodeVersionsListResultInner> getWithResponse(
@@ -66,7 +66,8 @@ ClusterCodeVersionsListResultInner getByEnvironment(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version by environment.
+     * @return information about an available Service Fabric cluster code version by environment along with {@link
+     *     Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ClusterCodeVersionsListResultInner> getByEnvironmentWithResponse(
@@ -92,7 +93,7 @@ Response<ClusterCodeVersionsListResultInner> getByEnvironmentWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by location.
+     * @return all available code versions for Service Fabric cluster resources by location along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ClusterCodeVersionsListResultInner> listWithResponse(String location, Context context);
@@ -119,7 +120,8 @@ Response<ClusterCodeVersionsListResultInner> getByEnvironmentWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by environment.
+     * @return all available code versions for Service Fabric cluster resources by environment along with {@link
+     *     Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ClusterCodeVersionsListResultInner> listByEnvironmentWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ClustersClient.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ClustersClient.java
index e3acf2d9da58..8d25ec7af465 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ClustersClient.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ClustersClient.java
@@ -15,6 +15,7 @@
 import com.azure.resourcemanager.servicefabric.fluent.models.UpgradableVersionPathResultInner;
 import com.azure.resourcemanager.servicefabric.models.ClusterUpdateParameters;
 import com.azure.resourcemanager.servicefabric.models.UpgradableVersionsDescription;
+import reactor.core.publisher.Mono;
 
 /** An instance of this class provides access to all the operations defined in ClustersClient. */
 public interface ClustersClient {
@@ -42,7 +43,7 @@ public interface ClustersClient {
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric cluster resource created or in the process of being created in the specified resource
-     *     group.
+     *     group along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ClusterInner> getByResourceGroupWithResponse(
@@ -57,9 +58,9 @@ Response<ClusterInner> getByResourceGroupWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
         String resourceGroupName, String clusterName, ClusterInner parameters);
 
@@ -73,9 +74,9 @@ SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
         String resourceGroupName, String clusterName, ClusterInner parameters, Context context);
 
@@ -118,9 +119,9 @@ SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(
         String resourceGroupName, String clusterName, ClusterUpdateParameters parameters);
 
@@ -135,9 +136,9 @@ SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(
         String resourceGroupName, String clusterName, ClusterUpdateParameters parameters, Context context);
 
@@ -194,7 +195,7 @@ ClusterInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<Void> deleteWithResponse(String resourceGroupName, String clusterName, Context context);
@@ -219,7 +220,8 @@ ClusterInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the resource group.
+     * @return all Service Fabric cluster resources created or in the process of being created in the resource group
+     *     along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ClusterListResultInner> listByResourceGroupWithResponse(String resourceGroupName, Context context);
@@ -241,7 +243,8 @@ ClusterInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the subscription.
+     * @return all Service Fabric cluster resources created or in the process of being created in the subscription along
+     *     with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ClusterListResultInner> listWithResponse(Context context);
@@ -273,7 +276,7 @@ ClusterInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of intermediate cluster code versions for an upgrade or downgrade.
+     * @return the list of intermediate cluster code versions for an upgrade or downgrade along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<UpgradableVersionPathResultInner> listUpgradableVersionsWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ServicesClient.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ServicesClient.java
index 8a6e3e36e034..fc336e373a89 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ServicesClient.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/fluent/ServicesClient.java
@@ -13,6 +13,7 @@
 import com.azure.resourcemanager.servicefabric.fluent.models.ServiceResourceInner;
 import com.azure.resourcemanager.servicefabric.fluent.models.ServiceResourceListInner;
 import com.azure.resourcemanager.servicefabric.models.ServiceResourceUpdate;
+import reactor.core.publisher.Mono;
 
 /** An instance of this class provides access to all the operations defined in ServicesClient. */
 public interface ServicesClient {
@@ -46,7 +47,7 @@ public interface ServicesClient {
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric service resource created or in the process of being created in the Service Fabric
-     *     application resource.
+     *     application resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ServiceResourceInner> getWithResponse(
@@ -63,9 +64,9 @@ Response<ServiceResourceInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -85,9 +86,9 @@ SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOr
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -151,9 +152,9 @@ ServiceResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -173,9 +174,9 @@ SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -238,9 +239,9 @@ ServiceResourceInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationName, String serviceName);
 
@@ -255,9 +256,9 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationName, String serviceName, Context context);
 
@@ -317,7 +318,7 @@ void delete(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all service resources created or in the process of being created in the Service Fabric application
-     *     resource.
+     *     resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<ServiceResourceListInner> listWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationTypeVersionsClientImpl.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationTypeVersionsClientImpl.java
index 4bd652d7fc18..5f5a2303d7f7 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationTypeVersionsClientImpl.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationTypeVersionsClientImpl.java
@@ -145,7 +145,8 @@ Mono<Response<ApplicationTypeVersionResourceListInner>> list(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type version resource created or in the process of being created in the
-     *     Service Fabric application type name resource.
+     *     Service Fabric application type name resource along with {@link Response} on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationTypeVersionResourceInner>> getWithResponseAsync(
@@ -207,7 +208,8 @@ private Mono<Response<ApplicationTypeVersionResourceInner>> getWithResponseAsync
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type version resource created or in the process of being created in the
-     *     Service Fabric application type name resource.
+     *     Service Fabric application type name resource along with {@link Response} on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationTypeVersionResourceInner>> getWithResponseAsync(
@@ -265,7 +267,7 @@ private Mono<Response<ApplicationTypeVersionResourceInner>> getWithResponseAsync
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type version resource created or in the process of being created in the
-     *     Service Fabric application type name resource.
+     *     Service Fabric application type name resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationTypeVersionResourceInner> getAsync(
@@ -314,7 +316,7 @@ public ApplicationTypeVersionResourceInner get(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type version resource created or in the process of being created in the
-     *     Service Fabric application type name resource.
+     *     Service Fabric application type name resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ApplicationTypeVersionResourceInner> getWithResponse(
@@ -333,7 +335,8 @@ public Response<ApplicationTypeVersionResourceInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an application type version resource for the specified application type name resource.
+     * @return an application type version resource for the specified application type name resource along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -404,7 +407,8 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an application type version resource for the specified application type name resource.
+     * @return an application type version resource for the specified application type name resource along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -472,9 +476,10 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an application type version resource for the specified application type name resource.
+     * @return an application type version resource for the specified application type name resource along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdateAsync(
             String resourceGroupName,
@@ -491,7 +496,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
                 this.client.getHttpPipeline(),
                 ApplicationTypeVersionResourceInner.class,
                 ApplicationTypeVersionResourceInner.class,
-                Context.NONE);
+                this.client.getContext());
     }
 
     /**
@@ -506,9 +511,10 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an application type version resource for the specified application type name resource.
+     * @return an application type version resource for the specified application type name resource along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdateAsync(
             String resourceGroupName,
@@ -542,9 +548,10 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an application type version resource for the specified application type name resource.
+     * @return an application type version resource for the specified application type name resource along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdate(
             String resourceGroupName,
@@ -568,9 +575,10 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an application type version resource for the specified application type name resource.
+     * @return an application type version resource for the specified application type name resource along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdate(
             String resourceGroupName,
@@ -595,7 +603,8 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an application type version resource for the specified application type name resource.
+     * @return an application type version resource for the specified application type name resource on successful
+     *     completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationTypeVersionResourceInner> createOrUpdateAsync(
@@ -621,7 +630,8 @@ private Mono<ApplicationTypeVersionResourceInner> createOrUpdateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an application type version resource for the specified application type name resource.
+     * @return an application type version resource for the specified application type name resource on successful
+     *     completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationTypeVersionResourceInner> createOrUpdateAsync(
@@ -696,7 +706,7 @@ public ApplicationTypeVersionResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -756,7 +766,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -812,16 +822,17 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
         String resourceGroupName, String clusterName, String applicationTypeName, String version) {
         Mono<Response<Flux<ByteBuffer>>> mono =
             deleteWithResponseAsync(resourceGroupName, clusterName, applicationTypeName, version);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
@@ -835,9 +846,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
         String resourceGroupName, String clusterName, String applicationTypeName, String version, Context context) {
         context = this.client.mergeContext(context);
@@ -858,9 +869,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationTypeName, String version) {
         return beginDeleteAsync(resourceGroupName, clusterName, applicationTypeName, version).getSyncPoller();
@@ -877,9 +888,9 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationTypeName, String version, Context context) {
         return beginDeleteAsync(resourceGroupName, clusterName, applicationTypeName, version, context).getSyncPoller();
@@ -895,7 +906,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(
@@ -916,7 +927,7 @@ private Mono<Void> deleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(
@@ -971,7 +982,7 @@ public void delete(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type version resources created or in the process of being created in the Service Fabric
-     *     application type name resource.
+     *     application type name resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationTypeVersionResourceListInner>> listWithResponseAsync(
@@ -1028,7 +1039,7 @@ private Mono<Response<ApplicationTypeVersionResourceListInner>> listWithResponse
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type version resources created or in the process of being created in the Service Fabric
-     *     application type name resource.
+     *     application type name resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationTypeVersionResourceListInner>> listWithResponseAsync(
@@ -1081,7 +1092,7 @@ private Mono<Response<ApplicationTypeVersionResourceListInner>> listWithResponse
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type version resources created or in the process of being created in the Service Fabric
-     *     application type name resource.
+     *     application type name resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationTypeVersionResourceListInner> listAsync(
@@ -1128,7 +1139,7 @@ public ApplicationTypeVersionResourceListInner list(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type version resources created or in the process of being created in the Service Fabric
-     *     application type name resource.
+     *     application type name resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ApplicationTypeVersionResourceListInner> listWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationTypesClientImpl.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationTypesClientImpl.java
index ed4f75841b5d..e1d034c768e4 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationTypesClientImpl.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationTypesClientImpl.java
@@ -139,7 +139,7 @@ Mono<Response<ApplicationTypeResourceListInner>> list(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type name resource created or in the process of being created in the Service
-     *     Fabric cluster resource.
+     *     Fabric cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationTypeResourceInner>> getWithResponseAsync(
@@ -196,7 +196,7 @@ private Mono<Response<ApplicationTypeResourceInner>> getWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type name resource created or in the process of being created in the Service
-     *     Fabric cluster resource.
+     *     Fabric cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationTypeResourceInner>> getWithResponseAsync(
@@ -249,7 +249,7 @@ private Mono<Response<ApplicationTypeResourceInner>> getWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type name resource created or in the process of being created in the Service
-     *     Fabric cluster resource.
+     *     Fabric cluster resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationTypeResourceInner> getAsync(
@@ -295,7 +295,7 @@ public ApplicationTypeResourceInner get(String resourceGroupName, String cluster
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type name resource created or in the process of being created in the Service
-     *     Fabric cluster resource.
+     *     Fabric cluster resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ApplicationTypeResourceInner> getWithResponse(
@@ -313,7 +313,7 @@ public Response<ApplicationTypeResourceInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application type name resource.
+     * @return the application type name resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationTypeResourceInner>> createOrUpdateWithResponseAsync(
@@ -378,7 +378,7 @@ private Mono<Response<ApplicationTypeResourceInner>> createOrUpdateWithResponseA
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application type name resource.
+     * @return the application type name resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationTypeResourceInner>> createOrUpdateWithResponseAsync(
@@ -440,7 +440,7 @@ private Mono<Response<ApplicationTypeResourceInner>> createOrUpdateWithResponseA
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application type name resource.
+     * @return the application type name resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationTypeResourceInner> createOrUpdateAsync(
@@ -491,7 +491,7 @@ public ApplicationTypeResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application type name resource.
+     * @return the application type name resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ApplicationTypeResourceInner> createOrUpdateWithResponse(
@@ -513,7 +513,7 @@ public Response<ApplicationTypeResourceInner> createOrUpdateWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -568,7 +568,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -619,16 +619,17 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
         String resourceGroupName, String clusterName, String applicationTypeName) {
         Mono<Response<Flux<ByteBuffer>>> mono =
             deleteWithResponseAsync(resourceGroupName, clusterName, applicationTypeName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
@@ -641,9 +642,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
         String resourceGroupName, String clusterName, String applicationTypeName, Context context) {
         context = this.client.mergeContext(context);
@@ -663,9 +664,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationTypeName) {
         return beginDeleteAsync(resourceGroupName, clusterName, applicationTypeName).getSyncPoller();
@@ -681,9 +682,9 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationTypeName, Context context) {
         return beginDeleteAsync(resourceGroupName, clusterName, applicationTypeName, context).getSyncPoller();
@@ -698,7 +699,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, String applicationTypeName) {
@@ -717,7 +718,7 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(
@@ -768,7 +769,7 @@ public void delete(String resourceGroupName, String clusterName, String applicat
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type name resources created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationTypeResourceListInner>> listWithResponseAsync(
@@ -819,7 +820,7 @@ private Mono<Response<ApplicationTypeResourceListInner>> listWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type name resources created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationTypeResourceListInner>> listWithResponseAsync(
@@ -866,7 +867,7 @@ private Mono<Response<ApplicationTypeResourceListInner>> listWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type name resources created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationTypeResourceListInner> listAsync(String resourceGroupName, String clusterName) {
@@ -909,7 +910,7 @@ public ApplicationTypeResourceListInner list(String resourceGroupName, String cl
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type name resources created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ApplicationTypeResourceListInner> listWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationsClientImpl.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationsClientImpl.java
index 75ac636303db..9e31bcd6bb4c 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationsClientImpl.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ApplicationsClientImpl.java
@@ -158,7 +158,7 @@ Mono<Response<ApplicationResourceListInner>> list(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application resource created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationResourceInner>> getWithResponseAsync(
@@ -215,7 +215,7 @@ private Mono<Response<ApplicationResourceInner>> getWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application resource created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationResourceInner>> getWithResponseAsync(
@@ -268,7 +268,7 @@ private Mono<Response<ApplicationResourceInner>> getWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application resource created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationResourceInner> getAsync(
@@ -314,7 +314,7 @@ public ApplicationResourceInner get(String resourceGroupName, String clusterName
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application resource created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ApplicationResourceInner> getWithResponse(
@@ -332,7 +332,7 @@ public Response<ApplicationResourceInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -394,7 +394,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -456,9 +456,9 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginCreateOrUpdateAsync(
         String resourceGroupName, String clusterName, String applicationName, ApplicationResourceInner parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono =
@@ -470,7 +470,7 @@ private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInne
                 this.client.getHttpPipeline(),
                 ApplicationResourceInner.class,
                 ApplicationResourceInner.class,
-                Context.NONE);
+                this.client.getContext());
     }
 
     /**
@@ -484,9 +484,9 @@ private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginCreateOrUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -516,9 +516,9 @@ private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginCreateOrUpdate(
         String resourceGroupName, String clusterName, String applicationName, ApplicationResourceInner parameters) {
         return beginCreateOrUpdateAsync(resourceGroupName, clusterName, applicationName, parameters).getSyncPoller();
@@ -535,9 +535,9 @@ public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -558,7 +558,7 @@ public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationResourceInner> createOrUpdateAsync(
@@ -579,7 +579,7 @@ private Mono<ApplicationResourceInner> createOrUpdateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationResourceInner> createOrUpdateAsync(
@@ -644,7 +644,7 @@ public ApplicationResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
@@ -706,7 +706,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
@@ -768,9 +768,9 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginUpdateAsync(
         String resourceGroupName, String clusterName, String applicationName, ApplicationResourceUpdate parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono =
@@ -782,7 +782,7 @@ private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInne
                 this.client.getHttpPipeline(),
                 ApplicationResourceInner.class,
                 ApplicationResourceInner.class,
-                Context.NONE);
+                this.client.getContext());
     }
 
     /**
@@ -796,9 +796,9 @@ private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -828,9 +828,9 @@ private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginUpdate(
         String resourceGroupName, String clusterName, String applicationName, ApplicationResourceUpdate parameters) {
         return beginUpdateAsync(resourceGroupName, clusterName, applicationName, parameters).getSyncPoller();
@@ -847,9 +847,9 @@ public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -869,7 +869,7 @@ public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationResourceInner> updateAsync(
@@ -890,7 +890,7 @@ private Mono<ApplicationResourceInner> updateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the application resource.
+     * @return the application resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationResourceInner> updateAsync(
@@ -954,7 +954,7 @@ public ApplicationResourceInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -1009,7 +1009,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -1060,16 +1060,17 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
         String resourceGroupName, String clusterName, String applicationName) {
         Mono<Response<Flux<ByteBuffer>>> mono =
             deleteWithResponseAsync(resourceGroupName, clusterName, applicationName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
@@ -1082,9 +1083,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
         String resourceGroupName, String clusterName, String applicationName, Context context) {
         context = this.client.mergeContext(context);
@@ -1104,9 +1105,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationName) {
         return beginDeleteAsync(resourceGroupName, clusterName, applicationName).getSyncPoller();
@@ -1122,9 +1123,9 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationName, Context context) {
         return beginDeleteAsync(resourceGroupName, clusterName, applicationName, context).getSyncPoller();
@@ -1139,7 +1140,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, String applicationName) {
@@ -1158,7 +1159,7 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(
@@ -1208,7 +1209,7 @@ public void delete(String resourceGroupName, String clusterName, String applicat
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application resources created or in the process of being created in the Service Fabric cluster
-     *     resource.
+     *     resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationResourceListInner>> listWithResponseAsync(
@@ -1258,7 +1259,7 @@ private Mono<Response<ApplicationResourceListInner>> listWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application resources created or in the process of being created in the Service Fabric cluster
-     *     resource.
+     *     resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ApplicationResourceListInner>> listWithResponseAsync(
@@ -1304,7 +1305,7 @@ private Mono<Response<ApplicationResourceListInner>> listWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application resources created or in the process of being created in the Service Fabric cluster
-     *     resource.
+     *     resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ApplicationResourceListInner> listAsync(String resourceGroupName, String clusterName) {
@@ -1345,7 +1346,7 @@ public ApplicationResourceListInner list(String resourceGroupName, String cluste
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application resources created or in the process of being created in the Service Fabric cluster
-     *     resource.
+     *     resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ApplicationResourceListInner> listWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClusterVersionsClientImpl.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClusterVersionsClientImpl.java
index c116f5a671e9..0c8a9a911349 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClusterVersionsClientImpl.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClusterVersionsClientImpl.java
@@ -122,7 +122,8 @@ Mono<Response<ClusterCodeVersionsListResultInner>> listByEnvironment(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version.
+     * @return information about an available Service Fabric cluster code version along with {@link Response} on
+     *     successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterCodeVersionsListResultInner>> getWithResponseAsync(
@@ -170,7 +171,8 @@ private Mono<Response<ClusterCodeVersionsListResultInner>> getWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version.
+     * @return information about an available Service Fabric cluster code version along with {@link Response} on
+     *     successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterCodeVersionsListResultInner>> getWithResponseAsync(
@@ -214,7 +216,8 @@ private Mono<Response<ClusterCodeVersionsListResultInner>> getWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version.
+     * @return information about an available Service Fabric cluster code version on successful completion of {@link
+     *     Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ClusterCodeVersionsListResultInner> getAsync(String location, String clusterVersion) {
@@ -253,7 +256,7 @@ public ClusterCodeVersionsListResultInner get(String location, String clusterVer
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version.
+     * @return information about an available Service Fabric cluster code version along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterCodeVersionsListResultInner> getWithResponse(
@@ -270,7 +273,8 @@ public Response<ClusterCodeVersionsListResultInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version by environment.
+     * @return information about an available Service Fabric cluster code version by environment along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterCodeVersionsListResultInner>> getByEnvironmentWithResponseAsync(
@@ -323,7 +327,8 @@ private Mono<Response<ClusterCodeVersionsListResultInner>> getByEnvironmentWithR
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version by environment.
+     * @return information about an available Service Fabric cluster code version by environment along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterCodeVersionsListResultInner>> getByEnvironmentWithResponseAsync(
@@ -372,7 +377,8 @@ private Mono<Response<ClusterCodeVersionsListResultInner>> getByEnvironmentWithR
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version by environment.
+     * @return information about an available Service Fabric cluster code version by environment on successful
+     *     completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ClusterCodeVersionsListResultInner> getByEnvironmentAsync(
@@ -415,7 +421,8 @@ public ClusterCodeVersionsListResultInner getByEnvironment(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version by environment.
+     * @return information about an available Service Fabric cluster code version by environment along with {@link
+     *     Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterCodeVersionsListResultInner> getByEnvironmentWithResponse(
@@ -430,7 +437,8 @@ public Response<ClusterCodeVersionsListResultInner> getByEnvironmentWithResponse
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by location.
+     * @return all available code versions for Service Fabric cluster resources by location along with {@link Response}
+     *     on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterCodeVersionsListResultInner>> listWithResponseAsync(String location) {
@@ -472,7 +480,8 @@ private Mono<Response<ClusterCodeVersionsListResultInner>> listWithResponseAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by location.
+     * @return all available code versions for Service Fabric cluster resources by location along with {@link Response}
+     *     on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterCodeVersionsListResultInner>> listWithResponseAsync(String location, Context context) {
@@ -510,7 +519,8 @@ private Mono<Response<ClusterCodeVersionsListResultInner>> listWithResponseAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by location.
+     * @return all available code versions for Service Fabric cluster resources by location on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ClusterCodeVersionsListResultInner> listAsync(String location) {
@@ -547,7 +557,7 @@ public ClusterCodeVersionsListResultInner list(String location) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by location.
+     * @return all available code versions for Service Fabric cluster resources by location along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterCodeVersionsListResultInner> listWithResponse(String location, Context context) {
@@ -562,7 +572,8 @@ public Response<ClusterCodeVersionsListResultInner> listWithResponse(String loca
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by environment.
+     * @return all available code versions for Service Fabric cluster resources by environment along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterCodeVersionsListResultInner>> listByEnvironmentWithResponseAsync(
@@ -610,7 +621,8 @@ private Mono<Response<ClusterCodeVersionsListResultInner>> listByEnvironmentWith
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by environment.
+     * @return all available code versions for Service Fabric cluster resources by environment along with {@link
+     *     Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterCodeVersionsListResultInner>> listByEnvironmentWithResponseAsync(
@@ -654,7 +666,8 @@ private Mono<Response<ClusterCodeVersionsListResultInner>> listByEnvironmentWith
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by environment.
+     * @return all available code versions for Service Fabric cluster resources by environment on successful completion
+     *     of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ClusterCodeVersionsListResultInner> listByEnvironmentAsync(
@@ -695,7 +708,8 @@ public ClusterCodeVersionsListResultInner listByEnvironment(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by environment.
+     * @return all available code versions for Service Fabric cluster resources by environment along with {@link
+     *     Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterCodeVersionsListResultInner> listByEnvironmentWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClustersClientImpl.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClustersClientImpl.java
index 993c0e356f67..7058fc6b0d73 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClustersClientImpl.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClustersClientImpl.java
@@ -180,7 +180,7 @@ Mono<Response<UpgradableVersionPathResultInner>> listUpgradableVersions(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric cluster resource created or in the process of being created in the specified resource
-     *     group.
+     *     group along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterInner>> getByResourceGroupWithResponseAsync(
@@ -230,7 +230,7 @@ private Mono<Response<ClusterInner>> getByResourceGroupWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric cluster resource created or in the process of being created in the specified resource
-     *     group.
+     *     group along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterInner>> getByResourceGroupWithResponseAsync(
@@ -276,7 +276,7 @@ private Mono<Response<ClusterInner>> getByResourceGroupWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric cluster resource created or in the process of being created in the specified resource
-     *     group.
+     *     group on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ClusterInner> getByResourceGroupAsync(String resourceGroupName, String clusterName) {
@@ -317,7 +317,7 @@ public ClusterInner getByResourceGroup(String resourceGroupName, String clusterN
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric cluster resource created or in the process of being created in the specified resource
-     *     group.
+     *     group along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterInner> getByResourceGroupWithResponse(
@@ -334,7 +334,7 @@ public Response<ClusterInner> getByResourceGroupWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -390,7 +390,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -442,9 +442,9 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdateAsync(
         String resourceGroupName, String clusterName, ClusterInner parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono =
@@ -452,7 +452,7 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdateAs
         return this
             .client
             .<ClusterInner, ClusterInner>getLroResult(
-                mono, this.client.getHttpPipeline(), ClusterInner.class, ClusterInner.class, Context.NONE);
+                mono, this.client.getHttpPipeline(), ClusterInner.class, ClusterInner.class, this.client.getContext());
     }
 
     /**
@@ -465,9 +465,9 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdateAs
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdateAsync(
         String resourceGroupName, String clusterName, ClusterInner parameters, Context context) {
         context = this.client.mergeContext(context);
@@ -488,9 +488,9 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdateAs
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
         String resourceGroupName, String clusterName, ClusterInner parameters) {
         return beginCreateOrUpdateAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
@@ -506,9 +506,9 @@ public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
         String resourceGroupName, String clusterName, ClusterInner parameters, Context context) {
         return beginCreateOrUpdateAsync(resourceGroupName, clusterName, parameters, context).getSyncPoller();
@@ -523,7 +523,7 @@ public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ClusterInner> createOrUpdateAsync(
@@ -543,7 +543,7 @@ private Mono<ClusterInner> createOrUpdateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ClusterInner> createOrUpdateAsync(
@@ -597,7 +597,7 @@ public ClusterInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
@@ -654,7 +654,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
@@ -707,16 +707,16 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginUpdateAsync(
         String resourceGroupName, String clusterName, ClusterUpdateParameters parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono = updateWithResponseAsync(resourceGroupName, clusterName, parameters);
         return this
             .client
             .<ClusterInner, ClusterInner>getLroResult(
-                mono, this.client.getHttpPipeline(), ClusterInner.class, ClusterInner.class, Context.NONE);
+                mono, this.client.getHttpPipeline(), ClusterInner.class, ClusterInner.class, this.client.getContext());
     }
 
     /**
@@ -730,9 +730,9 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginUpdateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginUpdateAsync(
         String resourceGroupName, String clusterName, ClusterUpdateParameters parameters, Context context) {
         context = this.client.mergeContext(context);
@@ -754,9 +754,9 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginUpdateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(
         String resourceGroupName, String clusterName, ClusterUpdateParameters parameters) {
         return beginUpdateAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
@@ -773,9 +773,9 @@ public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(
         String resourceGroupName, String clusterName, ClusterUpdateParameters parameters, Context context) {
         return beginUpdateAsync(resourceGroupName, clusterName, parameters, context).getSyncPoller();
@@ -791,7 +791,7 @@ public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ClusterInner> updateAsync(
@@ -812,7 +812,7 @@ private Mono<ClusterInner> updateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the cluster resource.
+     * @return the cluster resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ClusterInner> updateAsync(
@@ -866,7 +866,7 @@ public ClusterInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, String clusterName) {
@@ -914,7 +914,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Void>> deleteWithResponseAsync(
@@ -959,7 +959,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(String resourceGroupName, String clusterName) {
@@ -989,7 +989,7 @@ public void delete(String resourceGroupName, String clusterName) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response.
+     * @return the {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<Void> deleteWithResponse(String resourceGroupName, String clusterName, Context context) {
@@ -1003,7 +1003,8 @@ public Response<Void> deleteWithResponse(String resourceGroupName, String cluste
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the resource group.
+     * @return all Service Fabric cluster resources created or in the process of being created in the resource group
+     *     along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterListResultInner>> listByResourceGroupWithResponseAsync(String resourceGroupName) {
@@ -1046,7 +1047,8 @@ private Mono<Response<ClusterListResultInner>> listByResourceGroupWithResponseAs
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the resource group.
+     * @return all Service Fabric cluster resources created or in the process of being created in the resource group
+     *     along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterListResultInner>> listByResourceGroupWithResponseAsync(
@@ -1086,7 +1088,8 @@ private Mono<Response<ClusterListResultInner>> listByResourceGroupWithResponseAs
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the resource group.
+     * @return all Service Fabric cluster resources created or in the process of being created in the resource group on
+     *     successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ClusterListResultInner> listByResourceGroupAsync(String resourceGroupName) {
@@ -1123,7 +1126,8 @@ public ClusterListResultInner listByResourceGroup(String resourceGroupName) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the resource group.
+     * @return all Service Fabric cluster resources created or in the process of being created in the resource group
+     *     along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterListResultInner> listByResourceGroupWithResponse(String resourceGroupName, Context context) {
@@ -1135,7 +1139,8 @@ public Response<ClusterListResultInner> listByResourceGroupWithResponse(String r
      *
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the subscription.
+     * @return all Service Fabric cluster resources created or in the process of being created in the subscription along
+     *     with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterListResultInner>> listWithResponseAsync() {
@@ -1172,7 +1177,8 @@ private Mono<Response<ClusterListResultInner>> listWithResponseAsync() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the subscription.
+     * @return all Service Fabric cluster resources created or in the process of being created in the subscription along
+     *     with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ClusterListResultInner>> listWithResponseAsync(Context context) {
@@ -1204,7 +1210,8 @@ private Mono<Response<ClusterListResultInner>> listWithResponseAsync(Context con
      *
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the subscription.
+     * @return all Service Fabric cluster resources created or in the process of being created in the subscription on
+     *     successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ClusterListResultInner> listAsync() {
@@ -1238,7 +1245,8 @@ public ClusterListResultInner list() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the subscription.
+     * @return all Service Fabric cluster resources created or in the process of being created in the subscription along
+     *     with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterListResultInner> listWithResponse(Context context) {
@@ -1256,7 +1264,8 @@ public Response<ClusterListResultInner> listWithResponse(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of intermediate cluster code versions for an upgrade or downgrade.
+     * @return the list of intermediate cluster code versions for an upgrade or downgrade along with {@link Response} on
+     *     successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<UpgradableVersionPathResultInner>> listUpgradableVersionsWithResponseAsync(
@@ -1312,7 +1321,8 @@ private Mono<Response<UpgradableVersionPathResultInner>> listUpgradableVersionsW
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of intermediate cluster code versions for an upgrade or downgrade.
+     * @return the list of intermediate cluster code versions for an upgrade or downgrade along with {@link Response} on
+     *     successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<UpgradableVersionPathResultInner>> listUpgradableVersionsWithResponseAsync(
@@ -1367,7 +1377,8 @@ private Mono<Response<UpgradableVersionPathResultInner>> listUpgradableVersionsW
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of intermediate cluster code versions for an upgrade or downgrade.
+     * @return the list of intermediate cluster code versions for an upgrade or downgrade on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<UpgradableVersionPathResultInner> listUpgradableVersionsAsync(
@@ -1393,7 +1404,8 @@ private Mono<UpgradableVersionPathResultInner> listUpgradableVersionsAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of intermediate cluster code versions for an upgrade or downgrade.
+     * @return the list of intermediate cluster code versions for an upgrade or downgrade on successful completion of
+     *     {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<UpgradableVersionPathResultInner> listUpgradableVersionsAsync(
@@ -1440,7 +1452,7 @@ public UpgradableVersionPathResultInner listUpgradableVersions(String resourceGr
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of intermediate cluster code versions for an upgrade or downgrade.
+     * @return the list of intermediate cluster code versions for an upgrade or downgrade along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<UpgradableVersionPathResultInner> listUpgradableVersionsWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClustersImpl.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClustersImpl.java
index c402ca8028e0..6d8cdfe04ff7 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClustersImpl.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ClustersImpl.java
@@ -193,7 +193,7 @@ public void deleteById(String id) {
                     new IllegalArgumentException(
                         String.format("The resource ID '%s' is not valid. Missing path segment 'clusters'.", id)));
         }
-        this.deleteWithResponse(resourceGroupName, clusterName, Context.NONE).getValue();
+        this.deleteWithResponse(resourceGroupName, clusterName, Context.NONE);
     }
 
     public Response<Void> deleteByIdWithResponse(String id, Context context) {
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/OperationsClientImpl.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/OperationsClientImpl.java
index 6a77db5cd69c..e26442973f55 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/OperationsClientImpl.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/OperationsClientImpl.java
@@ -85,7 +85,8 @@ Mono<Response<OperationListResult>> listNext(
      *
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of available Service Fabric resource provider API operations.
+     * @return the list of available Service Fabric resource provider API operations along with {@link PagedResponse} on
+     *     successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<OperationResultInner>> listSinglePageAsync() {
@@ -118,7 +119,8 @@ private Mono<PagedResponse<OperationResultInner>> listSinglePageAsync() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of available Service Fabric resource provider API operations.
+     * @return the list of available Service Fabric resource provider API operations along with {@link PagedResponse} on
+     *     successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<OperationResultInner>> listSinglePageAsync(Context context) {
@@ -203,7 +205,8 @@ public PagedIterable<OperationResultInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes the result of the request to list Service Fabric resource provider operations.
+     * @return describes the result of the request to list Service Fabric resource provider operations along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<OperationResultInner>> listNextSinglePageAsync(String nextLink) {
@@ -239,7 +242,8 @@ private Mono<PagedResponse<OperationResultInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes the result of the request to list Service Fabric resource provider operations.
+     * @return describes the result of the request to list Service Fabric resource provider operations along with {@link
+     *     PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<OperationResultInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ServicesClientImpl.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ServicesClientImpl.java
index 0969bee7b4c4..2946fe6172f4 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ServicesClientImpl.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/implementation/ServicesClientImpl.java
@@ -163,7 +163,7 @@ Mono<Response<ServiceResourceListInner>> list(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric service resource created or in the process of being created in the Service Fabric
-     *     application resource.
+     *     application resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ServiceResourceInner>> getWithResponseAsync(
@@ -225,7 +225,7 @@ private Mono<Response<ServiceResourceInner>> getWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric service resource created or in the process of being created in the Service Fabric
-     *     application resource.
+     *     application resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ServiceResourceInner>> getWithResponseAsync(
@@ -283,7 +283,7 @@ private Mono<Response<ServiceResourceInner>> getWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric service resource created or in the process of being created in the Service Fabric
-     *     application resource.
+     *     application resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ServiceResourceInner> getAsync(
@@ -332,7 +332,7 @@ public ServiceResourceInner get(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric service resource created or in the process of being created in the Service Fabric
-     *     application resource.
+     *     application resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ServiceResourceInner> getWithResponse(
@@ -351,7 +351,7 @@ public Response<ServiceResourceInner> getWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -422,7 +422,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
@@ -490,9 +490,9 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -508,7 +508,7 @@ private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> begin
                 this.client.getHttpPipeline(),
                 ServiceResourceInner.class,
                 ServiceResourceInner.class,
-                Context.NONE);
+                this.client.getContext());
     }
 
     /**
@@ -523,9 +523,9 @@ private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> begin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -554,9 +554,9 @@ private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> begin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -579,9 +579,9 @@ public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginC
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -605,7 +605,7 @@ public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginC
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ServiceResourceInner> createOrUpdateAsync(
@@ -631,7 +631,7 @@ private Mono<ServiceResourceInner> createOrUpdateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ServiceResourceInner> createOrUpdateAsync(
@@ -707,7 +707,7 @@ public ServiceResourceInner createOrUpdate(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
@@ -778,7 +778,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
@@ -846,9 +846,9 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -864,7 +864,7 @@ private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> begin
                 this.client.getHttpPipeline(),
                 ServiceResourceInner.class,
                 ServiceResourceInner.class,
-                Context.NONE);
+                this.client.getContext());
     }
 
     /**
@@ -879,9 +879,9 @@ private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> begin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -909,9 +909,9 @@ private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> begin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -934,9 +934,9 @@ public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginU
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource along with {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -959,7 +959,7 @@ public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginU
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ServiceResourceInner> updateAsync(
@@ -985,7 +985,7 @@ private Mono<ServiceResourceInner> updateAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the service resource.
+     * @return the service resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ServiceResourceInner> updateAsync(
@@ -1058,7 +1058,7 @@ public ServiceResourceInner update(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -1118,7 +1118,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
@@ -1174,16 +1174,17 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
         String resourceGroupName, String clusterName, String applicationName, String serviceName) {
         Mono<Response<Flux<ByteBuffer>>> mono =
             deleteWithResponseAsync(resourceGroupName, clusterName, applicationName, serviceName);
         return this
             .client
-            .<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+            .<Void, Void>getLroResult(
+                mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
     }
 
     /**
@@ -1197,9 +1198,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
         String resourceGroupName, String clusterName, String applicationName, String serviceName, Context context) {
         context = this.client.mergeContext(context);
@@ -1220,9 +1221,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationName, String serviceName) {
         return beginDeleteAsync(resourceGroupName, clusterName, applicationName, serviceName).getSyncPoller();
@@ -1239,9 +1240,9 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationName, String serviceName, Context context) {
         return beginDeleteAsync(resourceGroupName, clusterName, applicationName, serviceName, context).getSyncPoller();
@@ -1257,7 +1258,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(
@@ -1278,7 +1279,7 @@ private Mono<Void> deleteAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the completion.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> deleteAsync(
@@ -1332,7 +1333,7 @@ public void delete(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all service resources created or in the process of being created in the Service Fabric application
-     *     resource.
+     *     resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ServiceResourceListInner>> listWithResponseAsync(
@@ -1388,7 +1389,7 @@ private Mono<Response<ServiceResourceListInner>> listWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all service resources created or in the process of being created in the Service Fabric application
-     *     resource.
+     *     resource along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<ServiceResourceListInner>> listWithResponseAsync(
@@ -1440,7 +1441,7 @@ private Mono<Response<ServiceResourceListInner>> listWithResponseAsync(
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all service resources created or in the process of being created in the Service Fabric application
-     *     resource.
+     *     resource on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<ServiceResourceListInner> listAsync(
@@ -1484,7 +1485,7 @@ public ServiceResourceListInner list(String resourceGroupName, String clusterNam
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all service resources created or in the process of being created in the Service Fabric application
-     *     resource.
+     *     resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ServiceResourceListInner> listWithResponse(
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ApplicationTypeVersions.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ApplicationTypeVersions.java
index c49a0cef773e..76ebd0412b32 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ApplicationTypeVersions.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ApplicationTypeVersions.java
@@ -39,7 +39,7 @@ ApplicationTypeVersionResource get(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type version resource created or in the process of being created in the
-     *     Service Fabric application type name resource.
+     *     Service Fabric application type name resource along with {@link Response}.
      */
     Response<ApplicationTypeVersionResource> getWithResponse(
         String resourceGroupName, String clusterName, String applicationTypeName, String version, Context context);
@@ -99,7 +99,7 @@ void delete(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type version resources created or in the process of being created in the Service Fabric
-     *     application type name resource.
+     *     application type name resource along with {@link Response}.
      */
     Response<ApplicationTypeVersionResourceList> listWithResponse(
         String resourceGroupName, String clusterName, String applicationTypeName, Context context);
@@ -113,7 +113,7 @@ Response<ApplicationTypeVersionResourceList> listWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type version resource created or in the process of being created in the
-     *     Service Fabric application type name resource.
+     *     Service Fabric application type name resource along with {@link Response}.
      */
     ApplicationTypeVersionResource getById(String id);
 
@@ -127,7 +127,7 @@ Response<ApplicationTypeVersionResourceList> listWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type version resource created or in the process of being created in the
-     *     Service Fabric application type name resource.
+     *     Service Fabric application type name resource along with {@link Response}.
      */
     Response<ApplicationTypeVersionResource> getByIdWithResponse(String id, Context context);
 
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ApplicationTypes.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ApplicationTypes.java
index 51efe6cff545..770ec51feebe 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ApplicationTypes.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ApplicationTypes.java
@@ -36,7 +36,7 @@ public interface ApplicationTypes {
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type name resource created or in the process of being created in the Service
-     *     Fabric cluster resource.
+     *     Fabric cluster resource along with {@link Response}.
      */
     Response<ApplicationTypeResource> getWithResponse(
         String resourceGroupName, String clusterName, String applicationTypeName, Context context);
@@ -91,7 +91,7 @@ Response<ApplicationTypeResource> getWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application type name resources created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response}.
      */
     Response<ApplicationTypeResourceList> listWithResponse(
         String resourceGroupName, String clusterName, Context context);
@@ -105,7 +105,7 @@ Response<ApplicationTypeResourceList> listWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type name resource created or in the process of being created in the Service
-     *     Fabric cluster resource.
+     *     Fabric cluster resource along with {@link Response}.
      */
     ApplicationTypeResource getById(String id);
 
@@ -119,7 +119,7 @@ Response<ApplicationTypeResourceList> listWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application type name resource created or in the process of being created in the Service
-     *     Fabric cluster resource.
+     *     Fabric cluster resource along with {@link Response}.
      */
     Response<ApplicationTypeResource> getByIdWithResponse(String id, Context context);
 
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Applications.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Applications.java
index 6cad51a2502c..67e1bd53dcce 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Applications.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Applications.java
@@ -36,7 +36,7 @@ public interface Applications {
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application resource created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response}.
      */
     Response<ApplicationResource> getWithResponse(
         String resourceGroupName, String clusterName, String applicationName, Context context);
@@ -89,7 +89,7 @@ Response<ApplicationResource> getWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all application resources created or in the process of being created in the Service Fabric cluster
-     *     resource.
+     *     resource along with {@link Response}.
      */
     Response<ApplicationResourceList> listWithResponse(String resourceGroupName, String clusterName, Context context);
 
@@ -102,7 +102,7 @@ Response<ApplicationResource> getWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application resource created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response}.
      */
     ApplicationResource getById(String id);
 
@@ -116,7 +116,7 @@ Response<ApplicationResource> getWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric application resource created or in the process of being created in the Service Fabric
-     *     cluster resource.
+     *     cluster resource along with {@link Response}.
      */
     Response<ApplicationResource> getByIdWithResponse(String id, Context context);
 
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Cluster.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Cluster.java
index d7f8af757635..f24cf4e49bc6 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Cluster.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Cluster.java
@@ -1140,7 +1140,7 @@ interface WithNotifications {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of intermediate cluster code versions for an upgrade or downgrade.
+     * @return the list of intermediate cluster code versions for an upgrade or downgrade along with {@link Response}.
      */
     Response<UpgradableVersionPathResult> listUpgradableVersionsWithResponse(
         UpgradableVersionsDescription versionsDescription, Context context);
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ClusterVersions.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ClusterVersions.java
index c3c488dd0a38..69c50aa2ab1d 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ClusterVersions.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/ClusterVersions.java
@@ -30,7 +30,7 @@ public interface ClusterVersions {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version.
+     * @return information about an available Service Fabric cluster code version along with {@link Response}.
      */
     Response<ClusterCodeVersionsListResult> getWithResponse(String location, String clusterVersion, Context context);
 
@@ -58,7 +58,8 @@ ClusterCodeVersionsListResult getByEnvironment(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about an available Service Fabric cluster code version by environment.
+     * @return information about an available Service Fabric cluster code version by environment along with {@link
+     *     Response}.
      */
     Response<ClusterCodeVersionsListResult> getByEnvironmentWithResponse(
         String location, ClusterVersionsEnvironment environment, String clusterVersion, Context context);
@@ -82,7 +83,7 @@ Response<ClusterCodeVersionsListResult> getByEnvironmentWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by location.
+     * @return all available code versions for Service Fabric cluster resources by location along with {@link Response}.
      */
     Response<ClusterCodeVersionsListResult> listWithResponse(String location, Context context);
 
@@ -107,7 +108,8 @@ Response<ClusterCodeVersionsListResult> getByEnvironmentWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all available code versions for Service Fabric cluster resources by environment.
+     * @return all available code versions for Service Fabric cluster resources by environment along with {@link
+     *     Response}.
      */
     Response<ClusterCodeVersionsListResult> listByEnvironmentWithResponse(
         String location, ClusterVersionsEnvironment environment, Context context);
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Clusters.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Clusters.java
index 58f7b87f76cb..3a5b87272eae 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Clusters.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Clusters.java
@@ -32,7 +32,7 @@ public interface Clusters {
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric cluster resource created or in the process of being created in the specified resource
-     *     group.
+     *     group along with {@link Response}.
      */
     Response<Cluster> getByResourceGroupWithResponse(String resourceGroupName, String clusterName, Context context);
 
@@ -56,7 +56,7 @@ public interface Clusters {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response.
+     * @return the {@link Response}.
      */
     Response<Void> deleteWithResponse(String resourceGroupName, String clusterName, Context context);
 
@@ -79,7 +79,8 @@ public interface Clusters {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the resource group.
+     * @return all Service Fabric cluster resources created or in the process of being created in the resource group
+     *     along with {@link Response}.
      */
     Response<ClusterListResult> listByResourceGroupWithResponse(String resourceGroupName, Context context);
 
@@ -99,7 +100,8 @@ public interface Clusters {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all Service Fabric cluster resources created or in the process of being created in the subscription.
+     * @return all Service Fabric cluster resources created or in the process of being created in the subscription along
+     *     with {@link Response}.
      */
     Response<ClusterListResult> listWithResponse(Context context);
 
@@ -129,7 +131,7 @@ public interface Clusters {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of intermediate cluster code versions for an upgrade or downgrade.
+     * @return the list of intermediate cluster code versions for an upgrade or downgrade along with {@link Response}.
      */
     Response<UpgradableVersionPathResult> listUpgradableVersionsWithResponse(
         String resourceGroupName,
@@ -145,7 +147,7 @@ Response<UpgradableVersionPathResult> listUpgradableVersionsWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric cluster resource created or in the process of being created in the specified resource
-     *     group.
+     *     group along with {@link Response}.
      */
     Cluster getById(String id);
 
@@ -158,7 +160,7 @@ Response<UpgradableVersionPathResult> listUpgradableVersionsWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric cluster resource created or in the process of being created in the specified resource
-     *     group.
+     *     group along with {@link Response}.
      */
     Response<Cluster> getByIdWithResponse(String id, Context context);
 
@@ -180,7 +182,7 @@ Response<UpgradableVersionPathResult> listUpgradableVersionsWithResponse(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response.
+     * @return the {@link Response}.
      */
     Response<Void> deleteByIdWithResponse(String id, Context context);
 
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Services.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Services.java
index e583b89bd2c7..8eb70eb8c77d 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Services.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/Services.java
@@ -38,7 +38,7 @@ public interface Services {
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric service resource created or in the process of being created in the Service Fabric
-     *     application resource.
+     *     application resource along with {@link Response}.
      */
     Response<ServiceResource> getWithResponse(
         String resourceGroupName, String clusterName, String applicationName, String serviceName, Context context);
@@ -96,7 +96,7 @@ void delete(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return all service resources created or in the process of being created in the Service Fabric application
-     *     resource.
+     *     resource along with {@link Response}.
      */
     Response<ServiceResourceList> listWithResponse(
         String resourceGroupName, String clusterName, String applicationName, Context context);
@@ -110,7 +110,7 @@ Response<ServiceResourceList> listWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric service resource created or in the process of being created in the Service Fabric
-     *     application resource.
+     *     application resource along with {@link Response}.
      */
     ServiceResource getById(String id);
 
@@ -124,7 +124,7 @@ Response<ServiceResourceList> listWithResponse(
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return a Service Fabric service resource created or in the process of being created in the Service Fabric
-     *     application resource.
+     *     application resource along with {@link Response}.
      */
     Response<ServiceResource> getByIdWithResponse(String id, Context context);
 
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/StatelessServiceProperties.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/StatelessServiceProperties.java
index ff0b74ac14d6..830e25ac543c 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/StatelessServiceProperties.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/StatelessServiceProperties.java
@@ -32,9 +32,7 @@ public final class StatelessServiceProperties extends ServiceResourceProperties
      * prior to closing the instance. This delay enables existing requests to
      * drain gracefully before the instance actually goes down
      * (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview).
-     * It is first interpreted as a string representing an ISO 8601 duration.
-     * If that fails, then it is interpreted as a number representing the total
-     * number of milliseconds.
+     * It is represented in ISO 8601 format (hh:mm:ss.s).
      */
     @JsonProperty(value = "instanceCloseDelayDuration")
     private String instanceCloseDelayDuration;
@@ -64,8 +62,7 @@ public StatelessServiceProperties withInstanceCount(Integer instanceCount) {
      * advertised by the stateless instance is removed before the delay starts prior to closing the instance. This delay
      * enables existing requests to drain gracefully before the instance actually goes down
      * (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview).
-     * It is first interpreted as a string representing an ISO 8601 duration. If that fails, then it is interpreted as a
-     * number representing the total number of milliseconds.
+     * It is represented in ISO 8601 format (hh:mm:ss.s).
      *
      * @return the instanceCloseDelayDuration value.
      */
@@ -78,8 +75,7 @@ public String instanceCloseDelayDuration() {
      * advertised by the stateless instance is removed before the delay starts prior to closing the instance. This delay
      * enables existing requests to drain gracefully before the instance actually goes down
      * (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview).
-     * It is first interpreted as a string representing an ISO 8601 duration. If that fails, then it is interpreted as a
-     * number representing the total number of milliseconds.
+     * It is represented in ISO 8601 format (hh:mm:ss.s).
      *
      * @param instanceCloseDelayDuration the instanceCloseDelayDuration value to set.
      * @return the StatelessServiceProperties object itself.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/StatelessServiceUpdateProperties.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/StatelessServiceUpdateProperties.java
index 8b83ea9f2ae2..64d60ffb1469 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/StatelessServiceUpdateProperties.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/main/java/com/azure/resourcemanager/servicefabric/models/StatelessServiceUpdateProperties.java
@@ -33,8 +33,7 @@ public final class StatelessServiceUpdateProperties extends ServiceResourceUpdat
      * drain gracefully before the instance actually goes down
      * (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview).
      * It is first interpreted as a string representing an ISO 8601 duration.
-     * If that fails, then it is interpreted as a number representing the total
-     * number of milliseconds.
+     * It is represented in ISO 8601 format (hh:mm:ss.s).
      */
     @JsonProperty(value = "instanceCloseDelayDuration")
     private String instanceCloseDelayDuration;
@@ -64,8 +63,8 @@ public StatelessServiceUpdateProperties withInstanceCount(Integer instanceCount)
      * advertised by the stateless instance is removed before the delay starts prior to closing the instance. This delay
      * enables existing requests to drain gracefully before the instance actually goes down
      * (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview).
-     * It is first interpreted as a string representing an ISO 8601 duration. If that fails, then it is interpreted as a
-     * number representing the total number of milliseconds.
+     * It is first interpreted as a string representing an ISO 8601 duration. It is represented in ISO 8601 format
+     * (hh:mm:ss.s).
      *
      * @return the instanceCloseDelayDuration value.
      */
@@ -78,8 +77,8 @@ public String instanceCloseDelayDuration() {
      * advertised by the stateless instance is removed before the delay starts prior to closing the instance. This delay
      * enables existing requests to drain gracefully before the instance actually goes down
      * (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview).
-     * It is first interpreted as a string representing an ISO 8601 duration. If that fails, then it is interpreted as a
-     * number representing the total number of milliseconds.
+     * It is first interpreted as a string representing an ISO 8601 duration. It is represented in ISO 8601 format
+     * (hh:mm:ss.s).
      *
      * @param instanceCloseDelayDuration the instanceCloseDelayDuration value to set.
      * @return the StatelessServiceUpdateProperties object itself.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsCreateOrUpdateSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsCreateOrUpdateSamples.java
similarity index 84%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsCreateOrUpdateSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsCreateOrUpdateSamples.java
index c7bbce9a8fbd..a9ea7063babd 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsCreateOrUpdateSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsCreateOrUpdateSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,9 +10,7 @@
 /** Samples for ApplicationTypeVersions CreateOrUpdate. */
 public final class ApplicationTypeVersionsCreateOrUpdateSamples {
     /*
-     * operationId: ApplicationTypeVersions_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put an application type version
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeVersionPutOperation_example.json
      */
     /**
      * Sample code: Put an application type version.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsDeleteSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsDeleteSamples.java
similarity index 75%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsDeleteSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsDeleteSamples.java
index c7860305b9eb..750eb3e3dfb0 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsDeleteSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsDeleteSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for ApplicationTypeVersions Delete. */
 public final class ApplicationTypeVersionsDeleteSamples {
     /*
-     * operationId: ApplicationTypeVersions_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete an application type version
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeVersionDeleteOperation_example.json
      */
     /**
      * Sample code: Delete an application type version.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsGetSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsGetSamples.java
similarity index 75%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsGetSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsGetSamples.java
index bc9d95f17209..6d06ae8242b5 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsGetSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsGetSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for ApplicationTypeVersions Get. */
 public final class ApplicationTypeVersionsGetSamples {
     /*
-     * operationId: ApplicationTypeVersions_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get an application type version
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeVersionGetOperation_example.json
      */
     /**
      * Sample code: Get an application type version.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsListSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsListSamples.java
similarity index 75%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsListSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsListSamples.java
index 6dc0dded4a3e..e39b632f50e8 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypeVersionsListSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypeVersionsListSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for ApplicationTypeVersions List. */
 public final class ApplicationTypeVersionsListSamples {
     /*
-     * operationId: ApplicationTypeVersions_List
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a list of application type version resources
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeVersionListOperation_example.json
      */
     /**
      * Sample code: Get a list of application type version resources.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesCreateOrUpdateSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesCreateOrUpdateSamples.java
similarity index 83%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesCreateOrUpdateSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesCreateOrUpdateSamples.java
index 1634989812db..6e2c8eed9a49 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesCreateOrUpdateSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesCreateOrUpdateSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,9 +10,7 @@
 /** Samples for ApplicationTypes CreateOrUpdate. */
 public final class ApplicationTypesCreateOrUpdateSamples {
     /*
-     * operationId: ApplicationTypes_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put an application type
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeNamePutOperation_example.json
      */
     /**
      * Sample code: Put an application type.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesDeleteSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesDeleteSamples.java
similarity index 73%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesDeleteSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesDeleteSamples.java
index 9fbd734b0b39..620523113654 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesDeleteSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesDeleteSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for ApplicationTypes Delete. */
 public final class ApplicationTypesDeleteSamples {
     /*
-     * operationId: ApplicationTypes_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete an application type
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeNameDeleteOperation_example.json
      */
     /**
      * Sample code: Delete an application type.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesGetSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesGetSamples.java
similarity index 74%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesGetSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesGetSamples.java
index 85e6a0eec950..46400a1a7108 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesGetSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesGetSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for ApplicationTypes Get. */
 public final class ApplicationTypesGetSamples {
     /*
-     * operationId: ApplicationTypes_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get an application type
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeNameGetOperation_example.json
      */
     /**
      * Sample code: Get an application type.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesListSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesListSamples.java
similarity index 75%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesListSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesListSamples.java
index bcefac0a122e..7abdeefe766c 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationTypesListSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationTypesListSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for ApplicationTypes List. */
 public final class ApplicationTypesListSamples {
     /*
-     * operationId: ApplicationTypes_List
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a list of application type name resources
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationTypeNameListOperation_example.json
      */
     /**
      * Sample code: Get a list of application type name resources.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsCreateOrUpdateSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsCreateOrUpdateSamples.java
similarity index 90%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsCreateOrUpdateSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsCreateOrUpdateSamples.java
index 09334e7c2bfc..00a32e911a9e 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsCreateOrUpdateSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsCreateOrUpdateSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.resourcemanager.servicefabric.models.ApplicationMetricDescription;
 import com.azure.resourcemanager.servicefabric.models.ApplicationUpgradePolicy;
@@ -18,9 +18,7 @@
 /** Samples for Applications CreateOrUpdate. */
 public final class ApplicationsCreateOrUpdateSamples {
     /*
-     * operationId: Applications_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put an application with maximum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationPutOperation_example_max.json
      */
     /**
      * Sample code: Put an application with maximum parameters.
@@ -74,9 +72,7 @@ public static void putAnApplicationWithMaximumParameters(
     }
 
     /*
-     * operationId: Applications_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put an application with minimum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationPutOperation_example_min.json
      */
     /**
      * Sample code: Put an application with minimum parameters.
@@ -98,9 +94,7 @@ public static void putAnApplicationWithMinimumParameters(
     }
 
     /*
-     * operationId: Applications_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put an application with recreate option
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationPutOperation_recreate_example.json
      */
     /**
      * Sample code: Put an application with recreate option.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsDeleteSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsDeleteSamples.java
similarity index 73%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsDeleteSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsDeleteSamples.java
index 7e05d287aa4a..68f711ca7e8a 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsDeleteSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsDeleteSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Applications Delete. */
 public final class ApplicationsDeleteSamples {
     /*
-     * operationId: Applications_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete an application
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationDeleteOperation_example.json
      */
     /**
      * Sample code: Delete an application.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsGetSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsGetSamples.java
similarity index 74%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsGetSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsGetSamples.java
index 29d88bd25167..e6cacbd86d10 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsGetSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsGetSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Applications Get. */
 public final class ApplicationsGetSamples {
     /*
-     * operationId: Applications_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get an application
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationGetOperation_example.json
      */
     /**
      * Sample code: Get an application.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsListSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsListSamples.java
similarity index 75%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsListSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsListSamples.java
index 07685a2bf5e1..5a7a9c7b1da7 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsListSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsListSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Applications List. */
 public final class ApplicationsListSamples {
     /*
-     * operationId: Applications_List
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a list of application resources
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationListOperation_example.json
      */
     /**
      * Sample code: Get a list of application resources.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsUpdateSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsUpdateSamples.java
similarity index 86%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsUpdateSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsUpdateSamples.java
index 6e90a78d85bc..0b596291413c 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ApplicationsUpdateSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ApplicationsUpdateSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.servicefabric.models.ApplicationMetricDescription;
@@ -12,9 +12,7 @@
 /** Samples for Applications Update. */
 public final class ApplicationsUpdateSamples {
     /*
-     * operationId: Applications_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: Patch an application
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ApplicationPatchOperation_example.json
      */
     /**
      * Sample code: Patch an application.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsGetByEnvironmentSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsGetByEnvironmentSamples.java
similarity index 78%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsGetByEnvironmentSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsGetByEnvironmentSamples.java
index b95b6df9b85a..d41ac6b89ec2 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsGetByEnvironmentSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsGetByEnvironmentSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.servicefabric.models.ClusterVersionsEnvironment;
@@ -10,9 +10,7 @@
 /** Samples for ClusterVersions GetByEnvironment. */
 public final class ClusterVersionsGetByEnvironmentSamples {
     /*
-     * operationId: ClusterVersions_GetByEnvironment
-     * api-version: 2021-06-01
-     * x-ms-examples: Get cluster version by environment
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterVersionsGetByEnvironment_example.json
      */
     /**
      * Sample code: Get cluster version by environment.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsGetSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsGetSamples.java
similarity index 74%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsGetSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsGetSamples.java
index 91868c6ce2b4..2ad08e7daa71 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsGetSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsGetSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for ClusterVersions Get. */
 public final class ClusterVersionsGetSamples {
     /*
-     * operationId: ClusterVersions_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get cluster version
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterVersionsGet_example.json
      */
     /**
      * Sample code: Get cluster version.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsListByEnvironmentSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsListByEnvironmentSamples.java
similarity index 79%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsListByEnvironmentSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsListByEnvironmentSamples.java
index 56cfc30749dc..384f986f546e 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsListByEnvironmentSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsListByEnvironmentSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.servicefabric.models.ClusterVersionsEnvironment;
@@ -10,9 +10,7 @@
 /** Samples for ClusterVersions ListByEnvironment. */
 public final class ClusterVersionsListByEnvironmentSamples {
     /*
-     * operationId: ClusterVersions_ListByEnvironment
-     * api-version: 2021-06-01
-     * x-ms-examples: List cluster versions by environment
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterVersionsListByEnvironment.json
      */
     /**
      * Sample code: List cluster versions by environment.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsListSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsListSamples.java
similarity index 74%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsListSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsListSamples.java
index 76694f21c036..77dee51de127 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClusterVersionsListSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClusterVersionsListSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for ClusterVersions List. */
 public final class ClusterVersionsListSamples {
     /*
-     * operationId: ClusterVersions_List
-     * api-version: 2021-06-01
-     * x-ms-examples: List cluster versions
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterVersionsList_example.json
      */
     /**
      * Sample code: List cluster versions.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersCreateOrUpdateSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersCreateOrUpdateSamples.java
similarity index 97%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersCreateOrUpdateSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersCreateOrUpdateSamples.java
index d51587da1530..747ec09c0150 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersCreateOrUpdateSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersCreateOrUpdateSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.resourcemanager.servicefabric.models.AddOnFeatures;
 import com.azure.resourcemanager.servicefabric.models.ApplicationDeltaHealthPolicy;
@@ -43,9 +43,7 @@
 /** Samples for Clusters CreateOrUpdate. */
 public final class ClustersCreateOrUpdateSamples {
     /*
-     * operationId: Clusters_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put a cluster with maximum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterPutOperation_example_max.json
      */
     /**
      * Sample code: Put a cluster with maximum parameters.
@@ -222,9 +220,7 @@ public static void putAClusterWithMaximumParameters(
     }
 
     /*
-     * operationId: Clusters_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put a cluster with minimum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterPutOperation_example_min.json
      */
     /**
      * Sample code: Put a cluster with minimum parameters.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersDeleteSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersDeleteSamples.java
similarity index 73%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersDeleteSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersDeleteSamples.java
index d34e5a407cdc..03a4187090cb 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersDeleteSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersDeleteSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Clusters Delete. */
 public final class ClustersDeleteSamples {
     /*
-     * operationId: Clusters_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete a cluster
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterDeleteOperation_example.json
      */
     /**
      * Sample code: Delete a cluster.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersGetByResourceGroupSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersGetByResourceGroupSamples.java
similarity index 74%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersGetByResourceGroupSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersGetByResourceGroupSamples.java
index 889dffb0a4e9..e486daec0a8b 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersGetByResourceGroupSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersGetByResourceGroupSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Clusters GetByResourceGroup. */
 public final class ClustersGetByResourceGroupSamples {
     /*
-     * operationId: Clusters_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a cluster
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterGetOperation_example.json
      */
     /**
      * Sample code: Get a cluster.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersListByResourceGroupSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersListByResourceGroupSamples.java
similarity index 74%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersListByResourceGroupSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersListByResourceGroupSamples.java
index 2b0b29ffb08c..1f6cf1c5d596 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersListByResourceGroupSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersListByResourceGroupSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Clusters ListByResourceGroup. */
 public final class ClustersListByResourceGroupSamples {
     /*
-     * operationId: Clusters_ListByResourceGroup
-     * api-version: 2021-06-01
-     * x-ms-examples: List cluster by resource group
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterListByResourceGroupOperation_example.json
      */
     /**
      * Sample code: List cluster by resource group.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersListSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersListSamples.java
similarity index 72%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersListSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersListSamples.java
index a7efa640c451..1dceab44be97 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersListSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersListSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Clusters List. */
 public final class ClustersListSamples {
     /*
-     * operationId: Clusters_List
-     * api-version: 2021-06-01
-     * x-ms-examples: List clusters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterListOperation_example.json
      */
     /**
      * Sample code: List clusters.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersListUpgradableVersionsSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersListUpgradableVersionsSamples.java
similarity index 77%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersListUpgradableVersionsSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersListUpgradableVersionsSamples.java
index 4f72de7f4caf..518884329cdf 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersListUpgradableVersionsSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersListUpgradableVersionsSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.servicefabric.models.UpgradableVersionsDescription;
@@ -10,9 +10,7 @@
 /** Samples for Clusters ListUpgradableVersions. */
 public final class ClustersListUpgradableVersionsSamples {
     /*
-     * operationId: Clusters_ListUpgradableVersions
-     * api-version: 2021-06-01
-     * x-ms-examples: Get minimum and maximum code versions
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ListUpgradableVersionsMinMax_example.json
      */
     /**
      * Sample code: Get minimum and maximum code versions.
@@ -25,9 +23,7 @@ public static void getMinimumAndMaximumCodeVersions(
     }
 
     /*
-     * operationId: Clusters_ListUpgradableVersions
-     * api-version: 2021-06-01
-     * x-ms-examples: Get upgrade path
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ListUpgradableVersionsPath_example.json
      */
     /**
      * Sample code: Get upgrade path.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersUpdateSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersUpdateSamples.java
similarity index 94%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersUpdateSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersUpdateSamples.java
index a1d9f7b601cf..55abfac40996 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ClustersUpdateSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ClustersUpdateSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.servicefabric.models.Cluster;
@@ -20,9 +20,7 @@
 /** Samples for Clusters Update. */
 public final class ClustersUpdateSamples {
     /*
-     * operationId: Clusters_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: Patch a cluster
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ClusterPatchOperation_example.json
      */
     /**
      * Sample code: Patch a cluster.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/OperationsListSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/OperationsListSamples.java
new file mode 100644
index 000000000000..87aaadc3b7a7
--- /dev/null
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/OperationsListSamples.java
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.servicefabric.generated;
+
+import com.azure.core.util.Context;
+
+/** Samples for Operations List. */
+public final class OperationsListSamples {
+    /*
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ListOperations.json
+     */
+    /**
+     * Sample code: ListOperations.
+     *
+     * @param manager Entry point to ServiceFabricManager.
+     */
+    public static void listOperations(com.azure.resourcemanager.servicefabric.ServiceFabricManager manager) {
+        manager.operations().list(Context.NONE);
+    }
+}
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesCreateOrUpdateSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesCreateOrUpdateSamples.java
similarity index 89%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesCreateOrUpdateSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesCreateOrUpdateSamples.java
index 4a99a019d77a..65666bf41dbf 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesCreateOrUpdateSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesCreateOrUpdateSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.resourcemanager.servicefabric.models.ArmServicePackageActivationMode;
 import com.azure.resourcemanager.servicefabric.models.MoveCost;
@@ -18,9 +18,7 @@
 /** Samples for Services CreateOrUpdate. */
 public final class ServicesCreateOrUpdateSamples {
     /*
-     * operationId: Services_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put a service with minimum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServicePutOperation_example_min.json
      */
     /**
      * Sample code: Put a service with minimum parameters.
@@ -40,9 +38,7 @@ public static void putAServiceWithMinimumParameters(
     }
 
     /*
-     * operationId: Services_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: Put a service with maximum parameters
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServicePutOperation_example_max.json
      */
     /**
      * Sample code: Put a service with maximum parameters.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesDeleteSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesDeleteSamples.java
similarity index 73%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesDeleteSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesDeleteSamples.java
index 0efe55251589..a769d7e8a86a 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesDeleteSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesDeleteSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Services Delete. */
 public final class ServicesDeleteSamples {
     /*
-     * operationId: Services_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete a service
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServiceDeleteOperation_example.json
      */
     /**
      * Sample code: Delete a service.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesGetSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesGetSamples.java
similarity index 74%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesGetSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesGetSamples.java
index ccaeaa79ffe0..6dc947ac4e83 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesGetSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesGetSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Services Get. */
 public final class ServicesGetSamples {
     /*
-     * operationId: Services_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a service
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServiceGetOperation_example.json
      */
     /**
      * Sample code: Get a service.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesListSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesListSamples.java
similarity index 75%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesListSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesListSamples.java
index 792e8f548002..6b494fbbe7c7 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesListSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesListSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Services List. */
 public final class ServicesListSamples {
     /*
-     * operationId: Services_List
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a list of service resources
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServiceListOperation_example.json
      */
     /**
      * Sample code: Get a list of service resources.
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesUpdateSamples.java b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesUpdateSamples.java
similarity index 78%
rename from sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesUpdateSamples.java
rename to sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesUpdateSamples.java
index ae302939d269..08d79e5e286a 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/ServicesUpdateSamples.java
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/src/samples/java/com/azure/resourcemanager/servicefabric/generated/ServicesUpdateSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.servicefabric;
+package com.azure.resourcemanager.servicefabric.generated;
 
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.servicefabric.models.ServiceResource;
@@ -10,9 +10,7 @@
 /** Samples for Services Update. */
 public final class ServicesUpdateSamples {
     /*
-     * operationId: Services_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: Patch a service
+     * x-ms-original-file: specification/servicefabric/resource-manager/Microsoft.ServiceFabric/stable/2021-06-01/examples/ServicePatchOperation_example.json
      */
     /**
      * Sample code: Patch a service.