Form recognizer Consistency updates (Azure#30716)

Author: samvaity

sdk/aot/azure-aot-graalvm-samples/src/main/java/com/azure/aot/graalvm/samples/formrecognizer/FormRecognizerSample.java

@@ -9,7 +9,7 @@
 import com.azure.ai.formrecognizer.documentanalysis.models.AnalyzedDocument;
 import com.azure.ai.formrecognizer.documentanalysis.models.DocumentField;
 import com.azure.ai.formrecognizer.documentanalysis.models.DocumentFieldType;
-import com.azure.ai.formrecognizer.documentanalysis.models.DocumentOperationResult;
+import com.azure.ai.formrecognizer.documentanalysis.models.OperationResult;
 import com.azure.core.credential.AzureKeyCredential;
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.polling.SyncPoller;
@@ -55,7 +55,7 @@ public static void runSample() throws IOException {
 
         BinaryData targetData = BinaryData.fromStream(resourceAsStream);
 
-        SyncPoller<DocumentOperationResult, AnalyzeResult> analyzeReceiptPoller =
+        SyncPoller<OperationResult, AnalyzeResult> analyzeReceiptPoller =
                 client.beginAnalyzeDocument("prebuilt-receipt", targetData, fileContent.length);
 
         AnalyzeResult receiptResults = analyzeReceiptPoller.getFinalResult();

sdk/formrecognizer/azure-ai-formrecognizer-perf/src/main/java/com/azure/ai/formrecognizer/perf/BuildDocumentModelTest.java

@@ -3,10 +3,10 @@
 
 package com.azure.ai.formrecognizer.perf;
 
-import com.azure.ai.formrecognizer.documentanalysis.administration.models.BuildModelOptions;
+import com.azure.ai.formrecognizer.documentanalysis.administration.models.BuildDocumentModelOptions;
 import com.azure.ai.formrecognizer.documentanalysis.administration.models.DocumentModelBuildMode;
 import com.azure.ai.formrecognizer.documentanalysis.administration.models.DocumentModelDetails;
-import com.azure.ai.formrecognizer.documentanalysis.models.DocumentOperationResult;
+import com.azure.ai.formrecognizer.documentanalysis.models.OperationResult;
 import com.azure.ai.formrecognizer.perf.core.ServiceTest;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.perf.test.core.PerfStressOptions;
@@ -31,11 +31,11 @@ public BuildDocumentModelTest(PerfStressOptions options) {
 
     @Override
     public void run() {
-        SyncPoller<DocumentOperationResult, DocumentModelDetails>
+        SyncPoller<OperationResult, DocumentModelDetails>
             syncPoller = documentModelAdministrationAsyncClient
-            .beginBuildModel(FORM_RECOGNIZER_TRAINING_BLOB_CONTAINER_SAS_URL,
+            .beginBuildDocumentModel(FORM_RECOGNIZER_TRAINING_BLOB_CONTAINER_SAS_URL,
                 DocumentModelBuildMode.TEMPLATE, null,
-                new BuildModelOptions().setDescription("perf-training-model"))
+                new BuildDocumentModelOptions().setDescription("perf-training-model"))
             .getSyncPoller();
         modelId = syncPoller.getFinalResult().getModelId();
         assert modelId != null;
@@ -44,9 +44,9 @@ public void run() {
     @Override
     public Mono<Void> runAsync() {
         return documentModelAdministrationAsyncClient
-            .beginBuildModel(FORM_RECOGNIZER_TRAINING_BLOB_CONTAINER_SAS_URL,
+            .beginBuildDocumentModel(FORM_RECOGNIZER_TRAINING_BLOB_CONTAINER_SAS_URL,
                 DocumentModelBuildMode.TEMPLATE, null,
-                new BuildModelOptions().setDescription("perf-training-model"))
+                new BuildDocumentModelOptions().setDescription("perf-training-model"))
             .last()
             .flatMap(pollResponse -> {
                 if (pollResponse.getStatus().isComplete()) {

sdk/formrecognizer/azure-ai-formrecognizer-perf/src/main/java/com/azure/ai/formrecognizer/perf/core/ServiceTest.java

@@ -73,7 +73,7 @@ public Mono<Void> globalSetupAsync() {
     @Override
     public Mono<Void> globalCleanupAsync() {
         if (modelId != null) {
-            return Mono.defer(() -> documentModelAdministrationAsyncClient.deleteModel(modelId));
+            return Mono.defer(() -> documentModelAdministrationAsyncClient.deleteDocumentModel(modelId));
         } else {
             return Mono.empty();
         }

sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release History
 
-## 4.0.0-beta.7 (Unreleased)
+## 4.0.0-beta.7 (2022-09-08)
 This version of the SDK defaults to the latest supported API version, which currently is 2021-09-30-preview.
 
 ### Features Added
@@ -16,12 +16,21 @@ This version of the SDK defaults to the latest supported API version, which curr
   - `ModelOperationSummary` to `OperationSummary` 
   - `ModelOperationKind` to `OperationKind`
   - `ModelOperationStatus` to `OperationStatus` 
+  - `DocumentOperationKind` to `OperationKind`
+  - `BuildModelOptions` to `BuildDocumentModelOptions`
+  - `ComposeModelOptions` to `ComposeDocumentModelOptions`
+  - `DocumentOperationResult` to `OperationResult`
+  - `CopyAuthorization` to `DocumentModelCopyAuthorization`
+  - `LengthUnit` to `DocumentPageLengthUnit`
+  - `SelectionMarkState` to `DocumentSelectionMarkState`
 - Renamed properties `documentModelCount` and `documentModelLimit` to `customDocumentModelCount` 
 and `customDocumentModelLimit` on model `ResourceDetails`.
-
-### Bugs Fixed
-
-### Other Changes
+- Renamed clients methods:
+  - `getModel` to `getDocumentModel`
+  - `listModels` to `listDocumentModels`
+  - `deleteModel` to `deleteDocumentModel`
+  - `beginBuildModel` to `beginBuildDocumentModel`
+  - `beginComposeModel` to `beginComposeDocumentModel`
 
 ## 3.1.14 (2022-08-11)
 
@@ -47,7 +56,7 @@ and `customDocumentModelLimit` on model `ResourceDetails`.
 - Renamed `ModelOperationInfo` model to `ModelOperationSummary`
 - Renamed `getAccountProperties` method to `getResourceDetails`
 - Renamed `AccountProperties` model to `ResourceDetails`
-- Renamed `state` property on model `DocumentSelectionMark` to `selectionMarkState`
+- Renamed `state` property on model `DocumentSelectionMark` to `documentSelectionMarkState`
 - Renamed `getValue*` accessor methods on `DocumentField` to `getValueAs*`
 - Renamed `DocTypeInfo` model to `DocumentTypeDetails`
 - Renamed `docTypes` property on `DocumentModelDetails` model to `documentTypes`