Update Autorest version to 20211207.1 (#25789)

* Update Autorest version to 20211207.1 * Build fix * Update package version * Build fix * Build fix
Azure · Dec 9, 2021 · 51f030b · 51f030b
1 parent 18eff24
commit 51f030b
Show file tree

Hide file tree

Showing 11 changed files with 128 additions and 128 deletions.
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
@@ -146,7 +146,7 @@
     All should have PrivateAssets="All" set so they don't become package dependencies
   -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20211203.1" PrivateAssets="All" />
+    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20211209.1" PrivateAssets="All" />
     <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20210903.4" PrivateAssets="All" />
     <PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />

diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/AnalyzeDocumentOperation.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/AnalyzeDocumentOperation.cs
@@ -185,8 +185,8 @@ public override async ValueTask<Response> UpdateStatusAsync(CancellationToken ca
         async ValueTask<OperationState<AnalyzeResult>> IOperation<AnalyzeResult>.UpdateStateAsync(bool async, CancellationToken cancellationToken)
         {
             Response<AnalyzeResultOperation> response = async
-                ? await _serviceClient.DocumentAnalysisGetAnalyzeDocumentResultAsync(_modelId, _resultId, cancellationToken).ConfigureAwait(false)
-                : _serviceClient.DocumentAnalysisGetAnalyzeDocumentResult(_modelId, _resultId, cancellationToken);
+                ? await _serviceClient.GetAnalyzeDocumentResultAsync(_modelId, _resultId, cancellationToken).ConfigureAwait(false)
+                : _serviceClient.GetAnalyzeDocumentResult(_modelId, _resultId, cancellationToken);
 
             AnalyzeResultOperationStatus status = response.Value.Status;
             Response rawResponse = response.GetRawResponse();

diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/BuildModelOperation.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/BuildModelOperation.cs
@@ -155,8 +155,8 @@ public override async ValueTask<Response> UpdateStatusAsync(CancellationToken ca
         async ValueTask<OperationState<DocumentModel>> IOperation<DocumentModel>.UpdateStateAsync(bool async, CancellationToken cancellationToken)
         {
             Response<ModelOperation> response = async
-                ? await _serviceClient.DocumentAnalysisGetOperationAsync(Id, cancellationToken).ConfigureAwait(false)
-                : _serviceClient.DocumentAnalysisGetOperation(Id, cancellationToken);
+                ? await _serviceClient.GetOperationAsync(Id, cancellationToken).ConfigureAwait(false)
+                : _serviceClient.GetOperation(Id, cancellationToken);
 
             DocumentOperationStatus status = response.Value.Status;
             Response rawResponse = response.GetRawResponse();

diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/CopyModelOperation.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/CopyModelOperation.cs
@@ -160,8 +160,8 @@ public override async ValueTask<Response> UpdateStatusAsync(CancellationToken ca
         async ValueTask<OperationState<DocumentModel>> IOperation<DocumentModel>.UpdateStateAsync(bool async, CancellationToken cancellationToken)
         {
             Response<ModelOperation> response = async
-                    ? await _serviceClient.DocumentAnalysisGetOperationAsync(Id, cancellationToken).ConfigureAwait(false)
-                    : _serviceClient.DocumentAnalysisGetOperation(Id, cancellationToken);
+                    ? await _serviceClient.GetOperationAsync(Id, cancellationToken).ConfigureAwait(false)
+                    : _serviceClient.GetOperation(Id, cancellationToken);
 
             DocumentOperationStatus status = response.Value.Status;
             Response rawResponse = response.GetRawResponse();

diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/DocumentAnalysisClient.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/DocumentAnalysisClient.cs
@@ -141,7 +141,7 @@ public virtual async Task<AnalyzeDocumentOperation> StartAnalyzeDocumentAsync(st
 
             try
             {
-                var response = await ServiceClient.DocumentAnalysisAnalyzeDocumentAsync(
+                var response = await ServiceClient.AnalyzeDocumentAsync(
                     modelId,
                     ContentType1.ApplicationOctetStream,
                     analyzeDocumentOptions.Pages.Count == 0 ? null : string.Join(",", analyzeDocumentOptions.Pages),
@@ -191,7 +191,7 @@ public virtual AnalyzeDocumentOperation StartAnalyzeDocument(string modelId, Str
 
             try
             {
-                var response = ServiceClient.DocumentAnalysisAnalyzeDocument(
+                var response = ServiceClient.AnalyzeDocument(
                     modelId,
                     ContentType1.ApplicationOctetStream,
                     analyzeDocumentOptions.Pages.Count == 0 ? null : string.Join(",", analyzeDocumentOptions.Pages),
@@ -242,7 +242,7 @@ public virtual async Task<AnalyzeDocumentOperation> StartAnalyzeDocumentFromUriA
             try
             {
                 var request = new AnalyzeDocumentRequest() { UrlSource = documentUri.AbsoluteUri };
-                var response = await ServiceClient.DocumentAnalysisAnalyzeDocumentAsync(
+                var response = await ServiceClient.AnalyzeDocumentAsync(
                     modelId,
                     analyzeDocumentOptions.Pages.Count == 0 ? null : string.Join(",", analyzeDocumentOptions.Pages),
                     analyzeDocumentOptions.Locale,
@@ -292,7 +292,7 @@ public virtual AnalyzeDocumentOperation StartAnalyzeDocumentFromUri(string model
             try
             {
                 var request = new AnalyzeDocumentRequest() { UrlSource = documentUri.AbsoluteUri };
-                var response = ServiceClient.DocumentAnalysisAnalyzeDocument(
+                var response = ServiceClient.AnalyzeDocument(
                     modelId,
                     analyzeDocumentOptions.Pages.Count == 0 ? null : string.Join(",", analyzeDocumentOptions.Pages),
                     analyzeDocumentOptions.Locale,

diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/DocumentModelAdministrationClient.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/DocumentModelAdministrationClient.cs
@@ -147,7 +147,7 @@ public virtual BuildModelOperation StartBuildModel(Uri trainingFilesUri, string
                     Description = buildModelOptions.ModelDescription
                 };
 
-                var response = ServiceClient.DocumentAnalysisBuildDocumentModel(request, cancellationToken);
+                var response = ServiceClient.BuildDocumentModel(request, cancellationToken);
                 return new BuildModelOperation(response.Headers.OperationLocation, response.GetRawResponse(), ServiceClient, Diagnostics);
             }
             catch (Exception e)
@@ -193,7 +193,7 @@ public virtual async Task<BuildModelOperation> StartBuildModelAsync(Uri training
                     Description = buildModelOptions.ModelDescription
                 };
 
-                var response = await ServiceClient.DocumentAnalysisBuildDocumentModelAsync(request, cancellationToken).ConfigureAwait(false);
+                var response = await ServiceClient.BuildDocumentModelAsync(request, cancellationToken).ConfigureAwait(false);
                 return new BuildModelOperation(response.Headers.OperationLocation, response.GetRawResponse(), ServiceClient, Diagnostics);
             }
             catch (Exception e)
@@ -222,7 +222,7 @@ public virtual Response<DocumentModel> GetModel(string modelId, CancellationToke
 
             try
             {
-                Response<DocumentModel> response = ServiceClient.DocumentAnalysisGetModel(modelId, cancellationToken);
+                Response<DocumentModel> response = ServiceClient.GetModel(modelId, cancellationToken);
                 return Response.FromValue(response.Value, response.GetRawResponse());
             }
             catch (Exception e)
@@ -248,7 +248,7 @@ public virtual async Task<Response<DocumentModel>> GetModelAsync(string modelId,
 
             try
             {
-                Response<DocumentModel> response = await ServiceClient.DocumentAnalysisGetModelAsync(modelId, cancellationToken).ConfigureAwait(false);
+                Response<DocumentModel> response = await ServiceClient.GetModelAsync(modelId, cancellationToken).ConfigureAwait(false);
                 return Response.FromValue(response.Value, response.GetRawResponse());
             }
             catch (Exception e)
@@ -273,7 +273,7 @@ public virtual Response DeleteModel(string modelId, CancellationToken cancellati
 
             try
             {
-                return ServiceClient.DocumentAnalysisDeleteModel(modelId, cancellationToken);
+                return ServiceClient.DeleteModel(modelId, cancellationToken);
             }
             catch (Exception e)
             {
@@ -297,7 +297,7 @@ public virtual async Task<Response> DeleteModelAsync(string modelId, Cancellatio
 
             try
             {
-                return await ServiceClient.DocumentAnalysisDeleteModelAsync(modelId, cancellationToken).ConfigureAwait(false);
+                return await ServiceClient.DeleteModelAsync(modelId, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception e)
             {
@@ -320,7 +320,7 @@ Page<DocumentModelInfo> FirstPageFunc(int? pageSizeHint)
 
                 try
                 {
-                    Response<GetModelsResponse> response = ServiceClient.DocumentAnalysisGetModels(cancellationToken);
+                    Response<GetModelsResponse> response = ServiceClient.GetModels(cancellationToken);
                     return Page.FromValues(response.Value.Value, response.Value.NextLink, response.GetRawResponse());
                 }
                 catch (Exception e)
@@ -337,7 +337,7 @@ Page<DocumentModelInfo> NextPageFunc(string nextLink, int? pageSizeHint)
 
                 try
                 {
-                    Response<GetModelsResponse> response = ServiceClient.DocumentAnalysisGetModelsNextPage(nextLink, cancellationToken);
+                    Response<GetModelsResponse> response = ServiceClient.GetModelsNextPage(nextLink, cancellationToken);
                     return Page.FromValues(response.Value.Value, response.Value.NextLink, response.GetRawResponse());
                 }
                 catch (Exception e)
@@ -364,7 +364,7 @@ async Task<Page<DocumentModelInfo>> FirstPageFunc(int? pageSizeHint)
 
                 try
                 {
-                    Response<GetModelsResponse> response = await ServiceClient.DocumentAnalysisGetModelsAsync(cancellationToken).ConfigureAwait(false);
+                    Response<GetModelsResponse> response = await ServiceClient.GetModelsAsync(cancellationToken).ConfigureAwait(false);
                     return Page.FromValues(response.Value.Value, response.Value.NextLink, response.GetRawResponse());
                 }
                 catch (Exception e)
@@ -381,7 +381,7 @@ async Task<Page<DocumentModelInfo>> NextPageFunc(string nextLink, int? pageSizeH
 
                 try
                 {
-                    Response<GetModelsResponse> response = await ServiceClient.DocumentAnalysisGetModelsNextPageAsync(nextLink, cancellationToken).ConfigureAwait(false);
+                    Response<GetModelsResponse> response = await ServiceClient.GetModelsNextPageAsync(nextLink, cancellationToken).ConfigureAwait(false);
                     return Page.FromValues(response.Value.Value, response.Value.NextLink, response.GetRawResponse());
                 }
                 catch (Exception e)
@@ -407,7 +407,7 @@ public virtual Response<AccountProperties> GetAccountProperties(CancellationToke
 
             try
             {
-                Response<GetInfoResponse> response = ServiceClient.DocumentAnalysisGetInfo(cancellationToken);
+                Response<GetInfoResponse> response = ServiceClient.GetInfo(cancellationToken);
                 return Response.FromValue(response.Value.CustomDocumentModels, response.GetRawResponse());
             }
             catch (Exception e)
@@ -430,7 +430,7 @@ public virtual async Task<Response<AccountProperties>> GetAccountPropertiesAsync
 
             try
             {
-                Response<GetInfoResponse> response = await ServiceClient.DocumentAnalysisGetInfoAsync(cancellationToken).ConfigureAwait(false);
+                Response<GetInfoResponse> response = await ServiceClient.GetInfoAsync(cancellationToken).ConfigureAwait(false);
                 return Response.FromValue(response.Value.CustomDocumentModels, response.GetRawResponse());
             }
             catch (Exception e)
@@ -456,7 +456,7 @@ public virtual Response<ModelOperation> GetOperation(string operationId, Cancell
 
             try
             {
-                var response = ServiceClient.DocumentAnalysisGetOperation(operationId, cancellationToken);
+                var response = ServiceClient.GetOperation(operationId, cancellationToken);
                 return Response.FromValue(response.Value, response.GetRawResponse());
             }
             catch (Exception e)
@@ -482,7 +482,7 @@ public virtual async Task<Response<ModelOperation>> GetOperationAsync(string ope
 
             try
             {
-                var response = await ServiceClient.DocumentAnalysisGetOperationAsync(operationId, cancellationToken).ConfigureAwait(false);
+                var response = await ServiceClient.GetOperationAsync(operationId, cancellationToken).ConfigureAwait(false);
                 return Response.FromValue(response.Value, response.GetRawResponse());
             }
             catch (Exception e)
@@ -506,7 +506,7 @@ Page<ModelOperationInfo> FirstPageFunc(int? pageSizeHint)
 
                 try
                 {
-                    var response = ServiceClient.DocumentAnalysisGetOperations(cancellationToken);
+                    var response = ServiceClient.GetOperations(cancellationToken);
                     return Page.FromValues(response.Value.Value, response.Value.NextLink, response.GetRawResponse());
                 }
                 catch (Exception e)
@@ -523,7 +523,7 @@ Page<ModelOperationInfo> NextPageFunc(string nextLink, int? pageSizeHint)
 
                 try
                 {
-                    var response = ServiceClient.DocumentAnalysisGetOperationsNextPage(nextLink, cancellationToken);
+                    var response = ServiceClient.GetOperationsNextPage(nextLink, cancellationToken);
                     return Page.FromValues(response.Value.Value, response.Value.NextLink, response.GetRawResponse());
                 }
                 catch (Exception e)
@@ -550,7 +550,7 @@ async Task<Page<ModelOperationInfo>> FirstPageFunc(int? pageSizeHint)
 
                 try
                 {
-                    var response = await ServiceClient.DocumentAnalysisGetOperationsAsync(cancellationToken).ConfigureAwait(false);
+                    var response = await ServiceClient.GetOperationsAsync(cancellationToken).ConfigureAwait(false);
                     return Page.FromValues(response.Value.Value, response.Value.NextLink, response.GetRawResponse());
                 }
                 catch (Exception e)
@@ -567,7 +567,7 @@ async Task<Page<ModelOperationInfo>> NextPageFunc(string nextLink, int? pageSize
 
                 try
                 {
-                    var response = await ServiceClient.DocumentAnalysisGetOperationsNextPageAsync(nextLink, cancellationToken).ConfigureAwait(false);
+                    var response = await ServiceClient.GetOperationsNextPageAsync(nextLink, cancellationToken).ConfigureAwait(false);
                     return Page.FromValues(response.Value.Value, response.Value.NextLink, response.GetRawResponse());
                 }
                 catch (Exception e)
@@ -602,7 +602,7 @@ public virtual CopyModelOperation StartCopyModel(string modelId, CopyAuthorizati
 
             try
             {
-                var response = ServiceClient.DocumentAnalysisCopyDocumentModelTo(modelId, target, cancellationToken);
+                var response = ServiceClient.CopyDocumentModelTo(modelId, target, cancellationToken);
                 return new CopyModelOperation(ServiceClient, Diagnostics, response.Headers.OperationLocation, response.GetRawResponse());
             }
             catch (Exception e)
@@ -631,7 +631,7 @@ public virtual async Task<CopyModelOperation> StartCopyModelAsync(string modelId
 
             try
             {
-                var response = await ServiceClient.DocumentAnalysisCopyDocumentModelToAsync(modelId, target, cancellationToken).ConfigureAwait(false);
+                var response = await ServiceClient.CopyDocumentModelToAsync(modelId, target, cancellationToken).ConfigureAwait(false);
                 return new CopyModelOperation(ServiceClient, Diagnostics, response.Headers.OperationLocation, response.GetRawResponse());
             }
             catch (Exception e)
@@ -663,7 +663,7 @@ public virtual Response<CopyAuthorization> GetCopyAuthorization(string modelId =
 
             try
             {
-                var response = ServiceClient.DocumentAnalysisAuthorizeCopyDocumentModel(request, cancellationToken);
+                var response = ServiceClient.AuthorizeCopyDocumentModel(request, cancellationToken);
                 return Response.FromValue(response.Value, response.GetRawResponse());
             }
             catch (Exception e)
@@ -695,7 +695,7 @@ public virtual async Task<Response<CopyAuthorization>> GetCopyAuthorizationAsync
 
             try
             {
-                var response = await ServiceClient.DocumentAnalysisAuthorizeCopyDocumentModelAsync(request, cancellationToken).ConfigureAwait(false);
+                var response = await ServiceClient.AuthorizeCopyDocumentModelAsync(request, cancellationToken).ConfigureAwait(false);
                 return Response.FromValue(response.Value, response.GetRawResponse());
             }
             catch (Exception e)
@@ -738,7 +738,7 @@ public virtual BuildModelOperation StartCreateComposedModel(IEnumerable<string>
                     Description = modelDescription
                 };
 
-                var response = ServiceClient.DocumentAnalysisComposeDocumentModel(composeRequest, cancellationToken);
+                var response = ServiceClient.ComposeDocumentModel(composeRequest, cancellationToken);
                 return new BuildModelOperation(response.Headers.OperationLocation, response.GetRawResponse(), ServiceClient, Diagnostics);
             }
             catch (Exception e)
@@ -777,7 +777,7 @@ public virtual async Task<BuildModelOperation> StartCreateComposedModelAsync(IEn
                     Description = modelDescription
                 };
 
-                var response = await ServiceClient.DocumentAnalysisComposeDocumentModelAsync(composeRequest, cancellationToken).ConfigureAwait(false);
+                var response = await ServiceClient.ComposeDocumentModelAsync(composeRequest, cancellationToken).ConfigureAwait(false);
                 return new BuildModelOperation(response.Headers.OperationLocation, response.GetRawResponse(), ServiceClient, Diagnostics);
             }
             catch (Exception e)

diff --git a/...DocumentAnalysisAnalyzeDocumentHeaders.cs → ...DocumentAnalysisAnalyzeDocumentHeaders.cs b/...DocumentAnalysisAnalyzeDocumentHeaders.cs → ...DocumentAnalysisAnalyzeDocumentHeaders.cs
diff --git a/...umentAnalysisBuildDocumentModelHeaders.cs → ...umentAnalysisBuildDocumentModelHeaders.cs b/...umentAnalysisBuildDocumentModelHeaders.cs → ...umentAnalysisBuildDocumentModelHeaders.cs
diff --git a/...mentAnalysisCopyDocumentModelToHeaders.cs → ...entAnalysisComposeDocumentModelHeaders.cs b/...mentAnalysisCopyDocumentModelToHeaders.cs → ...entAnalysisComposeDocumentModelHeaders.cs