From 7d752c47c9399a1daa44bee08d38b6d7e77f4b75 Mon Sep 17 00:00:00 2001
From: Shawn Fang <45607042+mssfang@users.noreply.github.com>
Date: Fri, 12 Aug 2022 10:47:44 -0700
Subject: [PATCH] [TA] Prepare to 5.2.0-beta.4 release (#30441)
---
eng/versioning/version_client.txt | 2 +-
sdk/aot/azure-aot-graalvm-samples/pom.xml | 2 +-
.../azure-ai-textanalytics/CHANGELOG.md | 15 ++++++----
.../azure-ai-textanalytics/README.md | 16 +++++------
.../textanalytics/implementation/Utility.java | 6 ++--
.../src/samples/README.md | 28 ++++++++-----------
6 files changed, 33 insertions(+), 36 deletions(-)
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 5aee1e68e8911..d9e454455f7d4 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -43,7 +43,7 @@ com.azure:azure-ai-personalizer;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-ai-documenttranslator;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-ai-metricsadvisor;1.1.5;1.1.6
com.azure:azure-ai-metricsadvisor-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-ai-textanalytics;5.1.11;5.2.0-beta.4
+com.azure:azure-ai-textanalytics;5.1.12;5.2.0-beta.4
com.azure:azure-ai-textanalytics-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-analytics-purview-catalog;1.0.0-beta.4;1.0.0-beta.5
com.azure:azure-analytics-purview-scanning;1.0.0-beta.2;1.0.0-beta.3
diff --git a/sdk/aot/azure-aot-graalvm-samples/pom.xml b/sdk/aot/azure-aot-graalvm-samples/pom.xml
index be9270cb23e27..ed81a3b2c75bc 100644
--- a/sdk/aot/azure-aot-graalvm-samples/pom.xml
+++ b/sdk/aot/azure-aot-graalvm-samples/pom.xml
@@ -108,7 +108,7 @@
com.azure
azure-ai-textanalytics
- 5.1.11
+ 5.1.12
diff --git a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
index 0f6b15f9c38a8..a52617258e51f 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
+++ b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
@@ -1,24 +1,27 @@
# Release History
-## 5.2.0-beta.4 (Unreleased)
-
+## 5.2.0-beta.4 (2022-08-12)
### Features Added
+- We are now targeting the service's `2022-05-01` API as the default.
- Added bespoke methods for the custom entity recognition, and single-label and multi-label classification features,
such as, `beginRecognizeCustomEntities()`, `beginSingleLabelClassify()` and `beginMultiLabelClassify()`.
### Breaking Changes
- Removed support for `Healthcare FHIR`, and `Extractive Summarization` features.
-- Renamed
+- Renamed
`SingleCategoryClassifyAction` to `SingleLabelClassifyAction`,
`MultiCategoryClassifyAction` to `MultiLabelClassifyAction`.
-- Merged
+- Merged
`SingleCategoryClassifyResultCollection` and `SingleCategoryClassifyResultCollection` to `ClassifyDocumentResultCollection`,
`MultiCategoryClassifyResult` and `SingleCategoryClassifyResult` to `ClassifyDocumentResult`.
-### Bugs Fixed
-
+## 5.1.12 (2022-08-11)
### Other Changes
+#### Dependency Updates
+- Updated `azure-core` to `1.31.0`.
+- Updated `azure-core-http-netty` to `1.12.4`.
+
## 5.1.11 (2022-07-07)
### Other Changes
diff --git a/sdk/textanalytics/azure-ai-textanalytics/README.md b/sdk/textanalytics/azure-ai-textanalytics/README.md
index f6cc47eb48199..e71ba176c3972 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/README.md
+++ b/sdk/textanalytics/azure-ai-textanalytics/README.md
@@ -65,13 +65,13 @@ add the direct dependency to your project as follows.
```
[//]: # ({x-version-update-end})
-**Note:** This version of the client library defaults to the `2022-04-01-preview` version of the service.
+**Note:** This version of the client library defaults to the `2022-05-01` version of the service.
This table shows the relationship between SDK services and supported API versions of the service:
|SDK version|Supported API version of service
|-|-
-|5.2.x | 3.0, 3.1, 2022-04-01-preview (default)
+|5.2.x | 3.0, 3.1, 2022-05-01 (default)
|5.1.x | 3.0, 3.1
|5.0.x | 3.0
@@ -161,7 +161,7 @@ Authentication with AAD requires some initial setup:
com.azure
azure-identity
- 1.5.3
+ 1.5.4
```
[//]: # ({x-version-update-end})
@@ -412,10 +412,9 @@ set of documents. Currently, the supported features are:
- Key Phrase Extraction
- Sentiment Analysis
- Healthcare Analysis
-- Extractive Summarization (see sample [here][extractive_summarization_sample])
- Custom Entity Recognition (see sample [here][custom_entities_sample])
-- Custom Single Category Classification (see sample [here][custom_single_classification_sample])
-- Custom Multi Category Classification (see sample [here][custom_multi_classification_sample])
+- Custom Single-Label Classification (see sample [here][custom_single_classification_sample])
+- Custom Multi-Label Classification (see sample [here][custom_multi_classification_sample])
```java readme-sample-analyzeActions
List documents = Arrays.asList(
@@ -568,9 +567,8 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m
[recognize_entities_sample]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeEntitiesBatchDocuments.java
[recognize_pii_entities_sample]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizePiiEntitiesBatchDocuments.java
[recognize_linked_entities_sample]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/batch/RecognizeLinkedEntitiesBatchDocuments.java
-[extractive_summarization_sample]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/AnalyzeExtractiveSummarization.java
[custom_entities_sample]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/RecognizeCustomEntities.java
-[custom_single_classification_sample]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/ClassifyDocumentSingleCategory.java
-[custom_multi_classification_sample]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/ClassifyDocumentMultiCategory.java
+[custom_single_classification_sample]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/SingleLabelClassifyDocument.java
+[custom_multi_classification_sample]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/MultiLabelClassifyDocument.java
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Ftextanalytics%2Fazure-ai-textanalytics%2FREADME.png)
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/Utility.java b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/Utility.java
index 1533274816054..984f344f6188e 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/Utility.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/implementation/Utility.java
@@ -311,7 +311,7 @@ public static List toLanguageInput(Iterable
/**
* Extracts the operation ID from the 'operation-location' URL. An example of 'operation-location' is
- * https://[...]/language/analyze-text/jobs/36c9e042-77df-4cba-a87e-21ba2f50205a?api-version=2022-04-01-preview
+ * https://[...]/language/analyze-text/jobs/36c9e042-77df-4cba-a87e-21ba2f50205a?api-version=2022-05-01
*
* @param operationLocation The URL specified in the 'Operation-Location' response header containing the
* operation ID used to track the progress and obtain the ID of the analyze operation.
@@ -354,7 +354,7 @@ public static Map parseNextLink(String nextLink) {
parameterMap.put(key, Integer.valueOf(value));
} else if ("skip".equals(key) || "top".equals(key)) {
// Language API no longer has '$' in front of the 'top' and 'skip'.
- // https://[...]?showStats=False&top=2&skip=20&api-version=2022-04-01-preview
+ // https://[...]?showStats=False&top=2&skip=20&api-version=2022-05-01
parameterMap.put("$" + key, Integer.valueOf(value));
}
}
@@ -1273,7 +1273,7 @@ private static ClassifyDocumentResult toSingleCategoryClassifyResult(
singleClassificationDocument.getStatistics() == null
? null : toTextDocumentStatistics(singleClassificationDocument.getStatistics()),
null);
- // Single category classification will only have one category.
+ // Single-label classification will only have one category.
ClassifyDocumentResultPropertiesHelper.setClassifications(classifyDocumentResult,
IterableStream.of(toDocumentClassifications(classificationResult)));
ClassifyDocumentResultPropertiesHelper.setWarnings(classifyDocumentResult,
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/samples/README.md b/sdk/textanalytics/azure-ai-textanalytics/src/samples/README.md
index f81f3cfdb2f73..b92b966ffb393 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/samples/README.md
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/samples/README.md
@@ -37,6 +37,12 @@ The following sections provide several code snippets covering some of the most c
- [Analyze sentiment in a document with asynchronous client][async_sample_sentiment]
- [Analyze sentiment with opinion mining in a document][sample_sentiment_opinion_mining]
- [Analyze sentiment with opinion mining in a document with asynchronous client][async_sample_sentiment_opinion_mining]
+- [Execute a custom entities][sample_execute_custom_entities]
+- [Execute a custom entities with asynchronous client][async_sample_execute_custom_entities]
+- [Execute a custom single-label classification][sample_execute_single_classification]
+- [Execute a custom single-label classification with asynchronous client][async_sample_execute_single_classification]
+- [Execute a custom multi-label classification][sample_execute_multi_classification]
+- [Execute a custom multi-label classification with asynchronous client][async_sample_execute_multi_classification]
- [Rotate key credential][sample_rotate_key]
- [Rotate key credential with asynchronous client][async_sample_rotate_key]
- [Model Version][sample_model_version]
@@ -73,14 +79,6 @@ Batch Samples:
- [Cancel analyze healthcare entities with asynchronous client][async_sample_cancel_healthcare_task]
- [Execute multiple actions][sample_execute_multiple_actions]
- [Execute multiple actions with asynchronous client][async_sample_execute_multiple_actions]
-- [Execute an extractive text summarization action][sample_execute_extractive_summarization_action]
-- [Execute an extractive text summarization action with asynchronous client][async_sample_execute_extractive_summarization_action]
-- [Execute a custom entities action][sample_execute_custom_entities_action]
-- [Execute a custom entities action with asynchronous client][async_sample_execute_custom_entities_action]
-- [Execute a custom single-label classification action][sample_execute_single_classification_action]
-- [Execute a custom single-label classification action with asynchronous client][async_sample_execute_single_classification_action]
-- [Execute a custom multi-label classification action][sample_execute_multi_classification_action]
-- [Execute a custom multi-label classification action with asynchronous client][async_sample_execute_multi_classification_action]
## Troubleshooting
Troubleshooting steps can be found [here][SDK_README_TROUBLESHOOTING].
@@ -123,10 +121,9 @@ This project welcomes contributions and suggestions. Find [more contributing][SD
[async_sample_healthcare_batch]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/AnalyzeHealthcareEntitiesAsync.java
[async_sample_cancel_healthcare_task]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/CancelAnalyzeHealthcareEntitiesAsync.java
[async_sample_execute_multiple_actions]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/AnalyzeActionsAsync.java
-[async_sample_execute_extractive_summarization_action]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/AnalyzeExtractiveSummarizationAsync.java
-[async_sample_execute_custom_entities_action]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/RecognizeCustomEntitiesAsync.java
-[async_sample_execute_single_classification_action]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/ClassifyDocumentSingleCategoryAsync.java
-[async_sample_execute_multi_classification_action]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/ClassifyDocumentMultiCategoryAsync.java
+[async_sample_execute_custom_entities]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/RecognizeCustomEntitiesAsync.java
+[async_sample_execute_single_classification]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/SingleLabelClassifyDocumentAsync.java
+[async_sample_execute_multi_classification]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/MultiLabelClassifyDocumentAsync.java
[async_sample_model_version]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ModelVersionAsync.java
[sample_detect_language]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/DetectLanguage.java
@@ -152,10 +149,9 @@ This project welcomes contributions and suggestions. Find [more contributing][SD
[sample_healthcare_batch]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/AnalyzeHealthcareEntities.java
[sample_cancel_healthcare_task]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/CancelAnalyzeHealthcareEntities.java
[sample_execute_multiple_actions]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/AnalyzeActions.java
-[sample_execute_extractive_summarization_action]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/AnalyzeExtractiveSummarization.java
-[sample_execute_custom_entities_action]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/RecognizeCustomEntities.java
-[sample_execute_single_classification_action]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/ClassifyDocumentSingleCategory.java
-[sample_execute_multi_classification_action]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/ClassifyDocumentMultiCategory.java
+[sample_execute_custom_entities]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/RecognizeCustomEntities.java
+[sample_execute_single_classification]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/SingleLabelClassifyDocument.java
+[sample_execute_multi_classification]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/lro/MultiLabelClassifyDocument.java
[sample_model_version]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/textanalytics/azure-ai-textanalytics/src/samples/java/com/azure/ai/textanalytics/ModelVersion.java
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Ftextanalytics%2Fazure-ai-textanalytics%2FREADME.png)