diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/CHANGELOG.md b/sdk/servicefabric/azure-resourcemanager-servicefabric/CHANGELOG.md
index b539b5f41cda..1757899c81d7 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 (2021-10-25)
+
+- 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..6a5aaef5ef22 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/SAMPLE.md
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/SAMPLE.md
@@ -56,9 +56,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 +95,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 +117,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 +139,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 +162,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 +199,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 +220,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 +241,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 +272,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 +326,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 +348,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 +390,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 +411,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 +432,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 +457,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 +492,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 +514,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 +538,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 +560,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 +618,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 +795,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 +868,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 +889,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 +910,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 +931,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 +954,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 +967,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 +1005,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.
@@ -1135,9 +1079,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 +1099,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 +1154,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 +1175,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 +1196,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 +1219,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..cba2c0a5cdca 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
@@ -194,7 +194,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(" (")
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..2f1ef6ef26ce 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
@@ -65,7 +65,7 @@ Response<ApplicationTypeVersionResourceInner> getWithResponse(
      * @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.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdate(
             String resourceGroupName,
@@ -88,7 +88,7 @@ Response<ApplicationTypeVersionResourceInner> getWithResponse(
      * @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.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdate(
             String resourceGroupName,
@@ -154,7 +154,7 @@ ApplicationTypeVersionResourceInner createOrUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationTypeName, String version);
 
@@ -171,7 +171,7 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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);
 
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..fe4069bd326a 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
@@ -100,7 +100,7 @@ Response<ApplicationTypeResourceInner> createOrUpdateWithResponse(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationTypeName);
 
@@ -116,7 +116,7 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationTypeName, Context context);
 
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..2d59bfb5e975 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
@@ -62,7 +62,7 @@ Response<ApplicationResourceInner> getWithResponse(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginCreateOrUpdate(
         String resourceGroupName, String clusterName, String applicationName, ApplicationResourceInner parameters);
 
@@ -79,7 +79,7 @@ SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> begin
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -136,7 +136,7 @@ ApplicationResourceInner createOrUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginUpdate(
         String resourceGroupName, String clusterName, String applicationName, ApplicationResourceUpdate parameters);
 
@@ -153,7 +153,7 @@ SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> begin
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -209,7 +209,7 @@ ApplicationResourceInner update(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationName);
 
@@ -225,7 +225,7 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationName, Context context);
 
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..3f8ebac533cf 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
@@ -59,7 +59,7 @@ Response<ClusterInner> getByResourceGroupWithResponse(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
         String resourceGroupName, String clusterName, ClusterInner parameters);
 
@@ -75,7 +75,7 @@ SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
         String resourceGroupName, String clusterName, ClusterInner parameters, Context context);
 
@@ -120,7 +120,7 @@ SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(
         String resourceGroupName, String clusterName, ClusterUpdateParameters parameters);
 
@@ -137,7 +137,7 @@ SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(
         String resourceGroupName, String clusterName, ClusterUpdateParameters parameters, Context context);
 
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..7a4caa0210b9 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
@@ -65,7 +65,7 @@ Response<ServiceResourceInner> getWithResponse(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -87,7 +87,7 @@ SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOr
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -153,7 +153,7 @@ ServiceResourceInner createOrUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -175,7 +175,7 @@ SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -240,7 +240,7 @@ ServiceResourceInner update(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(
         String resourceGroupName, String clusterName, String applicationName, String serviceName);
 
@@ -257,7 +257,7 @@ SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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);
 
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..9ce7de045f51 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
@@ -474,7 +474,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @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.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdateAsync(
             String resourceGroupName,
@@ -508,7 +508,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @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.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdateAsync(
             String resourceGroupName,
@@ -544,7 +544,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @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.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdate(
             String resourceGroupName,
@@ -570,7 +570,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @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.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationTypeVersionResourceInner>, ApplicationTypeVersionResourceInner>
         beginCreateOrUpdate(
             String resourceGroupName,
@@ -814,7 +814,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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 =
@@ -837,7 +837,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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);
@@ -860,7 +860,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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();
@@ -879,7 +879,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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();
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..becbe77c59e2 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
@@ -621,7 +621,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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 =
@@ -643,7 +643,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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);
@@ -665,7 +665,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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();
@@ -683,7 +683,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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();
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..c9f42049d0dc 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
@@ -458,7 +458,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @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 =
@@ -486,7 +486,7 @@ private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInne
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginCreateOrUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -518,7 +518,7 @@ private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInne
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @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();
@@ -537,7 +537,7 @@ public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -770,7 +770,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @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 =
@@ -798,7 +798,7 @@ private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInne
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -830,7 +830,7 @@ private PollerFlux<PollResult<ApplicationResourceInner>, ApplicationResourceInne
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @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();
@@ -849,7 +849,7 @@ public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the application resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationResourceInner>, ApplicationResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -1062,7 +1062,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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 =
@@ -1084,7 +1084,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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);
@@ -1106,7 +1106,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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();
@@ -1124,7 +1124,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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();
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..1d8c151c192b 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
@@ -444,7 +444,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @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 =
@@ -467,7 +467,7 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdateAs
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @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);
@@ -490,7 +490,7 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdateAs
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @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();
@@ -508,7 +508,7 @@ public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreateOrUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @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();
@@ -709,7 +709,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @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);
@@ -732,7 +732,7 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginUpdateAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @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);
@@ -756,7 +756,7 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginUpdateAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @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();
@@ -775,7 +775,7 @@ public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the cluster resource.
      */
-    @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();
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..03b6bff1b2b9 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
@@ -492,7 +492,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -525,7 +525,7 @@ private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> begin
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -556,7 +556,7 @@ private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> begin
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -581,7 +581,7 @@ public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginC
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginCreateOrUpdate(
         String resourceGroupName,
         String clusterName,
@@ -848,7 +848,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -881,7 +881,7 @@ private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> begin
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdateAsync(
         String resourceGroupName,
         String clusterName,
@@ -911,7 +911,7 @@ private PollerFlux<PollResult<ServiceResourceInner>, ServiceResourceInner> begin
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -936,7 +936,7 @@ public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginU
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the service resource.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServiceResourceInner>, ServiceResourceInner> beginUpdate(
         String resourceGroupName,
         String clusterName,
@@ -1176,7 +1176,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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 =
@@ -1199,7 +1199,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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);
@@ -1222,7 +1222,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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();
@@ -1241,7 +1241,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the completion.
      */
-    @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();
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/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.