Merge pull request Azure#127 from Azure/ProgressNotifications

Progress notifications
sarangan12 · May 30, 2018 · 72bbb94 · 72bbb94
2 parents 1ca0eb6 + 8b5ebe1
commit 72bbb94
Show file tree

Hide file tree

Showing 79 changed files with 2,813 additions and 4,974 deletions.
diff --git a/src/vanilla/Model/MethodTS.cs b/src/vanilla/Model/MethodTS.cs
@@ -876,23 +876,22 @@ public string GenerateSendOperationRequest()
             builder.FunctionCall("await client.sendOperationRequest", argumentList =>
             {
                 argumentList.Text("httpRequest");
-                argumentList.Object(GenerateOperationArguments);
+                argumentList.FunctionCall("msRest.createOperationArguments", GenerateOperationArguments);
                 argumentList.Object(GenerateOperationSpec);
             });
             return builder.ToString();
         }
 
-        public void GenerateOperationArguments(TSObject operationArguments)
+        public void GenerateOperationArguments(TSArgumentList operationArguments)
         {
-            operationArguments.ObjectProperty("arguments", arguments =>
+            operationArguments.Object(obj =>
             {
                 foreach (Parameter parameter in LogicalParameters)
                 {
-                    arguments.TextProperty(parameter.Name, parameter.Name);
+                    obj.TextProperty(parameter.Name, parameter.Name);
                 }
             });
-            operationArguments.TextProperty("abortSignal", "options && options.abortSignal");
-            operationArguments.TextProperty("customHeaders", "options && options.customHeaders");
+            operationArguments.Text("options");
         }
 
         public void GenerateOperationSpec(TSObject operationSpec)

diff --git a/test/azure/generated/AzureCompositeModelClient/azureCompositeModel.ts b/test/azure/generated/AzureCompositeModelClient/azureCompositeModel.ts
@@ -148,16 +148,14 @@ class AzureCompositeModel extends msRestAzure.AzureServiceClient {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.subscriptionId": this.subscriptionId,
             resourceGroupName,
             apiVersion,
             "this.acceptLanguage": this.acceptLanguage
           },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          options),
         {
           httpMethod: "GET",
           baseUrl: this.baseUri,
@@ -286,17 +284,15 @@ class AzureCompositeModel extends msRestAzure.AzureServiceClient {
       let requestModelMapper = Mappers.CatalogDictionaryOfArray;
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             subscriptionId,
             resourceGroupName,
             apiVersion,
             "this.acceptLanguage": this.acceptLanguage,
             bodyParameter
           },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          options),
         {
           httpMethod: "POST",
           baseUrl: this.baseUri,
@@ -427,17 +423,15 @@ class AzureCompositeModel extends msRestAzure.AzureServiceClient {
       let requestModelMapper = Mappers.CatalogArrayOfDictionary;
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             subscriptionId,
             resourceGroupName,
             apiVersion,
             "this.acceptLanguage": this.acceptLanguage,
             bodyParameter
           },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          options),
         {
           httpMethod: "PUT",
           baseUrl: this.baseUri,

diff --git a/test/azure/generated/AzureCompositeModelClient/operations/arrayModel.ts b/test/azure/generated/AzureCompositeModelClient/operations/arrayModel.ts
@@ -54,13 +54,11 @@ export class ArrayModel {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,
@@ -163,14 +161,12 @@ export class ArrayModel {
       let requestModelMapper = Mappers.ArrayWrapper;
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage,
             complexBody
           },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          options),
         {
           httpMethod: "PUT",
           baseUrl: this.client.baseUri,
@@ -247,13 +243,11 @@ export class ArrayModel {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,
@@ -356,14 +350,12 @@ export class ArrayModel {
       let requestModelMapper = Mappers.ArrayWrapper;
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage,
             complexBody
           },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          options),
         {
           httpMethod: "PUT",
           baseUrl: this.client.baseUri,
@@ -441,13 +433,11 @@ export class ArrayModel {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,

diff --git a/test/azure/generated/AzureCompositeModelClient/operations/basicOperations.ts b/test/azure/generated/AzureCompositeModelClient/operations/basicOperations.ts
@@ -54,13 +54,11 @@ export class BasicOperations {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,
@@ -156,15 +154,13 @@ export class BasicOperations {
       let requestModelMapper = Mappers.Basic;
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             complexBody,
             apiVersion,
             "this.client.acceptLanguage": this.client.acceptLanguage
           },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          options),
         {
           httpMethod: "PUT",
           baseUrl: this.client.baseUri,
@@ -248,13 +244,11 @@ export class BasicOperations {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,
@@ -343,13 +337,11 @@ export class BasicOperations {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,
@@ -438,13 +430,11 @@ export class BasicOperations {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,
@@ -533,13 +523,11 @@ export class BasicOperations {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,

diff --git a/test/azure/generated/AzureCompositeModelClient/operations/dictionary.ts b/test/azure/generated/AzureCompositeModelClient/operations/dictionary.ts
@@ -54,13 +54,11 @@ export class Dictionary {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,
@@ -163,14 +161,12 @@ export class Dictionary {
       let requestModelMapper = Mappers.DictionaryWrapper;
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage,
             complexBody
           },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          options),
         {
           httpMethod: "PUT",
           baseUrl: this.client.baseUri,
@@ -247,13 +243,11 @@ export class Dictionary {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,
@@ -356,14 +350,12 @@ export class Dictionary {
       let requestModelMapper = Mappers.DictionaryWrapper;
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage,
             complexBody
           },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          options),
         {
           httpMethod: "PUT",
           baseUrl: this.client.baseUri,
@@ -440,13 +432,11 @@ export class Dictionary {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,
@@ -536,13 +526,11 @@ export class Dictionary {
     try {
       operationRes = await client.sendOperationRequest(
         httpRequest,
-        {
-          arguments: {
+        msRest.createOperationArguments(
+          {
             "this.client.acceptLanguage": this.client.acceptLanguage
-          },
-          abortSignal: options && options.abortSignal,
-          customHeaders: options && options.customHeaders
-        },
+          }
+          ,options),
         {
           httpMethod: "GET",
           baseUrl: this.client.baseUri,