diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/CHANGELOG.md b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/CHANGELOG.md
index dea596fe8f679..8cee6ab7d8099 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/CHANGELOG.md
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Release History
 
-## 1.0.0-beta.4 (Unreleased)
+## 1.0.0-beta.4 (2021-10-09)
+
+- Azure Resource Manager PostgreSql client library for Java. This package contains Microsoft Azure SDK for PostgreSql Management SDK. The Microsoft Azure management API provides create, read, update, and delete functionality for Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, security alert policies, log files and configurations with new business model. Package tag package-flexibleserver-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/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/README.md b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/README.md
index 6a95ac8ced37a..3d7b24a3946a5 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/README.md
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-postgresqlflexibleserver</artifactId>
-    <version>1.0.0-beta.3</version>
+    <version>1.0.0-beta.4</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/SAMPLE.md b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/SAMPLE.md
index 7820f0e6d0f45..367b59dc0563d 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/SAMPLE.md
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/SAMPLE.md
@@ -62,9 +62,7 @@ import com.azure.resourcemanager.postgresqlflexibleserver.models.NameAvailabilit
 /** Samples for CheckNameAvailability Execute. */
 public final class CheckNameAvailabilityExecuteSamples {
     /*
-     * operationId: CheckNameAvailability_Execute
-     * api-version: 2021-06-01
-     * x-ms-examples: NameAvailability
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/CheckNameAvailability.json
      */
     /**
      * Sample code: NameAvailability.
@@ -89,9 +87,7 @@ import com.azure.core.util.Context;
 /** Samples for Configurations Get. */
 public final class ConfigurationsGetSamples {
     /*
-     * operationId: Configurations_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: ConfigurationGet
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ConfigurationGet.json
      */
     /**
      * Sample code: ConfigurationGet.
@@ -112,9 +108,7 @@ import com.azure.core.util.Context;
 /** Samples for Configurations ListByServer. */
 public final class ConfigurationsListByServerSamples {
     /*
-     * operationId: Configurations_ListByServer
-     * api-version: 2021-06-01
-     * x-ms-examples: ConfigurationList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ConfigurationListByServer.json
      */
     /**
      * Sample code: ConfigurationList.
@@ -133,9 +127,7 @@ public final class ConfigurationsListByServerSamples {
 /** Samples for Configurations Put. */
 public final class ConfigurationsPutSamples {
     /*
-     * operationId: Configurations_Put
-     * api-version: 2021-06-01
-     * x-ms-examples: Update a user configuration
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ConfigurationUpdate.json
      */
     /**
      * Sample code: Update a user configuration.
@@ -164,9 +156,7 @@ import com.azure.resourcemanager.postgresqlflexibleserver.models.Configuration;
 /** Samples for Configurations Update. */
 public final class ConfigurationsUpdateSamples {
     /*
-     * operationId: Configurations_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: Update a user configuration
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ConfigurationUpdate.json
      */
     /**
      * Sample code: Update a user configuration.
@@ -191,9 +181,7 @@ public final class ConfigurationsUpdateSamples {
 /** Samples for Databases Create. */
 public final class DatabasesCreateSamples {
     /*
-     * operationId: Databases_Create
-     * api-version: 2021-06-01
-     * x-ms-examples: Create a database
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/DatabaseCreate.json
      */
     /**
      * Sample code: Create a database.
@@ -220,9 +208,7 @@ import com.azure.core.util.Context;
 /** Samples for Databases Delete. */
 public final class DatabasesDeleteSamples {
     /*
-     * operationId: Databases_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete a database
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/DatabaseDelete.json
      */
     /**
      * Sample code: Delete a database.
@@ -243,9 +229,7 @@ import com.azure.core.util.Context;
 /** Samples for Databases Get. */
 public final class DatabasesGetSamples {
     /*
-     * operationId: Databases_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a database
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/DatabaseGet.json
      */
     /**
      * Sample code: Get a database.
@@ -266,9 +250,7 @@ import com.azure.core.util.Context;
 /** Samples for Databases ListByServer. */
 public final class DatabasesListByServerSamples {
     /*
-     * operationId: Databases_ListByServer
-     * api-version: 2021-06-01
-     * x-ms-examples: List databases in a server
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/DatabasesListByServer.json
      */
     /**
      * Sample code: List databases in a server.
@@ -288,9 +270,7 @@ public final class DatabasesListByServerSamples {
 /** Samples for FirewallRules CreateOrUpdate. */
 public final class FirewallRulesCreateOrUpdateSamples {
     /*
-     * operationId: FirewallRules_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: FirewallRuleCreate
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/FirewallRuleCreate.json
      */
     /**
      * Sample code: FirewallRuleCreate.
@@ -318,9 +298,7 @@ import com.azure.core.util.Context;
 /** Samples for FirewallRules Delete. */
 public final class FirewallRulesDeleteSamples {
     /*
-     * operationId: FirewallRules_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: FirewallRuleDelete
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/FirewallRuleDelete.json
      */
     /**
      * Sample code: FirewallRuleDelete.
@@ -342,9 +320,7 @@ import com.azure.core.util.Context;
 /** Samples for FirewallRules Get. */
 public final class FirewallRulesGetSamples {
     /*
-     * operationId: FirewallRules_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: FirewallRuleList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/FirewallRuleGet.json
      */
     /**
      * Sample code: FirewallRuleList.
@@ -365,9 +341,7 @@ import com.azure.core.util.Context;
 /** Samples for FirewallRules ListByServer. */
 public final class FirewallRulesListByServerSamples {
     /*
-     * operationId: FirewallRules_ListByServer
-     * api-version: 2021-06-01
-     * x-ms-examples: FirewallRuleList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/FirewallRuleListByServer.json
      */
     /**
      * Sample code: FirewallRuleList.
@@ -388,9 +362,7 @@ import com.azure.core.util.Context;
 /** Samples for GetPrivateDnsZoneSuffix Execute. */
 public final class GetPrivateDnsZoneSuffixExecuteSamples {
     /*
-     * operationId: GetPrivateDnsZoneSuffix_Execute
-     * api-version: 2021-06-01
-     * x-ms-examples: GetPrivateDnsZoneSuffix
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/GetPrivateDnsZoneSuffix.json
      */
     /**
      * Sample code: GetPrivateDnsZoneSuffix.
@@ -412,9 +384,7 @@ import com.azure.core.util.Context;
 /** Samples for LocationBasedCapabilities Execute. */
 public final class LocationBasedCapabilitiesExecuteSamples {
     /*
-     * operationId: LocationBasedCapabilities_Execute
-     * api-version: 2021-06-01
-     * x-ms-examples: CapabilitiesList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/CapabilitiesByLocation.json
      */
     /**
      * Sample code: CapabilitiesList.
@@ -435,9 +405,7 @@ import com.azure.core.util.Context;
 /** Samples for Operations List. */
 public final class OperationsListSamples {
     /*
-     * operationId: Operations_List
-     * api-version: 2021-06-01
-     * x-ms-examples: OperationList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/OperationList.json
      */
     /**
      * Sample code: OperationList.
@@ -470,9 +438,7 @@ import java.util.Map;
 /** Samples for Servers Create. */
 public final class ServersCreateSamples {
     /*
-     * operationId: Servers_Create
-     * api-version: 2021-06-01
-     * x-ms-examples: Create a new server
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerCreate.json
      */
     /**
      * Sample code: Create a new server.
@@ -505,9 +471,7 @@ public final class ServersCreateSamples {
     }
 
     /*
-     * operationId: Servers_Create
-     * api-version: 2021-06-01
-     * x-ms-examples: Create a database as a point in time restore
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerCreatePointInTimeRestore.json
      */
     /**
      * Sample code: Create a database as a point in time restore.
@@ -549,9 +513,7 @@ import com.azure.core.util.Context;
 /** Samples for Servers Delete. */
 public final class ServersDeleteSamples {
     /*
-     * operationId: Servers_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerDelete
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerDelete.json
      */
     /**
      * Sample code: ServerDelete.
@@ -572,9 +534,7 @@ import com.azure.core.util.Context;
 /** Samples for Servers GetByResourceGroup. */
 public final class ServersGetByResourceGroupSamples {
     /*
-     * operationId: Servers_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerGet
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerGet.json
      */
     /**
      * Sample code: ServerGet.
@@ -586,9 +546,7 @@ public final class ServersGetByResourceGroupSamples {
     }
 
     /*
-     * operationId: Servers_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerGetWithVnet
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerGetWithVnet.json
      */
     /**
      * Sample code: ServerGetWithVnet.
@@ -609,9 +567,7 @@ import com.azure.core.util.Context;
 /** Samples for Servers List. */
 public final class ServersListSamples {
     /*
-     * operationId: Servers_List
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerList.json
      */
     /**
      * Sample code: ServerList.
@@ -632,9 +588,7 @@ import com.azure.core.util.Context;
 /** Samples for Servers ListByResourceGroup. */
 public final class ServersListByResourceGroupSamples {
     /*
-     * operationId: Servers_ListByResourceGroup
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerListByResourceGroup
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerListByResourceGroup.json
      */
     /**
      * Sample code: ServerListByResourceGroup.
@@ -658,9 +612,7 @@ import com.azure.resourcemanager.postgresqlflexibleserver.models.RestartParamete
 /** Samples for Servers Restart. */
 public final class ServersRestartSamples {
     /*
-     * operationId: Servers_Restart
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerRestart
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerRestart.json
      */
     /**
      * Sample code: ServerRestart.
@@ -672,9 +624,7 @@ public final class ServersRestartSamples {
     }
 
     /*
-     * operationId: Servers_Restart
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerRestartWithFailover
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerRestartWithFailover.json
      */
     /**
      * Sample code: ServerRestartWithFailover.
@@ -702,9 +652,7 @@ import com.azure.core.util.Context;
 /** Samples for Servers Start. */
 public final class ServersStartSamples {
     /*
-     * operationId: Servers_Start
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerStart
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerStart.json
      */
     /**
      * Sample code: ServerStart.
@@ -725,9 +673,7 @@ import com.azure.core.util.Context;
 /** Samples for Servers Stop. */
 public final class ServersStopSamples {
     /*
-     * operationId: Servers_Stop
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerStop
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerStop.json
      */
     /**
      * Sample code: ServerStop.
@@ -755,9 +701,7 @@ import com.azure.resourcemanager.postgresqlflexibleserver.models.Storage;
 /** Samples for Servers Update. */
 public final class ServersUpdateSamples {
     /*
-     * operationId: Servers_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerUpdate
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerUpdate.json
      */
     /**
      * Sample code: ServerUpdate.
@@ -778,9 +722,7 @@ public final class ServersUpdateSamples {
     }
 
     /*
-     * operationId: Servers_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerUpdateWithCustomerMaintenanceWindow
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerUpdateWithCustomerMaintenanceWindow.json
      */
     /**
      * Sample code: ServerUpdateWithCustomerMaintenanceWindow.
@@ -814,9 +756,7 @@ import com.azure.resourcemanager.postgresqlflexibleserver.models.VirtualNetworkS
 /** Samples for VirtualNetworkSubnetUsage Execute. */
 public final class VirtualNetworkSubnetUsageExecuteSamples {
     /*
-     * operationId: VirtualNetworkSubnetUsage_Execute
-     * api-version: 2021-06-01
-     * x-ms-examples: VirtualNetworkSubnetUsageList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/VirtualNetworkSubnetUsage.json
      */
     /**
      * Sample code: VirtualNetworkSubnetUsageList.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/PostgreSqlManager.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/PostgreSqlManager.java
index ad7577ad2b54f..a6e561c62497c 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/PostgreSqlManager.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/PostgreSqlManager.java
@@ -206,7 +206,7 @@ public PostgreSqlManager authenticate(TokenCredential credential, AzureProfile p
                 .append("-")
                 .append("com.azure.resourcemanager.postgresqlflexibleserver")
                 .append("/")
-                .append("1.0.0-beta.3");
+                .append("1.0.0-beta.4");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/ConfigurationsClient.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/ConfigurationsClient.java
index d9116c9daacbc..fdcf6840f8c23 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/ConfigurationsClient.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/ConfigurationsClient.java
@@ -84,7 +84,7 @@ Response<ConfigurationInner> getWithResponse(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginUpdate(
         String resourceGroupName, String serverName, String configurationName, ConfigurationInner parameters);
 
@@ -101,7 +101,7 @@ SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginUpdate(
         String resourceGroupName,
         String serverName,
@@ -158,7 +158,7 @@ ConfigurationInner update(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginPut(
         String resourceGroupName, String serverName, String configurationName, ConfigurationInner parameters);
 
@@ -175,7 +175,7 @@ SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginPut(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginPut(
         String resourceGroupName,
         String serverName,
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/DatabasesClient.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/DatabasesClient.java
index 13dd29b7b868a..72c1d4ae5c25e 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/DatabasesClient.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/DatabasesClient.java
@@ -27,7 +27,7 @@ public interface DatabasesClient {
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Database.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginCreate(
         String resourceGroupName, String serverName, String databaseName, DatabaseInner parameters);
 
@@ -44,7 +44,7 @@ SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginCreate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Database.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginCreate(
         String resourceGroupName, String serverName, String databaseName, DatabaseInner parameters, Context context);
 
@@ -91,7 +91,7 @@ DatabaseInner create(
      * @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 serverName, String databaseName);
 
     /**
@@ -106,7 +106,7 @@ DatabaseInner create(
      * @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 serverName, String databaseName, Context context);
 
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/FirewallRulesClient.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/FirewallRulesClient.java
index 0bd3c2f8e63f5..2c6d9c5a126b6 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/FirewallRulesClient.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/FirewallRulesClient.java
@@ -27,7 +27,7 @@ public interface FirewallRulesClient {
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server firewall rule.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<FirewallRuleInner>, FirewallRuleInner> beginCreateOrUpdate(
         String resourceGroupName, String serverName, String firewallRuleName, FirewallRuleInner parameters);
 
@@ -44,7 +44,7 @@ SyncPoller<PollResult<FirewallRuleInner>, FirewallRuleInner> beginCreateOrUpdate
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server firewall rule.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<FirewallRuleInner>, FirewallRuleInner> beginCreateOrUpdate(
         String resourceGroupName,
         String serverName,
@@ -100,7 +100,7 @@ FirewallRuleInner 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 serverName, String firewallRuleName);
 
@@ -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 serverName, String firewallRuleName, Context context);
 
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/ServersClient.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/ServersClient.java
index f414c42e8dba5..5c60b9cd4c9ae 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/ServersClient.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/fluent/ServersClient.java
@@ -28,7 +28,7 @@ public interface ServersClient {
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServerInner>, ServerInner> beginCreate(
         String resourceGroupName, String serverName, ServerInner parameters);
 
@@ -44,7 +44,7 @@ SyncPoller<PollResult<ServerInner>, ServerInner> beginCreate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServerInner>, ServerInner> beginCreate(
         String resourceGroupName, String serverName, ServerInner parameters, Context context);
 
@@ -89,7 +89,7 @@ SyncPoller<PollResult<ServerInner>, ServerInner> beginCreate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServerInner>, ServerInner> beginUpdate(
         String resourceGroupName, String serverName, ServerForUpdate parameters);
 
@@ -106,7 +106,7 @@ SyncPoller<PollResult<ServerInner>, ServerInner> beginUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<ServerInner>, ServerInner> beginUpdate(
         String resourceGroupName, String serverName, ServerForUpdate parameters, Context context);
 
@@ -151,7 +151,7 @@ SyncPoller<PollResult<ServerInner>, ServerInner> beginUpdate(
      * @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 serverName);
 
     /**
@@ -165,7 +165,7 @@ SyncPoller<PollResult<ServerInner>, ServerInner> beginUpdate(
      * @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 serverName, Context context);
 
     /**
@@ -278,7 +278,7 @@ SyncPoller<PollResult<ServerInner>, ServerInner> beginUpdate(
      * @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> beginRestart(
         String resourceGroupName, String serverName, RestartParameter parameters);
 
@@ -294,7 +294,7 @@ SyncPoller<PollResult<Void>, Void> beginRestart(
      * @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> beginRestart(
         String resourceGroupName, String serverName, RestartParameter parameters, Context context);
 
@@ -347,7 +347,7 @@ SyncPoller<PollResult<Void>, Void> beginRestart(
      * @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> beginStart(String resourceGroupName, String serverName);
 
     /**
@@ -361,7 +361,7 @@ SyncPoller<PollResult<Void>, Void> beginRestart(
      * @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> beginStart(String resourceGroupName, String serverName, Context context);
 
     /**
@@ -399,7 +399,7 @@ SyncPoller<PollResult<Void>, Void> beginRestart(
      * @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> beginStop(String resourceGroupName, String serverName);
 
     /**
@@ -413,7 +413,7 @@ SyncPoller<PollResult<Void>, Void> beginRestart(
      * @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> beginStop(String resourceGroupName, String serverName, Context context);
 
     /**
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/ConfigurationsClientImpl.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/ConfigurationsClientImpl.java
index 245eeb1a3f6a9..0c2b3fdb93022 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/ConfigurationsClientImpl.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/ConfigurationsClientImpl.java
@@ -623,7 +623,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ConfigurationInner>, ConfigurationInner> beginUpdateAsync(
         String resourceGroupName, String serverName, String configurationName, ConfigurationInner parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono =
@@ -647,7 +647,7 @@ private PollerFlux<PollResult<ConfigurationInner>, ConfigurationInner> beginUpda
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ConfigurationInner>, ConfigurationInner> beginUpdateAsync(
         String resourceGroupName,
         String serverName,
@@ -675,7 +675,7 @@ private PollerFlux<PollResult<ConfigurationInner>, ConfigurationInner> beginUpda
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginUpdate(
         String resourceGroupName, String serverName, String configurationName, ConfigurationInner parameters) {
         return beginUpdateAsync(resourceGroupName, serverName, configurationName, parameters).getSyncPoller();
@@ -694,7 +694,7 @@ public SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginUpdat
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginUpdate(
         String resourceGroupName,
         String serverName,
@@ -926,7 +926,7 @@ private Mono<Response<Flux<ByteBuffer>>> putWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ConfigurationInner>, ConfigurationInner> beginPutAsync(
         String resourceGroupName, String serverName, String configurationName, ConfigurationInner parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono =
@@ -950,7 +950,7 @@ private PollerFlux<PollResult<ConfigurationInner>, ConfigurationInner> beginPutA
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ConfigurationInner>, ConfigurationInner> beginPutAsync(
         String resourceGroupName,
         String serverName,
@@ -978,7 +978,7 @@ private PollerFlux<PollResult<ConfigurationInner>, ConfigurationInner> beginPutA
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginPut(
         String resourceGroupName, String serverName, String configurationName, ConfigurationInner parameters) {
         return beginPutAsync(resourceGroupName, serverName, configurationName, parameters).getSyncPoller();
@@ -997,7 +997,7 @@ public SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginPut(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Configuration.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ConfigurationInner>, ConfigurationInner> beginPut(
         String resourceGroupName,
         String serverName,
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/DatabasesClientImpl.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/DatabasesClientImpl.java
index 6eaa0e4e55232..9c71fc25ea585 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/DatabasesClientImpl.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/DatabasesClientImpl.java
@@ -272,7 +272,7 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Database.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginCreateAsync(
         String resourceGroupName, String serverName, String databaseName, DatabaseInner parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono =
@@ -296,7 +296,7 @@ private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginCreateAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Database.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginCreateAsync(
         String resourceGroupName, String serverName, String databaseName, DatabaseInner parameters, Context context) {
         context = this.client.mergeContext(context);
@@ -320,7 +320,7 @@ private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginCreateAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Database.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginCreate(
         String resourceGroupName, String serverName, String databaseName, DatabaseInner parameters) {
         return beginCreateAsync(resourceGroupName, serverName, databaseName, parameters).getSyncPoller();
@@ -339,7 +339,7 @@ public SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginCreate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a Database.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginCreate(
         String resourceGroupName, String serverName, String databaseName, DatabaseInner parameters, Context context) {
         return beginCreateAsync(resourceGroupName, serverName, databaseName, parameters, context).getSyncPoller();
@@ -538,7 +538,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 serverName, String databaseName) {
         Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, serverName, databaseName);
@@ -559,7 +559,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 serverName, String databaseName, Context context) {
         context = this.client.mergeContext(context);
@@ -581,7 +581,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 serverName, String databaseName) {
         return beginDeleteAsync(resourceGroupName, serverName, databaseName).getSyncPoller();
@@ -599,7 +599,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 serverName, String databaseName, Context context) {
         return beginDeleteAsync(resourceGroupName, serverName, databaseName, context).getSyncPoller();
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/FirewallRulesClientImpl.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/FirewallRulesClientImpl.java
index 3704c0e8962e9..15b38a4148d8e 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/FirewallRulesClientImpl.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/FirewallRulesClientImpl.java
@@ -278,7 +278,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server firewall rule.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<FirewallRuleInner>, FirewallRuleInner> beginCreateOrUpdateAsync(
         String resourceGroupName, String serverName, String firewallRuleName, FirewallRuleInner parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono =
@@ -302,7 +302,7 @@ private PollerFlux<PollResult<FirewallRuleInner>, FirewallRuleInner> beginCreate
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server firewall rule.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<FirewallRuleInner>, FirewallRuleInner> beginCreateOrUpdateAsync(
         String resourceGroupName,
         String serverName,
@@ -330,7 +330,7 @@ private PollerFlux<PollResult<FirewallRuleInner>, FirewallRuleInner> beginCreate
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server firewall rule.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<FirewallRuleInner>, FirewallRuleInner> beginCreateOrUpdate(
         String resourceGroupName, String serverName, String firewallRuleName, FirewallRuleInner parameters) {
         return beginCreateOrUpdateAsync(resourceGroupName, serverName, firewallRuleName, parameters).getSyncPoller();
@@ -349,7 +349,7 @@ public SyncPoller<PollResult<FirewallRuleInner>, FirewallRuleInner> beginCreateO
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server firewall rule.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<FirewallRuleInner>, FirewallRuleInner> beginCreateOrUpdate(
         String resourceGroupName,
         String serverName,
@@ -563,7 +563,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 serverName, String firewallRuleName) {
         Mono<Response<Flux<ByteBuffer>>> mono =
@@ -585,7 +585,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 serverName, String firewallRuleName, Context context) {
         context = this.client.mergeContext(context);
@@ -607,7 +607,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 serverName, String firewallRuleName) {
         return beginDeleteAsync(resourceGroupName, serverName, firewallRuleName).getSyncPoller();
@@ -625,7 +625,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 serverName, String firewallRuleName, Context context) {
         return beginDeleteAsync(resourceGroupName, serverName, firewallRuleName, context).getSyncPoller();
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/ServersClientImpl.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/ServersClientImpl.java
index e3b1466809c99..08b4a3c4e2476 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/ServersClientImpl.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/main/java/com/azure/resourcemanager/postgresqlflexibleserver/implementation/ServersClientImpl.java
@@ -343,7 +343,7 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServerInner>, ServerInner> beginCreateAsync(
         String resourceGroupName, String serverName, ServerInner parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono = createWithResponseAsync(resourceGroupName, serverName, parameters);
@@ -365,7 +365,7 @@ private PollerFlux<PollResult<ServerInner>, ServerInner> beginCreateAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServerInner>, ServerInner> beginCreateAsync(
         String resourceGroupName, String serverName, ServerInner parameters, Context context) {
         context = this.client.mergeContext(context);
@@ -388,7 +388,7 @@ private PollerFlux<PollResult<ServerInner>, ServerInner> beginCreateAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServerInner>, ServerInner> beginCreate(
         String resourceGroupName, String serverName, ServerInner parameters) {
         return beginCreateAsync(resourceGroupName, serverName, parameters).getSyncPoller();
@@ -406,7 +406,7 @@ public SyncPoller<PollResult<ServerInner>, ServerInner> beginCreate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServerInner>, ServerInner> beginCreate(
         String resourceGroupName, String serverName, ServerInner parameters, Context context) {
         return beginCreateAsync(resourceGroupName, serverName, parameters, context).getSyncPoller();
@@ -605,7 +605,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServerInner>, ServerInner> beginUpdateAsync(
         String resourceGroupName, String serverName, ServerForUpdate parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono = updateWithResponseAsync(resourceGroupName, serverName, parameters);
@@ -628,7 +628,7 @@ private PollerFlux<PollResult<ServerInner>, ServerInner> beginUpdateAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ServerInner>, ServerInner> beginUpdateAsync(
         String resourceGroupName, String serverName, ServerForUpdate parameters, Context context) {
         context = this.client.mergeContext(context);
@@ -652,7 +652,7 @@ private PollerFlux<PollResult<ServerInner>, ServerInner> beginUpdateAsync(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServerInner>, ServerInner> beginUpdate(
         String resourceGroupName, String serverName, ServerForUpdate parameters) {
         return beginUpdateAsync(resourceGroupName, serverName, parameters).getSyncPoller();
@@ -671,7 +671,7 @@ public SyncPoller<PollResult<ServerInner>, ServerInner> beginUpdate(
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return represents a server.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ServerInner>, ServerInner> beginUpdate(
         String resourceGroupName, String serverName, ServerForUpdate parameters, Context context) {
         return beginUpdateAsync(resourceGroupName, serverName, parameters, context).getSyncPoller();
@@ -856,7 +856,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 serverName) {
         Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, serverName);
         return this
@@ -875,7 +875,7 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      * @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 serverName, Context context) {
         context = this.client.mergeContext(context);
@@ -895,7 +895,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 serverName) {
         return beginDeleteAsync(resourceGroupName, serverName).getSyncPoller();
     }
@@ -911,7 +911,7 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
      * @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 serverName, Context context) {
         return beginDeleteAsync(resourceGroupName, serverName, context).getSyncPoller();
@@ -1546,7 +1546,7 @@ private Mono<Response<Flux<ByteBuffer>>> restartWithResponseAsync(
      * @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> beginRestartAsync(
         String resourceGroupName, String serverName, RestartParameter parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono = restartWithResponseAsync(resourceGroupName, serverName, parameters);
@@ -1567,7 +1567,7 @@ private PollerFlux<PollResult<Void>, Void> beginRestartAsync(
      * @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> beginRestartAsync(
         String resourceGroupName, String serverName, RestartParameter parameters, Context context) {
         context = this.client.mergeContext(context);
@@ -1589,7 +1589,7 @@ private PollerFlux<PollResult<Void>, Void> beginRestartAsync(
      * @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> beginRestart(
         String resourceGroupName, String serverName, RestartParameter parameters) {
         return beginRestartAsync(resourceGroupName, serverName, parameters).getSyncPoller();
@@ -1607,7 +1607,7 @@ public SyncPoller<PollResult<Void>, Void> beginRestart(
      * @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> beginRestart(
         String resourceGroupName, String serverName, RestartParameter parameters, Context context) {
         return beginRestartAsync(resourceGroupName, serverName, parameters, context).getSyncPoller();
@@ -1818,7 +1818,7 @@ private Mono<Response<Flux<ByteBuffer>>> startWithResponseAsync(
      * @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> beginStartAsync(String resourceGroupName, String serverName) {
         Mono<Response<Flux<ByteBuffer>>> mono = startWithResponseAsync(resourceGroupName, serverName);
         return this
@@ -1837,7 +1837,7 @@ private PollerFlux<PollResult<Void>, Void> beginStartAsync(String resourceGroupN
      * @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> beginStartAsync(
         String resourceGroupName, String serverName, Context context) {
         context = this.client.mergeContext(context);
@@ -1857,7 +1857,7 @@ private PollerFlux<PollResult<Void>, Void> beginStartAsync(
      * @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> beginStart(String resourceGroupName, String serverName) {
         return beginStartAsync(resourceGroupName, serverName).getSyncPoller();
     }
@@ -1873,7 +1873,7 @@ public SyncPoller<PollResult<Void>, Void> beginStart(String resourceGroupName, S
      * @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> beginStart(String resourceGroupName, String serverName, Context context) {
         return beginStartAsync(resourceGroupName, serverName, context).getSyncPoller();
     }
@@ -2043,7 +2043,7 @@ private Mono<Response<Flux<ByteBuffer>>> stopWithResponseAsync(
      * @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> beginStopAsync(String resourceGroupName, String serverName) {
         Mono<Response<Flux<ByteBuffer>>> mono = stopWithResponseAsync(resourceGroupName, serverName);
         return this
@@ -2062,7 +2062,7 @@ private PollerFlux<PollResult<Void>, Void> beginStopAsync(String resourceGroupNa
      * @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> beginStopAsync(
         String resourceGroupName, String serverName, Context context) {
         context = this.client.mergeContext(context);
@@ -2082,7 +2082,7 @@ private PollerFlux<PollResult<Void>, Void> beginStopAsync(
      * @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> beginStop(String resourceGroupName, String serverName) {
         return beginStopAsync(resourceGroupName, serverName).getSyncPoller();
     }
@@ -2098,7 +2098,7 @@ public SyncPoller<PollResult<Void>, Void> beginStop(String resourceGroupName, St
      * @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> beginStop(String resourceGroupName, String serverName, Context context) {
         return beginStopAsync(resourceGroupName, serverName, context).getSyncPoller();
     }
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/CheckNameAvailabilityExecuteSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/CheckNameAvailabilityExecuteSamples.java
similarity index 80%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/CheckNameAvailabilityExecuteSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/CheckNameAvailabilityExecuteSamples.java
index 7358c1e295508..7da11dd156e88 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/CheckNameAvailabilityExecuteSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/CheckNameAvailabilityExecuteSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.postgresqlflexibleserver.models.NameAvailabilityRequest;
@@ -10,9 +10,7 @@
 /** Samples for CheckNameAvailability Execute. */
 public final class CheckNameAvailabilityExecuteSamples {
     /*
-     * operationId: CheckNameAvailability_Execute
-     * api-version: 2021-06-01
-     * x-ms-examples: NameAvailability
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/CheckNameAvailability.json
      */
     /**
      * Sample code: NameAvailability.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsGetSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsGetSamples.java
similarity index 75%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsGetSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsGetSamples.java
index f71dbeb49f1c4..03d75baa89bac 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsGetSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsGetSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Configurations Get. */
 public final class ConfigurationsGetSamples {
     /*
-     * operationId: Configurations_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: ConfigurationGet
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ConfigurationGet.json
      */
     /**
      * Sample code: ConfigurationGet.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsListByServerSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsListByServerSamples.java
similarity index 74%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsListByServerSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsListByServerSamples.java
index 9e910aa0da1b9..dfd7b2e7214f6 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsListByServerSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsListByServerSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Configurations ListByServer. */
 public final class ConfigurationsListByServerSamples {
     /*
-     * operationId: Configurations_ListByServer
-     * api-version: 2021-06-01
-     * x-ms-examples: ConfigurationList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ConfigurationListByServer.json
      */
     /**
      * Sample code: ConfigurationList.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsPutSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsPutSamples.java
similarity index 78%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsPutSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsPutSamples.java
index 6b427f367c40a..7d89dfa0b476b 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsPutSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsPutSamples.java
@@ -2,14 +2,12 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 /** Samples for Configurations Put. */
 public final class ConfigurationsPutSamples {
     /*
-     * operationId: Configurations_Put
-     * api-version: 2021-06-01
-     * x-ms-examples: Update a user configuration
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ConfigurationUpdate.json
      */
     /**
      * Sample code: Update a user configuration.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsUpdateSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsUpdateSamples.java
similarity index 81%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsUpdateSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsUpdateSamples.java
index f0552541425a4..2b2c5a0308171 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ConfigurationsUpdateSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ConfigurationsUpdateSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.postgresqlflexibleserver.models.Configuration;
@@ -10,9 +10,7 @@
 /** Samples for Configurations Update. */
 public final class ConfigurationsUpdateSamples {
     /*
-     * operationId: Configurations_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: Update a user configuration
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ConfigurationUpdate.json
      */
     /**
      * Sample code: Update a user configuration.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesCreateSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesCreateSamples.java
similarity index 77%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesCreateSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesCreateSamples.java
index 4832e0069f39f..bcfb685e4aad9 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesCreateSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesCreateSamples.java
@@ -2,14 +2,12 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 /** Samples for Databases Create. */
 public final class DatabasesCreateSamples {
     /*
-     * operationId: Databases_Create
-     * api-version: 2021-06-01
-     * x-ms-examples: Create a database
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/DatabaseCreate.json
      */
     /**
      * Sample code: Create a database.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesDeleteSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesDeleteSamples.java
similarity index 74%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesDeleteSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesDeleteSamples.java
index 3c7eeb4a03c50..d661207dc5b33 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesDeleteSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesDeleteSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Databases Delete. */
 public final class DatabasesDeleteSamples {
     /*
-     * operationId: Databases_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: Delete a database
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/DatabaseDelete.json
      */
     /**
      * Sample code: Delete a database.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesGetSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesGetSamples.java
similarity index 74%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesGetSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesGetSamples.java
index 96a7bcca994c9..60d182dc2125f 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesGetSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesGetSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Databases Get. */
 public final class DatabasesGetSamples {
     /*
-     * operationId: Databases_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: Get a database
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/DatabaseGet.json
      */
     /**
      * Sample code: Get a database.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesListByServerSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesListByServerSamples.java
similarity index 74%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesListByServerSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesListByServerSamples.java
index 02a270bf2dbfb..10c9e4bb162fc 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/DatabasesListByServerSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/DatabasesListByServerSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Databases ListByServer. */
 public final class DatabasesListByServerSamples {
     /*
-     * operationId: Databases_ListByServer
-     * api-version: 2021-06-01
-     * x-ms-examples: List databases in a server
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/DatabasesListByServer.json
      */
     /**
      * Sample code: List databases in a server.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesCreateOrUpdateSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesCreateOrUpdateSamples.java
similarity index 78%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesCreateOrUpdateSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesCreateOrUpdateSamples.java
index 78698d8eaeed6..54f642ff13ae3 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesCreateOrUpdateSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesCreateOrUpdateSamples.java
@@ -2,14 +2,12 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 /** Samples for FirewallRules CreateOrUpdate. */
 public final class FirewallRulesCreateOrUpdateSamples {
     /*
-     * operationId: FirewallRules_CreateOrUpdate
-     * api-version: 2021-06-01
-     * x-ms-examples: FirewallRuleCreate
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/FirewallRuleCreate.json
      */
     /**
      * Sample code: FirewallRuleCreate.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesDeleteSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesDeleteSamples.java
similarity index 74%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesDeleteSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesDeleteSamples.java
index 3864e99efed41..9ea95e6cd2786 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesDeleteSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesDeleteSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for FirewallRules Delete. */
 public final class FirewallRulesDeleteSamples {
     /*
-     * operationId: FirewallRules_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: FirewallRuleDelete
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/FirewallRuleDelete.json
      */
     /**
      * Sample code: FirewallRuleDelete.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesGetSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesGetSamples.java
similarity index 74%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesGetSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesGetSamples.java
index 47e4d0f1e7233..b24694310817d 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesGetSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesGetSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for FirewallRules Get. */
 public final class FirewallRulesGetSamples {
     /*
-     * operationId: FirewallRules_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: FirewallRuleList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/FirewallRuleGet.json
      */
     /**
      * Sample code: FirewallRuleList.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesListByServerSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesListByServerSamples.java
similarity index 74%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesListByServerSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesListByServerSamples.java
index 2fbd06a0f5039..d5958d2ffb443 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/FirewallRulesListByServerSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/FirewallRulesListByServerSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for FirewallRules ListByServer. */
 public final class FirewallRulesListByServerSamples {
     /*
-     * operationId: FirewallRules_ListByServer
-     * api-version: 2021-06-01
-     * x-ms-examples: FirewallRuleList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/FirewallRuleListByServer.json
      */
     /**
      * Sample code: FirewallRuleList.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/GetPrivateDnsZoneSuffixExecuteSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/GetPrivateDnsZoneSuffixExecuteSamples.java
similarity index 75%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/GetPrivateDnsZoneSuffixExecuteSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/GetPrivateDnsZoneSuffixExecuteSamples.java
index bae5cc032ef92..1535472d6cc35 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/GetPrivateDnsZoneSuffixExecuteSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/GetPrivateDnsZoneSuffixExecuteSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for GetPrivateDnsZoneSuffix Execute. */
 public final class GetPrivateDnsZoneSuffixExecuteSamples {
     /*
-     * operationId: GetPrivateDnsZoneSuffix_Execute
-     * api-version: 2021-06-01
-     * x-ms-examples: GetPrivateDnsZoneSuffix
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/GetPrivateDnsZoneSuffix.json
      */
     /**
      * Sample code: GetPrivateDnsZoneSuffix.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/LocationBasedCapabilitiesExecuteSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/LocationBasedCapabilitiesExecuteSamples.java
similarity index 74%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/LocationBasedCapabilitiesExecuteSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/LocationBasedCapabilitiesExecuteSamples.java
index afae643ceec92..5294790fb72f6 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/LocationBasedCapabilitiesExecuteSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/LocationBasedCapabilitiesExecuteSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for LocationBasedCapabilities Execute. */
 public final class LocationBasedCapabilitiesExecuteSamples {
     /*
-     * operationId: LocationBasedCapabilities_Execute
-     * api-version: 2021-06-01
-     * x-ms-examples: CapabilitiesList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/CapabilitiesByLocation.json
      */
     /**
      * Sample code: CapabilitiesList.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/OperationsListSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/OperationsListSamples.java
similarity index 73%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/OperationsListSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/OperationsListSamples.java
index 95b94fcfe4a73..80530532cf9d1 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/OperationsListSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/OperationsListSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Operations List. */
 public final class OperationsListSamples {
     /*
-     * operationId: Operations_List
-     * api-version: 2021-06-01
-     * x-ms-examples: OperationList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/OperationList.json
      */
     /**
      * Sample code: OperationList.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersCreateSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersCreateSamples.java
similarity index 91%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersCreateSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersCreateSamples.java
index baa9cf7bf51c5..35fd443752127 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersCreateSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersCreateSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.resourcemanager.postgresqlflexibleserver.models.Backup;
 import com.azure.resourcemanager.postgresqlflexibleserver.models.CreateMode;
@@ -21,9 +21,7 @@
 /** Samples for Servers Create. */
 public final class ServersCreateSamples {
     /*
-     * operationId: Servers_Create
-     * api-version: 2021-06-01
-     * x-ms-examples: Create a new server
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerCreate.json
      */
     /**
      * Sample code: Create a new server.
@@ -56,9 +54,7 @@ public static void createANewServer(com.azure.resourcemanager.postgresqlflexible
     }
 
     /*
-     * operationId: Servers_Create
-     * api-version: 2021-06-01
-     * x-ms-examples: Create a database as a point in time restore
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerCreatePointInTimeRestore.json
      */
     /**
      * Sample code: Create a database as a point in time restore.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersDeleteSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersDeleteSamples.java
similarity index 73%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersDeleteSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersDeleteSamples.java
index 2dda4dcbdbff5..592c7b545b218 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersDeleteSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersDeleteSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Servers Delete. */
 public final class ServersDeleteSamples {
     /*
-     * operationId: Servers_Delete
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerDelete
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerDelete.json
      */
     /**
      * Sample code: ServerDelete.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersGetByResourceGroupSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersGetByResourceGroupSamples.java
similarity index 73%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersGetByResourceGroupSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersGetByResourceGroupSamples.java
index 5c869a254343d..b74a5b1bd1450 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersGetByResourceGroupSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersGetByResourceGroupSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Servers GetByResourceGroup. */
 public final class ServersGetByResourceGroupSamples {
     /*
-     * operationId: Servers_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerGet
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerGet.json
      */
     /**
      * Sample code: ServerGet.
@@ -23,9 +21,7 @@ public static void serverGet(com.azure.resourcemanager.postgresqlflexibleserver.
     }
 
     /*
-     * operationId: Servers_Get
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerGetWithVnet
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerGetWithVnet.json
      */
     /**
      * Sample code: ServerGetWithVnet.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersListByResourceGroupSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersListByResourceGroupSamples.java
similarity index 74%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersListByResourceGroupSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersListByResourceGroupSamples.java
index 917dfe860e6b8..dd3ed3d991c23 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersListByResourceGroupSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersListByResourceGroupSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Servers ListByResourceGroup. */
 public final class ServersListByResourceGroupSamples {
     /*
-     * operationId: Servers_ListByResourceGroup
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerListByResourceGroup
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerListByResourceGroup.json
      */
     /**
      * Sample code: ServerListByResourceGroup.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersListSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersListSamples.java
similarity index 72%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersListSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersListSamples.java
index e51d79ef485f8..1ac9fbb25fa82 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersListSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersListSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Servers List. */
 public final class ServersListSamples {
     /*
-     * operationId: Servers_List
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerList.json
      */
     /**
      * Sample code: ServerList.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersRestartSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersRestartSamples.java
similarity index 78%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersRestartSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersRestartSamples.java
index 2ba108d11fca1..6dbfe92902190 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersRestartSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersRestartSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.postgresqlflexibleserver.models.FailoverMode;
@@ -11,9 +11,7 @@
 /** Samples for Servers Restart. */
 public final class ServersRestartSamples {
     /*
-     * operationId: Servers_Restart
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerRestart
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerRestart.json
      */
     /**
      * Sample code: ServerRestart.
@@ -25,9 +23,7 @@ public static void serverRestart(com.azure.resourcemanager.postgresqlflexibleser
     }
 
     /*
-     * operationId: Servers_Restart
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerRestartWithFailover
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerRestartWithFailover.json
      */
     /**
      * Sample code: ServerRestartWithFailover.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersStartSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersStartSamples.java
similarity index 73%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersStartSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersStartSamples.java
index ceadc867bc917..1c67ddf3d592c 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersStartSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersStartSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Servers Start. */
 public final class ServersStartSamples {
     /*
-     * operationId: Servers_Start
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerStart
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerStart.json
      */
     /**
      * Sample code: ServerStart.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersStopSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersStopSamples.java
similarity index 73%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersStopSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersStopSamples.java
index b656217a4b5a3..03f53081b1450 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersStopSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersStopSamples.java
@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 
 /** Samples for Servers Stop. */
 public final class ServersStopSamples {
     /*
-     * operationId: Servers_Stop
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerStop
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerStop.json
      */
     /**
      * Sample code: ServerStop.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersUpdateSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersUpdateSamples.java
similarity index 86%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersUpdateSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersUpdateSamples.java
index 3b512d0544b09..1c37b19c022f8 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/ServersUpdateSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/ServersUpdateSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.postgresqlflexibleserver.models.Backup;
@@ -16,9 +16,7 @@
 /** Samples for Servers Update. */
 public final class ServersUpdateSamples {
     /*
-     * operationId: Servers_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerUpdate
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerUpdate.json
      */
     /**
      * Sample code: ServerUpdate.
@@ -39,9 +37,7 @@ public static void serverUpdate(com.azure.resourcemanager.postgresqlflexibleserv
     }
 
     /*
-     * operationId: Servers_Update
-     * api-version: 2021-06-01
-     * x-ms-examples: ServerUpdateWithCustomerMaintenanceWindow
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/ServerUpdateWithCustomerMaintenanceWindow.json
      */
     /**
      * Sample code: ServerUpdateWithCustomerMaintenanceWindow.
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/VirtualNetworkSubnetUsageExecuteSamples.java b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/VirtualNetworkSubnetUsageExecuteSamples.java
similarity index 83%
rename from sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/VirtualNetworkSubnetUsageExecuteSamples.java
rename to sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/VirtualNetworkSubnetUsageExecuteSamples.java
index f224fa85b1cc4..15238a072608e 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/VirtualNetworkSubnetUsageExecuteSamples.java
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/src/samples/java/com/azure/resourcemanager/postgresqlflexibleserver/generated/VirtualNetworkSubnetUsageExecuteSamples.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.postgresqlflexibleserver;
+package com.azure.resourcemanager.postgresqlflexibleserver.generated;
 
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.postgresqlflexibleserver.models.VirtualNetworkSubnetUsageParameter;
@@ -10,9 +10,7 @@
 /** Samples for VirtualNetworkSubnetUsage Execute. */
 public final class VirtualNetworkSubnetUsageExecuteSamples {
     /*
-     * operationId: VirtualNetworkSubnetUsage_Execute
-     * api-version: 2021-06-01
-     * x-ms-examples: VirtualNetworkSubnetUsageList
+     * x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2021-06-01/examples/VirtualNetworkSubnetUsage.json
      */
     /**
      * Sample code: VirtualNetworkSubnetUsageList.