@azure/arm-sql 9.0.2-alpha.20221214.1 → 9.1.0

package/src/operations/managedInstancePrivateEndpointConnections.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { ManagedInstancePrivateEndpointConnections } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -18,12 +19,12 @@ import {
   ManagedInstancePrivateEndpointConnection,
   ManagedInstancePrivateEndpointConnectionsListByManagedInstanceNextOptionalParams,
   ManagedInstancePrivateEndpointConnectionsListByManagedInstanceOptionalParams,
+  ManagedInstancePrivateEndpointConnectionsListByManagedInstanceResponse,
   ManagedInstancePrivateEndpointConnectionsGetOptionalParams,
   ManagedInstancePrivateEndpointConnectionsGetResponse,
   ManagedInstancePrivateEndpointConnectionsCreateOrUpdateOptionalParams,
   ManagedInstancePrivateEndpointConnectionsCreateOrUpdateResponse,
   ManagedInstancePrivateEndpointConnectionsDeleteOptionalParams,
-  ManagedInstancePrivateEndpointConnectionsListByManagedInstanceResponse,
   ManagedInstancePrivateEndpointConnectionsListByManagedInstanceNextResponse
 } from "../models";
 
@@ -65,11 +66,15 @@ export class ManagedInstancePrivateEndpointConnectionsImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByManagedInstancePagingPage(
           resourceGroupName,
           managedInstanceName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -78,15 +83,22 @@ export class ManagedInstancePrivateEndpointConnectionsImpl
   private async *listByManagedInstancePagingPage(
     resourceGroupName: string,
     managedInstanceName: string,
-    options?: ManagedInstancePrivateEndpointConnectionsListByManagedInstanceOptionalParams
+    options?: ManagedInstancePrivateEndpointConnectionsListByManagedInstanceOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ManagedInstancePrivateEndpointConnection[]> {
-    let result = await this._listByManagedInstance(
-      resourceGroupName,
-      managedInstanceName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ManagedInstancePrivateEndpointConnectionsListByManagedInstanceResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByManagedInstance(
+        resourceGroupName,
+        managedInstanceName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByManagedInstanceNext(
         resourceGroupName,
@@ -95,7 +107,9 @@ export class ManagedInstancePrivateEndpointConnectionsImpl
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -481,7 +495,6 @@ const listByManagedInstanceNextOperationSpec: coreClient.OperationSpec = {
     },
     default: {}
   },
-  queryParameters: [Parameters.apiVersion2],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/managedInstancePrivateLinkResources.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { ManagedInstancePrivateLinkResources } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -60,11 +61,15 @@ export class ManagedInstancePrivateLinkResourcesImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByManagedInstancePagingPage(
           resourceGroupName,
           managedInstanceName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -73,15 +78,22 @@ export class ManagedInstancePrivateLinkResourcesImpl
   private async *listByManagedInstancePagingPage(
     resourceGroupName: string,
     managedInstanceName: string,
-    options?: ManagedInstancePrivateLinkResourcesListByManagedInstanceOptionalParams
+    options?: ManagedInstancePrivateLinkResourcesListByManagedInstanceOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ManagedInstancePrivateLink[]> {
-    let result = await this._listByManagedInstance(
-      resourceGroupName,
-      managedInstanceName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ManagedInstancePrivateLinkResourcesListByManagedInstanceResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByManagedInstance(
+        resourceGroupName,
+        managedInstanceName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByManagedInstanceNext(
         resourceGroupName,
@@ -90,7 +102,9 @@ export class ManagedInstancePrivateLinkResourcesImpl
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -221,7 +235,6 @@ const listByManagedInstanceNextOperationSpec: coreClient.OperationSpec = {
     },
     default: {}
   },
-  queryParameters: [Parameters.apiVersion2],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/managedInstanceVulnerabilityAssessments.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { ManagedInstanceVulnerabilityAssessments } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,13 +17,13 @@ import {
   ManagedInstanceVulnerabilityAssessment,
   ManagedInstanceVulnerabilityAssessmentsListByInstanceNextOptionalParams,
   ManagedInstanceVulnerabilityAssessmentsListByInstanceOptionalParams,
+  ManagedInstanceVulnerabilityAssessmentsListByInstanceResponse,
   VulnerabilityAssessmentName,
   ManagedInstanceVulnerabilityAssessmentsGetOptionalParams,
   ManagedInstanceVulnerabilityAssessmentsGetResponse,
   ManagedInstanceVulnerabilityAssessmentsCreateOrUpdateOptionalParams,
   ManagedInstanceVulnerabilityAssessmentsCreateOrUpdateResponse,
   ManagedInstanceVulnerabilityAssessmentsDeleteOptionalParams,
-  ManagedInstanceVulnerabilityAssessmentsListByInstanceResponse,
   ManagedInstanceVulnerabilityAssessmentsListByInstanceNextResponse
 } from "../models";
 
@@ -65,11 +66,15 @@ export class ManagedInstanceVulnerabilityAssessmentsImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByInstancePagingPage(
           resourceGroupName,
           managedInstanceName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -78,15 +83,22 @@ export class ManagedInstanceVulnerabilityAssessmentsImpl
   private async *listByInstancePagingPage(
     resourceGroupName: string,
     managedInstanceName: string,
-    options?: ManagedInstanceVulnerabilityAssessmentsListByInstanceOptionalParams
+    options?: ManagedInstanceVulnerabilityAssessmentsListByInstanceOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ManagedInstanceVulnerabilityAssessment[]> {
-    let result = await this._listByInstance(
-      resourceGroupName,
-      managedInstanceName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ManagedInstanceVulnerabilityAssessmentsListByInstanceResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByInstance(
+        resourceGroupName,
+        managedInstanceName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByInstanceNext(
         resourceGroupName,
@@ -95,7 +107,9 @@ export class ManagedInstanceVulnerabilityAssessmentsImpl
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -332,7 +346,6 @@ const listByInstanceNextOperationSpec: coreClient.OperationSpec = {
     },
     default: {}
   },
-  queryParameters: [Parameters.apiVersion2],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/managedInstances.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { ManagedInstances } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -18,16 +19,17 @@ import {
   ManagedInstance,
   ManagedInstancesListByInstancePoolNextOptionalParams,
   ManagedInstancesListByInstancePoolOptionalParams,
+  ManagedInstancesListByInstancePoolResponse,
   ManagedInstancesListNextOptionalParams,
   ManagedInstancesListOptionalParams,
+  ManagedInstancesListResponse,
   ManagedInstancesListByResourceGroupNextOptionalParams,
   ManagedInstancesListByResourceGroupOptionalParams,
+  ManagedInstancesListByResourceGroupResponse,
   TopQueries,
   ManagedInstancesListByManagedInstanceNextOptionalParams,
   ManagedInstancesListByManagedInstanceOptionalParams,
-  ManagedInstancesListByInstancePoolResponse,
-  ManagedInstancesListResponse,
-  ManagedInstancesListByResourceGroupResponse,
+  ManagedInstancesListByManagedInstanceResponse,
   ManagedInstancesGetOptionalParams,
   ManagedInstancesGetResponse,
   ManagedInstancesCreateOrUpdateOptionalParams,
@@ -36,7 +38,6 @@ import {
   ManagedInstanceUpdate,
   ManagedInstancesUpdateOptionalParams,
   ManagedInstancesUpdateResponse,
-  ManagedInstancesListByManagedInstanceResponse,
   ManagedInstancesFailoverOptionalParams,
   ManagedInstancesListByInstancePoolNextResponse,
   ManagedInstancesListNextResponse,
@@ -81,11 +82,15 @@ export class ManagedInstancesImpl implements ManagedInstances {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByInstancePoolPagingPage(
           resourceGroupName,
           instancePoolName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -94,15 +99,22 @@ export class ManagedInstancesImpl implements ManagedInstances {
   private async *listByInstancePoolPagingPage(
     resourceGroupName: string,
     instancePoolName: string,
-    options?: ManagedInstancesListByInstancePoolOptionalParams
+    options?: ManagedInstancesListByInstancePoolOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ManagedInstance[]> {
-    let result = await this._listByInstancePool(
-      resourceGroupName,
-      instancePoolName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ManagedInstancesListByInstancePoolResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByInstancePool(
+        resourceGroupName,
+        instancePoolName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByInstancePoolNext(
         resourceGroupName,
@@ -111,7 +123,9 @@ export class ManagedInstancesImpl implements ManagedInstances {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -144,22 +158,34 @@ export class ManagedInstancesImpl implements ManagedInstances {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(options, settings);
       }
     };
   }
 
   private async *listPagingPage(
-    options?: ManagedInstancesListOptionalParams
+    options?: ManagedInstancesListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ManagedInstance[]> {
-    let result = await this._list(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ManagedInstancesListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -189,19 +215,33 @@ export class ManagedInstancesImpl implements ManagedInstances {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listByResourceGroupPagingPage(resourceGroupName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listByResourceGroupPagingPage(
+          resourceGroupName,
+          options,
+          settings
+        );
       }
     };
   }
 
   private async *listByResourceGroupPagingPage(
     resourceGroupName: string,
-    options?: ManagedInstancesListByResourceGroupOptionalParams
+    options?: ManagedInstancesListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ManagedInstance[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ManagedInstancesListByResourceGroupResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByResourceGroup(resourceGroupName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByResourceGroupNext(
         resourceGroupName,
@@ -209,7 +249,9 @@ export class ManagedInstancesImpl implements ManagedInstances {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -249,11 +291,15 @@ export class ManagedInstancesImpl implements ManagedInstances {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByManagedInstancePagingPage(
           resourceGroupName,
           managedInstanceName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -262,15 +308,22 @@ export class ManagedInstancesImpl implements ManagedInstances {
   private async *listByManagedInstancePagingPage(
     resourceGroupName: string,
     managedInstanceName: string,
-    options?: ManagedInstancesListByManagedInstanceOptionalParams
+    options?: ManagedInstancesListByManagedInstanceOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<TopQueries[]> {
-    let result = await this._listByManagedInstance(
-      resourceGroupName,
-      managedInstanceName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ManagedInstancesListByManagedInstanceResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByManagedInstance(
+        resourceGroupName,
+        managedInstanceName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByManagedInstanceNext(
         resourceGroupName,
@@ -279,7 +332,9 @@ export class ManagedInstancesImpl implements ManagedInstances {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -1011,7 +1066,6 @@ const listByInstancePoolNextOperationSpec: coreClient.OperationSpec = {
     },
     default: {}
   },
-  queryParameters: [Parameters.apiVersion1, Parameters.expand],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -1031,7 +1085,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
     },
     default: {}
   },
-  queryParameters: [Parameters.apiVersion1, Parameters.expand],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -1049,7 +1102,6 @@ const listByResourceGroupNextOperationSpec: coreClient.OperationSpec = {
     },
     default: {}
   },
-  queryParameters: [Parameters.apiVersion1, Parameters.expand],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -1068,16 +1120,6 @@ const listByManagedInstanceNextOperationSpec: coreClient.OperationSpec = {
     },
     default: {}
   },
-  queryParameters: [
-    Parameters.apiVersion1,
-    Parameters.startTime,
-    Parameters.endTime,
-    Parameters.interval,
-    Parameters.numberOfQueries,
-    Parameters.databases,
-    Parameters.aggregationFunction,
-    Parameters.observationMetric
-  ],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/managedRestorableDroppedDatabaseBackupShortTermRetentionPolicies.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -18,6 +19,7 @@ import {
   ManagedBackupShortTermRetentionPolicy,
   ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesListByRestorableDroppedDatabaseNextOptionalParams,
   ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesListByRestorableDroppedDatabaseOptionalParams,
+  ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesListByRestorableDroppedDatabaseResponse,
   ManagedShortTermRetentionPolicyName,
   ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesGetOptionalParams,
   ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesGetResponse,
@@ -25,7 +27,6 @@ import {
   ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesCreateOrUpdateResponse,
   ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesUpdateOptionalParams,
   ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesUpdateResponse,
-  ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesListByRestorableDroppedDatabaseResponse,
   ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesListByRestorableDroppedDatabaseNextResponse
 } from "../models";
 
@@ -70,12 +71,16 @@ export class ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesImp
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByRestorableDroppedDatabasePagingPage(
           resourceGroupName,
           managedInstanceName,
           restorableDroppedDatabaseId,
-          options
+          options,
+          settings
         );
       }
     };
@@ -85,16 +90,23 @@ export class ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesImp
     resourceGroupName: string,
     managedInstanceName: string,
     restorableDroppedDatabaseId: string,
-    options?: ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesListByRestorableDroppedDatabaseOptionalParams
+    options?: ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesListByRestorableDroppedDatabaseOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ManagedBackupShortTermRetentionPolicy[]> {
-    let result = await this._listByRestorableDroppedDatabase(
-      resourceGroupName,
-      managedInstanceName,
-      restorableDroppedDatabaseId,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesListByRestorableDroppedDatabaseResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByRestorableDroppedDatabase(
+        resourceGroupName,
+        managedInstanceName,
+        restorableDroppedDatabaseId,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByRestorableDroppedDatabaseNext(
         resourceGroupName,
@@ -104,7 +116,9 @@ export class ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesImp
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -563,7 +577,6 @@ const listByRestorableDroppedDatabaseNextOperationSpec: coreClient.OperationSpec
     },
     default: {}
   },
-  queryParameters: [Parameters.apiVersion2],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,