From 761429716213946490934b2f31a8e6f04e79ffea Mon Sep 17 00:00:00 2001 From: "Menghua Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 28 May 2024 14:05:35 +0800 Subject: [PATCH 1/2] Fix Azure AI Search Sample Issues --- .../documents/indexes/SearchIndexClient.java | 4 ++-- .../documents/indexes/package-info.java | 2 ++ .../azure/search/documents/package-info.java | 2 ++ .../documents/SearchJavaDocCodeSnippets.java | 4 ++-- .../SearchPackageInfoJavaDocSnippets.java | 8 ++++---- .../indexes/LifecycleSetupExample.java | 19 ++----------------- 6 files changed, 14 insertions(+), 25 deletions(-) diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/SearchIndexClient.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/SearchIndexClient.java index d1eed4bef325..1ee1c1c28d39 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/SearchIndexClient.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/SearchIndexClient.java @@ -1113,7 +1113,7 @@ public PagedIterable listSynonymMapNames(Context context) { * * * 
-     * SynonymMap synonymMap = SEARCH_INDEX_CLIENT.getSynonymMap("searchIndex");
+     * SynonymMap synonymMap = SEARCH_INDEX_CLIENT.getSynonymMap("synonymMap");
      * synonymMap.setSynonyms("United States, United States of America, USA, America\nWashington, Wash. => WA");
      * SynonymMap updatedSynonymMap = SEARCH_INDEX_CLIENT.createOrUpdateSynonymMap(synonymMap);
      * System.out.printf("The synonym map name is %s. The synonyms are %s.%n", updatedSynonymMap.getName(),
@@ -1138,7 +1138,7 @@ public SynonymMap createOrUpdateSynonymMap(SynonymMap synonymMap) {
      *
      * 
      * 
-     * SynonymMap synonymMap = SEARCH_INDEX_CLIENT.getSynonymMap("searchIndex");
+     * SynonymMap synonymMap = SEARCH_INDEX_CLIENT.getSynonymMap("synonymMap");
      * synonymMap.setSynonyms("United States, United States of America, USA, America\nWashington, Wash. => WA");
      * Response<SynonymMap> updatedSynonymMap =
      *     SEARCH_INDEX_CLIENT.createOrUpdateSynonymMapWithResponse(synonymMap, true,
diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/package-info.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/package-info.java
index b5296996f57b..b7cca592cd9b 100644
--- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/package-info.java
+++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/package-info.java
@@ -232,6 +232,8 @@
  *     private String hotelId;
  *     private String hotelName;
  *
+ *     @JsonProperty(value = "HotelId")
+ *     @SimpleField(isKey = true)
  *     public String getHotelId() {
  *         return this.hotelId;
  *     }
diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/package-info.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/package-info.java
index a0a8fef37649..339784848a7c 100644
--- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/package-info.java
+++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/package-info.java
@@ -232,6 +232,8 @@
  *     private String hotelId;
  *     private String hotelName;
  *
+ *     @JsonProperty(value = "HotelId")
+ *     @SimpleField(isKey = true)
  *     public String getHotelId() {
  *         return this.hotelId;
  *     }
diff --git a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/SearchJavaDocCodeSnippets.java b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/SearchJavaDocCodeSnippets.java
index 2950b6ffee41..5d15d29b53b1 100644
--- a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/SearchJavaDocCodeSnippets.java
+++ b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/SearchJavaDocCodeSnippets.java
@@ -1142,7 +1142,7 @@ public void listSynonymMapNamesWithContext() {
      */
     public void createOrUpdateSynonymMap() {
         // BEGIN: com.azure.search.documents.indexes.SearchIndexClient.createOrUpdateSynonymMap#SynonymMap
-        SynonymMap synonymMap = SEARCH_INDEX_CLIENT.getSynonymMap("searchIndex");
+        SynonymMap synonymMap = SEARCH_INDEX_CLIENT.getSynonymMap("synonymMap");
         synonymMap.setSynonyms("United States, United States of America, USA, America\nWashington, Wash. => WA");
         SynonymMap updatedSynonymMap = SEARCH_INDEX_CLIENT.createOrUpdateSynonymMap(synonymMap);
         System.out.printf("The synonym map name is %s. The synonyms are %s.%n", updatedSynonymMap.getName(),
@@ -1155,7 +1155,7 @@ public void createOrUpdateSynonymMap() {
      */
     public void createOrUpdateSynonymMapWithResponse() {
         // BEGIN: com.azure.search.documents.indexes.SearchIndexClient.createOrUpdateSynonymMapWithResponse#SynonymMap-boolean-Context
-        SynonymMap synonymMap = SEARCH_INDEX_CLIENT.getSynonymMap("searchIndex");
+        SynonymMap synonymMap = SEARCH_INDEX_CLIENT.getSynonymMap("synonymMap");
         synonymMap.setSynonyms("United States, United States of America, USA, America\nWashington, Wash. => WA");
         Response updatedSynonymMap =
             SEARCH_INDEX_CLIENT.createOrUpdateSynonymMapWithResponse(synonymMap, true,
diff --git a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchPackageInfoJavaDocSnippets.java b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchPackageInfoJavaDocSnippets.java
index f28bcb4f7a7e..440af9c26272 100644
--- a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchPackageInfoJavaDocSnippets.java
+++ b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchPackageInfoJavaDocSnippets.java
@@ -10,10 +10,7 @@
 import com.azure.search.documents.SearchClient;
 import com.azure.search.documents.SearchClientBuilder;
 import com.azure.search.documents.SearchDocument;
-import com.azure.search.documents.indexes.SearchIndexClient;
-import com.azure.search.documents.indexes.SearchIndexClientBuilder;
-import com.azure.search.documents.indexes.SearchIndexerClient;
-import com.azure.search.documents.indexes.SearchIndexerClientBuilder;
+import com.azure.search.documents.indexes.*;
 import com.azure.search.documents.indexes.models.IndexDocumentsBatch;
 import com.azure.search.documents.indexes.models.LexicalAnalyzerName;
 import com.azure.search.documents.indexes.models.SearchField;
@@ -24,6 +21,7 @@
 import com.azure.search.documents.models.SearchOptions;
 import com.azure.search.documents.models.SearchResult;
 import com.azure.search.documents.util.SearchPagedIterable;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -97,6 +95,8 @@ public static class Hotel {
         private String hotelId;
         private String hotelName;
 
+        @JsonProperty(value = "HotelId")
+        @SimpleField(isKey = true)
         public String getHotelId() {
             return this.hotelId;
         }
diff --git a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/indexes/LifecycleSetupExample.java b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/indexes/LifecycleSetupExample.java
index ba2a770b715a..3047e33a8b1c 100644
--- a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/indexes/LifecycleSetupExample.java
+++ b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/indexes/LifecycleSetupExample.java
@@ -5,22 +5,7 @@
 
 import com.azure.core.credential.AzureKeyCredential;
 import com.azure.core.util.Configuration;
-import com.azure.search.documents.indexes.models.EntityRecognitionSkill;
-import com.azure.search.documents.indexes.models.HighWaterMarkChangeDetectionPolicy;
-import com.azure.search.documents.indexes.models.IndexingSchedule;
-import com.azure.search.documents.indexes.models.InputFieldMappingEntry;
-import com.azure.search.documents.indexes.models.LexicalAnalyzerName;
-import com.azure.search.documents.indexes.models.OutputFieldMappingEntry;
-import com.azure.search.documents.indexes.models.SearchField;
-import com.azure.search.documents.indexes.models.SearchFieldDataType;
-import com.azure.search.documents.indexes.models.SearchIndex;
-import com.azure.search.documents.indexes.models.SearchIndexer;
-import com.azure.search.documents.indexes.models.SearchIndexerDataContainer;
-import com.azure.search.documents.indexes.models.SearchIndexerDataSourceConnection;
-import com.azure.search.documents.indexes.models.SearchIndexerDataSourceType;
-import com.azure.search.documents.indexes.models.SearchIndexerSkill;
-import com.azure.search.documents.indexes.models.SearchIndexerSkillset;
-import com.azure.search.documents.indexes.models.SearchSuggester;
+import com.azure.search.documents.indexes.models.*;
 
 import java.time.Duration;
 import java.util.Arrays;
@@ -123,7 +108,7 @@ private static SearchIndexerSkillset createSkillset(SearchIndexerClient client)
         );
 
 
-        SearchIndexerSkill skill = new EntityRecognitionSkill(inputs, outputs)
+        SearchIndexerSkill skill = new EntityRecognitionSkill(inputs, outputs, EntityRecognitionSkillVersion.V3)
             .setName("#1")
             .setDescription("Entity Recognition Skill")
             .setContext("/document/Description");

From 8120184b7f49e0bee4a612255aa8059c28d8ff77 Mon Sep 17 00:00:00 2001
From: "Menghua Chen (WICRESOFT NORTH AMERICA LTD)" 
Date: Mon, 1 Jul 2024 10:43:36 +0800
Subject: [PATCH 2/2] Remove redundant packages

---
 .../documents/codesnippets/SearchPackageInfoJavaDocSnippets.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchPackageInfoJavaDocSnippets.java b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchPackageInfoJavaDocSnippets.java
index 115d6ab503fb..59f4ceefd235 100644
--- a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchPackageInfoJavaDocSnippets.java
+++ b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchPackageInfoJavaDocSnippets.java
@@ -25,7 +25,6 @@
 import com.azure.search.documents.models.SearchOptions;
 import com.azure.search.documents.models.SearchResult;
 import com.azure.search.documents.util.SearchPagedIterable;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.ArrayList;
 import java.util.Collections;