Final rename models changes

sdk/search/azure-search-documents/CHANGELOG.md

@@ -18,6 +18,9 @@ and uplifted the properties to `SearchIndexerDataSourceConnection` and `SearchRe
 `NGramTokenFilter`, and `PathHierarchyTokenizer`.
 - Renamed `Similarity` to `SimilarityAlgorithm`.
 - Renamed `Suggester` to `SearchSuggester`.
+- Renamed fields `synonymMaps` to `synonymMapNames`, `analyzer` to `analyzerName`, 
+`searchAnalyzer` to `searchAnalyzerName` and `indexAnalyzer` to `indexAnalyzerName` 
+in `SearchField`, `SearchableField`.
 
 ## 1.0.0-beta.3 (2020-05-05)
 - Replaced `isRetrievable` API with `isHidden`, parameter name changed from `retrievable` to `hidden`.

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/converters/SearchFieldConverter.java

@@ -47,28 +47,28 @@ public static SearchField map(com.azure.search.documents.indexes.implementation.
 
         if (obj.getAnalyzer() != null) {
             LexicalAnalyzerName analyzer = LexicalAnalyzerNameConverter.map(obj.getAnalyzer());
-            searchField.setAnalyzer(analyzer);
+            searchField.setAnalyzerName(analyzer);
         }
 
         if (obj.getSearchAnalyzer() != null) {
             LexicalAnalyzerName searchAnalyzer = LexicalAnalyzerNameConverter.map(obj.getSearchAnalyzer());
-            searchField.setSearchAnalyzer(searchAnalyzer);
+            searchField.setSearchAnalyzerName(searchAnalyzer);
         }
 
         String name = obj.getName();
         searchField.setName(name);
 
         if (obj.getIndexAnalyzer() != null) {
             LexicalAnalyzerName indexAnalyzer = LexicalAnalyzerNameConverter.map(obj.getIndexAnalyzer());
-            searchField.setIndexAnalyzer(indexAnalyzer);
+            searchField.setIndexAnalyzerName(indexAnalyzer);
         }
 
         Boolean facetable = obj.isFacetable();
         searchField.setFacetable(facetable);
 
         if (obj.getSynonymMaps() != null) {
             List<String> synonymMaps = new ArrayList<>(obj.getSynonymMaps());
-            searchField.setSynonymMaps(synonymMaps);
+            searchField.setSynonymMapNames(synonymMaps);
         }
 
         if (obj.getFields() != null) {
@@ -110,32 +110,32 @@ public static com.azure.search.documents.indexes.implementation.models.SearchFie
         Boolean searchable = obj.isSearchable();
         searchField.setSearchable(searchable);
 
-        if (obj.getAnalyzer() != null) {
+        if (obj.getAnalyzerName() != null) {
             com.azure.search.documents.indexes.implementation.models.LexicalAnalyzerName analyzer =
-                LexicalAnalyzerNameConverter.map(obj.getAnalyzer());
+                LexicalAnalyzerNameConverter.map(obj.getAnalyzerName());
             searchField.setAnalyzer(analyzer);
         }
 
-        if (obj.getSearchAnalyzer() != null) {
+        if (obj.getSearchAnalyzerName() != null) {
             com.azure.search.documents.indexes.implementation.models.LexicalAnalyzerName searchAnalyzer =
-                LexicalAnalyzerNameConverter.map(obj.getSearchAnalyzer());
+                LexicalAnalyzerNameConverter.map(obj.getSearchAnalyzerName());
             searchField.setSearchAnalyzer(searchAnalyzer);
         }
 
         String name = obj.getName();
         searchField.setName(name);
 
-        if (obj.getIndexAnalyzer() != null) {
+        if (obj.getIndexAnalyzerName() != null) {
             com.azure.search.documents.indexes.implementation.models.LexicalAnalyzerName indexAnalyzer =
-                LexicalAnalyzerNameConverter.map(obj.getIndexAnalyzer());
+                LexicalAnalyzerNameConverter.map(obj.getIndexAnalyzerName());
             searchField.setIndexAnalyzer(indexAnalyzer);
         }
 
         Boolean facetable = obj.isFacetable();
         searchField.setFacetable(facetable);
 
-        if (obj.getSynonymMaps() != null) {
-            List<String> synonymMaps = new ArrayList<>(obj.getSynonymMaps());
+        if (obj.getSynonymMapNames() != null) {
+            List<String> synonymMaps = new ArrayList<>(obj.getSynonymMapNames());
             searchField.setSynonymMaps(synonymMaps);
         }
 

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/FieldBuilder.java

@@ -200,20 +200,21 @@ private static SearchField enrichWithAnnotation(SearchField searchField, java.la
                     "Please specify either analyzer or both searchAnalyzer and indexAnalyzer."));
             }
             if (!searchableFieldPropertyAnnotation.analyzer().isEmpty()) {
-                searchField.setAnalyzer(LexicalAnalyzerName.fromString((searchableFieldPropertyAnnotation.analyzer())));
+                searchField.setAnalyzerName(LexicalAnalyzerName.fromString(
+                    searchableFieldPropertyAnnotation.analyzer()));
             }
             if (!searchableFieldPropertyAnnotation.searchAnalyzer().isEmpty()) {
-                searchField.setAnalyzer(LexicalAnalyzerName.fromString(
-                    (searchableFieldPropertyAnnotation.searchAnalyzer())));
+                searchField.setAnalyzerName(LexicalAnalyzerName.fromString(
+                    searchableFieldPropertyAnnotation.searchAnalyzer()));
             }
             if (!searchableFieldPropertyAnnotation.indexAnalyzer().isEmpty()) {
-                searchField.setAnalyzer(LexicalAnalyzerName.fromString(
-                    (searchableFieldPropertyAnnotation.indexAnalyzer())));
+                searchField.setAnalyzerName(LexicalAnalyzerName.fromString(
+                    searchableFieldPropertyAnnotation.indexAnalyzer()));
             }
             if (searchableFieldPropertyAnnotation.synonymMaps().length != 0) {
                 List<String> synonymMaps = Arrays.stream(searchableFieldPropertyAnnotation.synonymMaps())
                     .filter(synonym -> !synonym.trim().isEmpty()).collect(Collectors.toList());
-                searchField.setSynonymMaps(synonymMaps);
+                searchField.setSynonymMapNames(synonymMaps);
             }
         }
         return searchField;

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/SearchIndexerAsyncClient.java

@@ -236,7 +236,7 @@ public PagedFlux<SearchIndexerDataSourceConnection> listDataSourceConnections()
      * help with debugging.
      * @return a list of DataSources
      */
-    public PagedFlux<SearchIndexerDataSourceConnection> listDataSourceConnection(RequestOptions requestOptions) {
+    public PagedFlux<SearchIndexerDataSourceConnection> listDataSourceConnections(RequestOptions requestOptions) {
         try {
             return new PagedFlux<>(() ->
                 withContext(context -> this.listDataSourceConnectionsWithResponse(null, requestOptions, context))

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/SearchField.java

@@ -126,7 +126,7 @@ public final class SearchField {
      * 'Simple', 'Stop', 'Whitespace'
      */
     @JsonProperty(value = "analyzer")
-    private LexicalAnalyzerName analyzer;
+    private LexicalAnalyzerName analyzerName;
 
     /*
      * The name of the analyzer used at search time for the field. This option
@@ -157,7 +157,7 @@ public final class SearchField {
      * 'Simple', 'Stop', 'Whitespace'
      */
     @JsonProperty(value = "searchAnalyzer")
-    private LexicalAnalyzerName searchAnalyzer;
+    private LexicalAnalyzerName searchAnalyzerName;
 
     /*
      * The name of the analyzer used at indexing time for the field. This
@@ -189,7 +189,7 @@ public final class SearchField {
      * 'Whitespace'
      */
     @JsonProperty(value = "indexAnalyzer")
-    private LexicalAnalyzerName indexAnalyzer;
+    private LexicalAnalyzerName indexAnalyzerName;
 
     /*
      * A list of the names of synonym maps to associate with this field. This
@@ -200,7 +200,7 @@ public final class SearchField {
      * existing fields. Must be null or an empty collection for complex fields.
      */
     @JsonProperty(value = "synonymMaps")
-    private List<String> synonymMaps;
+    private List<String> synonymMapNames;
 
     /*
      * A list of sub-fields if this is a field of type Edm.ComplexType or
@@ -481,8 +481,8 @@ public SearchField setFacetable(Boolean facetable) {
      *
      * @return the analyzer value.
      */
-    public LexicalAnalyzerName getAnalyzer() {
-        return this.analyzer;
+    public LexicalAnalyzerName getAnalyzerName() {
+        return this.analyzerName;
     }
 
     /**
@@ -512,11 +512,11 @@ public LexicalAnalyzerName getAnalyzer() {
      * 'StandardAsciiFoldingLucene', 'Keyword', 'Pattern', 'Simple', 'Stop',
      * 'Whitespace'.
      *
-     * @param analyzer the analyzer value to set.
+     * @param analyzerName the analyzer value to set.
      * @return the SearchField object itself.
      */
-    public SearchField setAnalyzer(LexicalAnalyzerName analyzer) {
-        this.analyzer = analyzer;
+    public SearchField setAnalyzerName(LexicalAnalyzerName analyzerName) {
+        this.analyzerName = analyzerName;
         return this;
     }
 
@@ -551,8 +551,8 @@ public SearchField setAnalyzer(LexicalAnalyzerName analyzer) {
      *
      * @return the searchAnalyzer value.
      */
-    public LexicalAnalyzerName getSearchAnalyzer() {
-        return this.searchAnalyzer;
+    public LexicalAnalyzerName getSearchAnalyzerName() {
+        return this.searchAnalyzerName;
     }
 
     /**
@@ -584,11 +584,11 @@ public LexicalAnalyzerName getSearchAnalyzer() {
      * 'StandardLucene', 'StandardAsciiFoldingLucene', 'Keyword', 'Pattern',
      * 'Simple', 'Stop', 'Whitespace'.
      *
-     * @param searchAnalyzer the searchAnalyzer value to set.
+     * @param searchAnalyzerName the searchAnalyzer value to set.
      * @return the SearchField object itself.
      */
-    public SearchField setSearchAnalyzer(LexicalAnalyzerName searchAnalyzer) {
-        this.searchAnalyzer = searchAnalyzer;
+    public SearchField setSearchAnalyzerName(LexicalAnalyzerName searchAnalyzerName) {
+        this.searchAnalyzerName = searchAnalyzerName;
         return this;
     }
 
@@ -623,8 +623,8 @@ public SearchField setSearchAnalyzer(LexicalAnalyzerName searchAnalyzer) {
      *
      * @return the indexAnalyzer value.
      */
-    public LexicalAnalyzerName getIndexAnalyzer() {
-        return this.indexAnalyzer;
+    public LexicalAnalyzerName getIndexAnalyzerName() {
+        return this.indexAnalyzerName;
     }
 
     /**
@@ -656,11 +656,11 @@ public LexicalAnalyzerName getIndexAnalyzer() {
      * 'StandardLucene', 'StandardAsciiFoldingLucene', 'Keyword', 'Pattern',
      * 'Simple', 'Stop', 'Whitespace'.
      *
-     * @param indexAnalyzer the indexAnalyzer value to set.
+     * @param indexAnalyzerName the indexAnalyzer value to set.
      * @return the SearchField object itself.
      */
-    public SearchField setIndexAnalyzer(LexicalAnalyzerName indexAnalyzer) {
-        this.indexAnalyzer = indexAnalyzer;
+    public SearchField setIndexAnalyzerName(LexicalAnalyzerName indexAnalyzerName) {
+        this.indexAnalyzerName = indexAnalyzerName;
         return this;
     }
 
@@ -675,8 +675,8 @@ public SearchField setIndexAnalyzer(LexicalAnalyzerName indexAnalyzer) {
      *
      * @return the synonymMaps value.
      */
-    public List<String> getSynonymMaps() {
-        return this.synonymMaps;
+    public List<String> getSynonymMapNames() {
+        return this.synonymMapNames;
     }
 
     /**
@@ -688,11 +688,11 @@ public List<String> getSynonymMaps() {
      * attribute can be changed on existing fields. Must be null or an empty
      * collection for complex fields.
      *
-     * @param synonymMaps the synonymMaps value to set.
+     * @param synonymMapNames the synonymMaps value to set.
      * @return the SearchField object itself.
      */
-    public SearchField setSynonymMaps(List<String> synonymMaps) {
-        this.synonymMaps = synonymMaps;
+    public SearchField setSynonymMapNames(List<String> synonymMapNames) {
+        this.synonymMapNames = synonymMapNames;
         return this;
     }
 

sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/SearchableField.java

@@ -9,9 +9,9 @@
  * A helper Field model to build a searchable {@link SearchField}.
  */
 public class SearchableField extends SimpleField {
-    private LexicalAnalyzerName analyzer;
-    private LexicalAnalyzerName searchAnalyzer;
-    private LexicalAnalyzerName indexAnalyzer;
+    private LexicalAnalyzerName analyzerName;
+    private LexicalAnalyzerName searchAnalyzerName;
+    private LexicalAnalyzerName indexAnalyzerName;
     private List<String> synonymMapNames;
 
     /**
@@ -31,19 +31,19 @@ public SearchableField(String name, boolean collection) {
      *
      * @return The {@link LexicalAnalyzerName} used for analyzer.
      */
-    public LexicalAnalyzerName getAnalyzer() {
-        return analyzer;
+    public LexicalAnalyzerName getAnalyzerName() {
+        return analyzerName;
     }
 
     /**
      * Sets the name of the language analyzer. This property cannot be set when either {@code searchAnalyzer} or
      * {@code indexAnalyzer} are set. Once the analyzer is chosen, it cannot be changed for the field in the index.
      *
-     * @param analyzer The {@link LexicalAnalyzerName} used for analyzer.
+     * @param analyzerName The {@link LexicalAnalyzerName} used for analyzer.
      * @return The SearchableField object itself.
      */
-    public SearchableField setAnalyzer(LexicalAnalyzerName analyzer) {
-        this.analyzer = analyzer;
+    public SearchableField setAnalyzerName(LexicalAnalyzerName analyzerName) {
+        this.analyzerName = analyzerName;
         return this;
     }
 
@@ -54,20 +54,20 @@ public SearchableField setAnalyzer(LexicalAnalyzerName analyzer) {
      *
      * @return The {@link LexicalAnalyzerName} used for search analyzer.
      */
-    public LexicalAnalyzerName getSearchAnalyzer() {
-        return searchAnalyzer;
+    public LexicalAnalyzerName getSearchAnalyzerName() {
+        return searchAnalyzerName;
     }
 
     /**
      * Sets the name of the language analyzer for searching. This property must be set together with
      * {@code indexAnalyzer}, and cannot be set when {@code analyzer} is set. Once the analyzer is chosen, it cannot be
      * changed for the field in the index.
      *
-     * @param searchAnalyzer The {@link LexicalAnalyzerName} used for search analyzer.
+     * @param searchAnalyzerName The {@link LexicalAnalyzerName} used for search analyzer.
      * @return The SearchableField object itself.
      */
-    public SearchableField setSearchAnalyzer(LexicalAnalyzerName searchAnalyzer) {
-        this.searchAnalyzer = searchAnalyzer;
+    public SearchableField setSearchAnalyzerName(LexicalAnalyzerName searchAnalyzerName) {
+        this.searchAnalyzerName = searchAnalyzerName;
         return this;
     }
 
@@ -78,20 +78,20 @@ public SearchableField setSearchAnalyzer(LexicalAnalyzerName searchAnalyzer) {
      *
      * @return The {@link LexicalAnalyzerName} used for index analyzer.
      */
-    public LexicalAnalyzerName getIndexAnalyzer() {
-        return indexAnalyzer;
+    public LexicalAnalyzerName getIndexAnalyzerName() {
+        return indexAnalyzerName;
     }
 
     /**
      * Gets the name of the language analyzer for indexing. This property must be set together with
      * {@code searchAnalyzer}, and cannot be set when {@code analyzer} is set. Once the analyzer is chosen, it cannot be
      * changed for the field in the index.
      *
-     * @param indexAnalyzer The {@link LexicalAnalyzerName} used for index analyzer.
+     * @param indexAnalyzerName The {@link LexicalAnalyzerName} used for index analyzer.
      * @return The SearchableField object itself.
      */
-    public SearchableField setIndexAnalyzer(LexicalAnalyzerName indexAnalyzer) {
-        this.indexAnalyzer = indexAnalyzer;
+    public SearchableField setIndexAnalyzerName(LexicalAnalyzerName indexAnalyzerName) {
+        this.indexAnalyzerName = indexAnalyzerName;
         return this;
     }
 
@@ -138,9 +138,9 @@ public SearchField build() {
             .setFilterable(super.isFilterable())
             .setHidden(super.isHidden())
             .setFacetable(super.isFacetable())
-            .setAnalyzer(this.analyzer)
-            .setSearchAnalyzer(this.searchAnalyzer)
-            .setIndexAnalyzer(this.indexAnalyzer)
-            .setSynonymMaps(this.synonymMapNames);
+            .setAnalyzerName(this.analyzerName)
+            .setSearchAnalyzerName(this.searchAnalyzerName)
+            .setIndexAnalyzerName(this.indexAnalyzerName)
+            .setSynonymMapNames(this.synonymMapNames);
     }
 }