Azure · sima-zhu · Jun 4, 2020 · Jun 4, 2020
diff --git a/...in/java/com/azure/search/documents/implementation/converters/AnalyzeRequestConverter.java b/...in/java/com/azure/search/documents/implementation/converters/AnalyzeRequestConverter.java
@@ -3,7 +3,7 @@
 
 package com.azure.search.documents.implementation.converters;
 
-import com.azure.search.documents.indexes.models.AnalyzeTextRequest;
+import com.azure.search.documents.indexes.models.AnalyzeTextOptions;
 import com.azure.search.documents.indexes.models.CharFilterName;
 import com.azure.search.documents.indexes.models.LexicalAnalyzerName;
 import com.azure.search.documents.indexes.models.LexicalTokenizerName;
@@ -14,49 +14,49 @@
 
 /**
  * A converter between {@link com.azure.search.documents.indexes.implementation.models.AnalyzeRequest} and
- * {@link AnalyzeTextRequest}.
+ * {@link AnalyzeTextOptions}.
  */
 public final class AnalyzeRequestConverter {
     /**
-     * Maps from {@link com.azure.search.documents.indexes.implementation.models.AnalyzeRequest} to {@link AnalyzeTextRequest}.
+     * Maps from {@link com.azure.search.documents.indexes.implementation.models.AnalyzeRequest} to {@link AnalyzeTextOptions}.
      */
-    public static AnalyzeTextRequest map(com.azure.search.documents.indexes.implementation.models.AnalyzeRequest obj) {
+    public static AnalyzeTextOptions map(com.azure.search.documents.indexes.implementation.models.AnalyzeRequest obj) {
         if (obj == null) {
             return null;
         }
-        AnalyzeTextRequest analyzeTextRequest = new AnalyzeTextRequest();
+        AnalyzeTextOptions analyzeTextOptions = new AnalyzeTextOptions();
 
         if (obj.getCharFilters() != null) {
             List<CharFilterName> charFilters =
                 obj.getCharFilters().stream().map(CharFilterNameConverter::map).collect(Collectors.toList());
-            analyzeTextRequest.setCharFilters(charFilters);
+            analyzeTextOptions.setCharFilters(charFilters);
         }
 
         if (obj.getAnalyzer() != null) {
             LexicalAnalyzerName analyzer = LexicalAnalyzerNameConverter.map(obj.getAnalyzer());
-            analyzeTextRequest.setAnalyzer(analyzer);
+            analyzeTextOptions.setAnalyzer(analyzer);
         }
 
         if (obj.getTokenFilters() != null) {
             List<TokenFilterName> tokenFilters =
                 obj.getTokenFilters().stream().map(TokenFilterNameConverter::map).collect(Collectors.toList());
-            analyzeTextRequest.setTokenFilters(tokenFilters);
+            analyzeTextOptions.setTokenFilters(tokenFilters);
         }
 
         String text = obj.getText();
-        analyzeTextRequest.setText(text);
+        analyzeTextOptions.setText(text);
 
         if (obj.getTokenizer() != null) {
             LexicalTokenizerName tokenizer = LexicalTokenizerNameConverter.map(obj.getTokenizer());
-            analyzeTextRequest.setTokenizer(tokenizer);
+            analyzeTextOptions.setTokenizer(tokenizer);
         }
-        return analyzeTextRequest;
+        return analyzeTextOptions;
     }
 
     /**
-     * Maps from {@link AnalyzeTextRequest} to {@link com.azure.search.documents.indexes.implementation.models.AnalyzeRequest}.
+     * Maps from {@link AnalyzeTextOptions} to {@link com.azure.search.documents.indexes.implementation.models.AnalyzeRequest}.
      */
-    public static com.azure.search.documents.indexes.implementation.models.AnalyzeRequest map(AnalyzeTextRequest obj) {
+    public static com.azure.search.documents.indexes.implementation.models.AnalyzeRequest map(AnalyzeTextOptions obj) {
         if (obj == null) {
             return null;
         }

diff --git a/...azure-search-documents/src/main/java/com/azure/search/documents/indexes/FieldBuilder.java b/...azure-search-documents/src/main/java/com/azure/search/documents/indexes/FieldBuilder.java
@@ -192,27 +192,27 @@ private static SearchField enrichWithAnnotation(SearchField searchField, java.la
                 .setFacetable(searchableFieldPropertyAnnotation.isFacetable())
                 .setKey(searchableFieldPropertyAnnotation.isKey())
                 .setHidden(searchableFieldPropertyAnnotation.isHidden());
-            String analyzer = searchableFieldPropertyAnnotation.analyzer();
-            String searchAnalyzer = searchableFieldPropertyAnnotation.searchAnalyzer();
+            String analyzer = searchableFieldPropertyAnnotation.analyzerName();
+            String searchAnalyzer = searchableFieldPropertyAnnotation.searchAnalyzerName();
             String indexAnalyzer = searchableFieldPropertyAnnotation.indexAnalyzer();
             if (!analyzer.isEmpty() && (!searchAnalyzer.isEmpty() || !indexAnalyzer.isEmpty())) {
                 throw logger.logExceptionAsError(new RuntimeException(
                     "Please specify either analyzer or both searchAnalyzer and indexAnalyzer."));
             }
-            if (!searchableFieldPropertyAnnotation.analyzer().isEmpty()) {
+            if (!searchableFieldPropertyAnnotation.analyzerName().isEmpty()) {
                 searchField.setAnalyzerName(LexicalAnalyzerName.fromString(
-                    searchableFieldPropertyAnnotation.analyzer()));
+                    searchableFieldPropertyAnnotation.analyzerName()));
             }
-            if (!searchableFieldPropertyAnnotation.searchAnalyzer().isEmpty()) {
+            if (!searchableFieldPropertyAnnotation.searchAnalyzerName().isEmpty()) {
                 searchField.setAnalyzerName(LexicalAnalyzerName.fromString(
-                    searchableFieldPropertyAnnotation.searchAnalyzer()));
+                    searchableFieldPropertyAnnotation.searchAnalyzerName()));
             }
             if (!searchableFieldPropertyAnnotation.indexAnalyzer().isEmpty()) {
                 searchField.setAnalyzerName(LexicalAnalyzerName.fromString(
                     searchableFieldPropertyAnnotation.indexAnalyzer()));
             }
-            if (searchableFieldPropertyAnnotation.synonymMaps().length != 0) {
-                List<String> synonymMaps = Arrays.stream(searchableFieldPropertyAnnotation.synonymMaps())
+            if (searchableFieldPropertyAnnotation.synonymMapNames().length != 0) {
+                List<String> synonymMaps = Arrays.stream(searchableFieldPropertyAnnotation.synonymMapNames())
                     .filter(synonym -> !synonym.trim().isEmpty()).collect(Collectors.toList());
                 searchField.setSynonymMapNames(synonymMaps);
             }

diff --git a/...ch-documents/src/main/java/com/azure/search/documents/indexes/SearchIndexAsyncClient.java b/...ch-documents/src/main/java/com/azure/search/documents/indexes/SearchIndexAsyncClient.java
@@ -25,7 +25,7 @@
 import com.azure.search.documents.indexes.implementation.SearchServiceRestClientImpl;
 import com.azure.search.documents.indexes.implementation.models.ListIndexesResult;
 import com.azure.search.documents.indexes.implementation.models.ListSynonymMapsResult;
-import com.azure.search.documents.indexes.models.AnalyzeTextRequest;
+import com.azure.search.documents.indexes.models.AnalyzeTextOptions;
 import com.azure.search.documents.indexes.models.AnalyzedTokenInfo;
 import com.azure.search.documents.indexes.models.SearchIndexStatistics;
 import com.azure.search.documents.indexes.models.SearchIndex;
@@ -408,49 +408,49 @@ Mono<Response<Void>> deleteIndexWithResponse(String indexName, String etag, Requ
      * Shows how an analyzer breaks text into tokens.
      *
      * @param indexName the name of the index for which to test an analyzer
-     * @param analyzeTextRequest the text and analyzer or analysis components to test
+     * @param analyzeTextOptions the text and analyzer or analysis components to test
      * @return analyze result.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<AnalyzedTokenInfo> analyzeText(String indexName, AnalyzeTextRequest analyzeTextRequest) {
-        return analyzeText(indexName, analyzeTextRequest, null);
+    public PagedFlux<AnalyzedTokenInfo> analyzeText(String indexName, AnalyzeTextOptions analyzeTextOptions) {
+        return analyzeText(indexName, analyzeTextOptions, null);
     }
 
     /**
      * Shows how an analyzer breaks text into tokens.
      *
      * @param indexName the name of the index for which to test an analyzer
-     * @param analyzeTextRequest the text and analyzer or analysis components to test
+     * @param analyzeTextOptions the text and analyzer or analysis components to test
      * @param requestOptions additional parameters for the operation. Contains the tracking ID sent with the request to
      * help with debugging
      * @return a response containing analyze result.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<AnalyzedTokenInfo> analyzeText(String indexName, AnalyzeTextRequest analyzeTextRequest,
+    public PagedFlux<AnalyzedTokenInfo> analyzeText(String indexName, AnalyzeTextOptions analyzeTextOptions,
         RequestOptions requestOptions) {
         try {
             return new PagedFlux<>(() ->
-                withContext(context -> analyzeTextWithResponse(indexName, analyzeTextRequest, requestOptions,
+                withContext(context -> analyzeTextWithResponse(indexName, analyzeTextOptions, requestOptions,
                     context)));
         } catch (RuntimeException ex) {
             return pagedFluxError(logger, ex);
         }
     }
 
-    PagedFlux<AnalyzedTokenInfo> analyzeText(String indexName, AnalyzeTextRequest analyzeTextRequest,
+    PagedFlux<AnalyzedTokenInfo> analyzeText(String indexName, AnalyzeTextOptions analyzeTextOptions,
         RequestOptions requestOptions, Context context) {
         try {
-            return new PagedFlux<>(() -> analyzeTextWithResponse(indexName, analyzeTextRequest, requestOptions,
+            return new PagedFlux<>(() -> analyzeTextWithResponse(indexName, analyzeTextOptions, requestOptions,
                 context));
         } catch (RuntimeException ex) {
             return pagedFluxError(logger, ex);
         }
     }
 
     private Mono<PagedResponse<AnalyzedTokenInfo>> analyzeTextWithResponse(String indexName,
-        AnalyzeTextRequest analyzeTextRequest, RequestOptions requestOptions, Context context) {
+        AnalyzeTextOptions analyzeTextOptions, RequestOptions requestOptions, Context context) {
         return restClient.indexes()
-            .analyzeWithRestResponseAsync(indexName, AnalyzeRequestConverter.map(analyzeTextRequest),
+            .analyzeWithRestResponseAsync(indexName, AnalyzeRequestConverter.map(analyzeTextOptions),
                 RequestOptionsIndexesConverter.map(requestOptions), context)
             .onErrorMap(MappingUtils::exceptionMapper)
             .map(MappingUtils::mappingTokenInfo);

diff --git a/...-search-documents/src/main/java/com/azure/search/documents/indexes/SearchIndexClient.java b/...-search-documents/src/main/java/com/azure/search/documents/indexes/SearchIndexClient.java
@@ -10,7 +10,7 @@
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
 import com.azure.search.documents.SearchClient;
-import com.azure.search.documents.indexes.models.AnalyzeTextRequest;
+import com.azure.search.documents.indexes.models.AnalyzeTextOptions;
 import com.azure.search.documents.indexes.models.AnalyzedTokenInfo;
 import com.azure.search.documents.indexes.models.SearchIndexStatistics;
 import com.azure.search.documents.indexes.models.SearchIndex;
@@ -247,28 +247,28 @@ public Response<Void> deleteIndexWithResponse(SearchIndex index, boolean onlyIfU
      * Shows how an analyzer breaks text into tokens.
      *
      * @param indexName the name of the index for which to test an analyzer
-     * @param analyzeTextRequest the text and analyzer or analysis components to test
+     * @param analyzeTextOptions the text and analyzer or analysis components to test
      * @return analyze result.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<AnalyzedTokenInfo> analyzeText(String indexName, AnalyzeTextRequest analyzeTextRequest) {
-        return analyzeText(indexName, analyzeTextRequest, null, Context.NONE);
+    public PagedIterable<AnalyzedTokenInfo> analyzeText(String indexName, AnalyzeTextOptions analyzeTextOptions) {
+        return analyzeText(indexName, analyzeTextOptions, null, Context.NONE);
     }
 
     /**
      * Shows how an analyzer breaks text into tokens.
      *
      * @param indexName the name of the index for which to test an analyzer
-     * @param analyzeTextRequest the text and analyzer or analysis components to test
+     * @param analyzeTextOptions the text and analyzer or analysis components to test
      * @param requestOptions additional parameters for the operation. Contains the tracking ID sent with the request to
      * help with debugging
      * @param context additional context that is passed through the HTTP pipeline during the service call
      * @return analyze result.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<AnalyzedTokenInfo> analyzeText(String indexName, AnalyzeTextRequest analyzeTextRequest,
+    public PagedIterable<AnalyzedTokenInfo> analyzeText(String indexName, AnalyzeTextOptions analyzeTextOptions,
         RequestOptions requestOptions, Context context) {
-        return new PagedIterable<>(asyncClient.analyzeText(indexName, analyzeTextRequest, requestOptions, context));
+        return new PagedIterable<>(asyncClient.analyzeText(indexName, analyzeTextOptions, requestOptions, context));
     }
 
     /**

diff --git a/...h-documents/src/main/java/com/azure/search/documents/indexes/SearchableFieldProperty.java b/...h-documents/src/main/java/com/azure/search/documents/indexes/SearchableFieldProperty.java
@@ -57,14 +57,14 @@
      *
      * @return {@link LexicalAnalyzerName} String value. Or default to "null" String type.
      */
-    String analyzer() default "";
+    String analyzerName() default "";
 
     /**
      * Optional arguments defines the name of the search analyzer used for the field.
      *
      * @return {@link LexicalAnalyzerName} String value. Or default to an empty String.
      */
-    String searchAnalyzer() default "";
+    String searchAnalyzerName() default "";
 
     /**
      * Optional arguments defines the name of the analyzer used for the field.
@@ -83,5 +83,5 @@
      *
      * @return An array of synonym map values. Or default to empty string array.
      */
-    String[] synonymMaps() default {};
+    String[] synonymMapNames() default {};
 }
diff --git a/...ts/indexes/models/AnalyzeTextRequest.java → ...ts/indexes/models/AnalyzeTextOptions.java b/...ts/indexes/models/AnalyzeTextRequest.java → ...ts/indexes/models/AnalyzeTextOptions.java
@@ -12,7 +12,7 @@
  * tokens.
  */
 @Fluent
-public final class AnalyzeTextRequest {
+public final class AnalyzeTextOptions {
     /*
      * The text to break into tokens.
      */
@@ -88,7 +88,7 @@ public String getText() {
      * @param text the text value to set.
      * @return the AnalyzeRequest object itself.
      */
-    public AnalyzeTextRequest setText(String text) {
+    public AnalyzeTextOptions setText(String text) {
         this.text = text;
         return this;
     }
@@ -154,7 +154,7 @@ public LexicalAnalyzerName getAnalyzer() {
      * @param analyzer the analyzer value to set.
      * @return the AnalyzeRequest object itself.
      */
-    public AnalyzeTextRequest setAnalyzer(LexicalAnalyzerName analyzer) {
+    public AnalyzeTextOptions setAnalyzer(LexicalAnalyzerName analyzer) {
         this.analyzer = analyzer;
         return this;
     }
@@ -186,7 +186,7 @@ public LexicalTokenizerName getTokenizer() {
      * @param tokenizer the tokenizer value to set.
      * @return the AnalyzeRequest object itself.
      */
-    public AnalyzeTextRequest setTokenizer(LexicalTokenizerName tokenizer) {
+    public AnalyzeTextOptions setTokenizer(LexicalTokenizerName tokenizer) {
         this.tokenizer = tokenizer;
         return this;
     }
@@ -210,7 +210,7 @@ public List<TokenFilterName> getTokenFilters() {
      * @param tokenFilters the tokenFilters value to set.
      * @return the AnalyzeRequest object itself.
      */
-    public AnalyzeTextRequest setTokenFilters(List<TokenFilterName> tokenFilters) {
+    public AnalyzeTextOptions setTokenFilters(List<TokenFilterName> tokenFilters) {
         this.tokenFilters = tokenFilters;
         return this;
     }
@@ -234,7 +234,7 @@ public List<CharFilterName> getCharFilters() {
      * @param charFilters the charFilters value to set.
      * @return the AnalyzeRequest object itself.
      */
-    public AnalyzeTextRequest setCharFilters(List<CharFilterName> charFilters) {
+    public AnalyzeTextOptions setCharFilters(List<CharFilterName> charFilters) {
         this.charFilters = charFilters;
         return this;
     }

diff --git a/...h-documents/src/test/java/com/azure/search/documents/indexes/CustomAnalyzerSyncTests.java b/...h-documents/src/test/java/com/azure/search/documents/indexes/CustomAnalyzerSyncTests.java
@@ -7,7 +7,7 @@
 import com.azure.search.documents.SearchClient;
 import com.azure.search.documents.SearchDocument;
 import com.azure.search.documents.SearchTestBase;
-import com.azure.search.documents.indexes.models.AnalyzeTextRequest;
+import com.azure.search.documents.indexes.models.AnalyzeTextOptions;
 import com.azure.search.documents.indexes.models.AnalyzedTokenInfo;
 import com.azure.search.documents.indexes.models.AsciiFoldingTokenFilter;
 import com.azure.search.documents.indexes.models.CharFilter;
@@ -204,7 +204,7 @@ public void canAnalyze() {
         searchIndexClient.createIndex(index);
         indexesToCleanup.add(index.getName());
 
-        AnalyzeTextRequest request = new AnalyzeTextRequest()
+        AnalyzeTextOptions request = new AnalyzeTextOptions()
             .setText("One two")
             .setAnalyzer(LexicalAnalyzerName.WHITESPACE);
         PagedIterable<AnalyzedTokenInfo> results = searchIndexClient.analyzeText(index.getName(), request);
@@ -213,7 +213,7 @@ public void canAnalyze() {
         assertTokenInfoEqual("two", 4, 7, 1, iterator.next());
         assertFalse(iterator.hasNext());
 
-        request = new AnalyzeTextRequest()
+        request = new AnalyzeTextOptions()
             .setText("One's <two/>")
             .setTokenizer(LexicalTokenizerName.WHITESPACE)
             .setTokenFilters(Collections.singletonList(TokenFilterName.APOSTROPHE))
@@ -239,19 +239,19 @@ public void canAnalyzeWithAllPossibleNames() {
 
         LexicalAnalyzerName.values()
             .stream()
-            .map(an -> new AnalyzeTextRequest()
+            .map(an -> new AnalyzeTextOptions()
                 .setText("One two")
                 .setAnalyzer(an))
             .forEach(r -> searchIndexClient.analyzeText(index.getName(), r));
 
         LexicalTokenizerName.values()
             .stream()
-            .map(tn -> new AnalyzeTextRequest()
+            .map(tn -> new AnalyzeTextOptions()
                 .setText("One two")
                 .setTokenizer(tn))
             .forEach(r -> searchIndexClient.analyzeText(index.getName(), r));
 
-        AnalyzeTextRequest request = new AnalyzeTextRequest()
+        AnalyzeTextOptions request = new AnalyzeTextOptions()
             .setText("One two")
             .setTokenizer(LexicalTokenizerName.WHITESPACE)
             .setTokenFilters(new ArrayList<>(TokenFilterName.values()))

diff --git a/...rch-documents/src/test/java/com/azure/search/documents/test/environment/models/Hotel.java b/...rch-documents/src/test/java/com/azure/search/documents/test/environment/models/Hotel.java
@@ -17,7 +17,7 @@ public class Hotel {
     @JsonProperty(value = "HotelId")
     private String hotelId;
 
-    @SearchableFieldProperty(isSortable = true, analyzer = "en.lucene")
+    @SearchableFieldProperty(isSortable = true, analyzerName = "en.lucene")
     @JsonProperty(value = "HotelName")
     private String hotelName;
 

diff --git a/...uments/src/test/java/com/azure/search/documents/test/environment/models/HotelAddress.java b/...uments/src/test/java/com/azure/search/documents/test/environment/models/HotelAddress.java
@@ -19,7 +19,7 @@ public class HotelAddress {
     @JsonProperty(value = "StateProvince")
     private String stateProvince;
 
-    @SearchableFieldProperty(synonymMaps = {"fieldbuilder"})
+    @SearchableFieldProperty(synonymMapNames = {"fieldbuilder"})
     @JsonProperty(value = "Country")
     private String country;
 

diff --git a/.../test/java/com/azure/search/documents/test/environment/models/HotelAnalyzerException.java b/.../test/java/com/azure/search/documents/test/environment/models/HotelAnalyzerException.java
@@ -6,7 +6,7 @@
 import com.azure.search.documents.indexes.SearchableFieldProperty;
 
 public class HotelAnalyzerException {
-    @SearchableFieldProperty(analyzer = "en.microsoft", indexAnalyzer = "whitespce")
+    @SearchableFieldProperty(analyzerName = "en.microsoft", indexAnalyzer = "whitespce")
     private String tag;
 
     /**

diff --git a/.../java/com/azure/search/documents/test/environment/models/HotelWithEmptyInSynonymMaps.java b/.../java/com/azure/search/documents/test/environment/models/HotelWithEmptyInSynonymMaps.java
@@ -11,7 +11,7 @@
  * This is a class to test whether we filter out the empty String in synonymMaps.
  */
 public class HotelWithEmptyInSynonymMaps {
-    @SearchableFieldProperty(synonymMaps = {"asynonymMaps", "", "  ", "maps"})
+    @SearchableFieldProperty(synonymMapNames = {"asynonymMaps", "", "  ", "maps"})
     private List<String> tags;
 
     /**