revert unnecessary changes

Author: idickerson7

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

@@ -1399,13 +1399,11 @@ Mono<ListSynonymMapsResult> getSynonymMaps() {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all synonym maps as paginated response with {@link PagedFlux}.
+     * @return response from a List SynonymMaps request on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<SynonymMap> listSynonymMaps() {
-        return new PagedFlux<>(() -> listSynonymMapsWithResponse(new RequestOptions())
-            .map(response -> new PagedResponseBase<>(response.getRequest(), response.getStatusCode(),
-                response.getHeaders(), response.getValue().getSynonymMaps(), null, null)));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<ListSynonymMapsResult> listSynonymMaps() {
+        return getSynonymMaps();
     }
 
     /**
@@ -1430,7 +1428,7 @@ public PagedFlux<SynonymMap> listSynonymMaps() {
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Mono<Response<ListSynonymMapsResult>> listSynonymMapsWithResponse(RequestOptions requestOptions) {
+    public Mono<Response<ListSynonymMapsResult>> listSynonymMapsWithResponse(RequestOptions requestOptions) {
         return mapResponse(getSynonymMapsWithResponse(requestOptions), ListSynonymMapsResult.class);
     }
 

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

@@ -1438,15 +1438,11 @@ ListSynonymMapsResult getSynonymMaps() {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all synonym maps as paginated response with {@link PagedIterable}.
+     * @return response from a List SynonymMaps request.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<SynonymMap> listSynonymMaps() {
-        return new PagedIterable<>(() -> {
-            Response<ListSynonymMapsResult> response = listSynonymMapsWithResponse(new RequestOptions());
-            return new PagedResponseBase<>(response.getRequest(), response.getStatusCode(), response.getHeaders(),
-                response.getValue().getSynonymMaps(), null, null);
-        });
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ListSynonymMapsResult listSynonymMaps() {
+        return getSynonymMaps();
     }
 
     /**
@@ -1470,7 +1466,7 @@ public PagedIterable<SynonymMap> listSynonymMaps() {
      * @return response from a List SynonymMaps request along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<ListSynonymMapsResult> listSynonymMapsWithResponse(RequestOptions requestOptions) {
+    public Response<ListSynonymMapsResult> listSynonymMapsWithResponse(RequestOptions requestOptions) {
         return convertResponse(getSynonymMapsWithResponse(requestOptions), ListSynonymMapsResult.class);
     }
 

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

@@ -1362,13 +1362,11 @@ public Mono<SearchIndexerDataSourceConnection> getDataSourceConnection(String na
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all datasources as paginated response with {@link PagedFlux}.
+     * @return response from a List Datasources request on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<SearchIndexerDataSourceConnection> listDataSourceConnections() {
-        return new PagedFlux<>(() -> listDataSourceConnectionsWithResponse(new RequestOptions())
-            .map(response -> new PagedResponseBase<>(response.getRequest(), response.getStatusCode(),
-                response.getHeaders(), response.getValue().getDataSources(), null, null)));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<ListDataSourcesResult> listDataSourceConnections() {
+        return getDataSourceConnections();
     }
 
     /**
@@ -1393,7 +1391,7 @@ public PagedFlux<SearchIndexerDataSourceConnection> listDataSourceConnections()
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Mono<Response<ListDataSourcesResult>> listDataSourceConnectionsWithResponse(RequestOptions requestOptions) {
+    public Mono<Response<ListDataSourcesResult>> listDataSourceConnectionsWithResponse(RequestOptions requestOptions) {
         return mapResponse(getDataSourceConnectionsWithResponse(requestOptions), ListDataSourcesResult.class);
     }
 
@@ -1624,13 +1622,11 @@ public Mono<SearchIndexer> getIndexer(String name) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all indexers as paginated response with {@link PagedFlux}.
+     * @return response from a List Indexers request on successful completion of {@link Mono}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<SearchIndexer> listIndexers() {
-        return new PagedFlux<>(() -> listIndexersWithResponse(new RequestOptions())
-            .map(response -> new PagedResponseBase<>(response.getRequest(), response.getStatusCode(),
-                response.getHeaders(), response.getValue().getIndexers(), null, null)));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<ListIndexersResult> listIndexers() {
+        return getIndexers();
     }
 
     /**
@@ -1655,7 +1651,7 @@ public PagedFlux<SearchIndexer> listIndexers() {
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Mono<Response<ListIndexersResult>> listIndexersWithResponse(RequestOptions requestOptions) {
+    public Mono<Response<ListIndexersResult>> listIndexersWithResponse(RequestOptions requestOptions) {
         return mapResponse(getIndexersWithResponse(requestOptions), ListIndexersResult.class);
     }
 

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

@@ -1334,15 +1334,11 @@ public SearchIndexerDataSourceConnection getDataSourceConnection(String name) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all datasources as paginated response with {@link PagedIterable}.
+     * @return response from a List Datasources request.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<SearchIndexerDataSourceConnection> listDataSourceConnections() {
-        return new PagedIterable<>(() -> {
-            Response<ListDataSourcesResult> response = listDataSourceConnectionsWithResponse(new RequestOptions());
-            return new PagedResponseBase<>(response.getRequest(), response.getStatusCode(), response.getHeaders(),
-                response.getValue().getDataSources(), null, null);
-        });
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ListDataSourcesResult listDataSourceConnections() {
+        return getDataSourceConnections();
     }
 
     /**
@@ -1367,7 +1363,7 @@ public PagedIterable<SearchIndexerDataSourceConnection> listDataSourceConnection
      * @return response from a List Datasources request along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<ListDataSourcesResult> listDataSourceConnectionsWithResponse(RequestOptions requestOptions) {
+    public Response<ListDataSourcesResult> listDataSourceConnectionsWithResponse(RequestOptions requestOptions) {
         return convertResponse(getDataSourceConnectionsWithResponse(requestOptions), ListDataSourcesResult.class);
     }
 
@@ -1586,15 +1582,11 @@ public SearchIndexer getIndexer(String name) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all indexers as paginated response with {@link PagedIterable}.
+     * @return response from a List Indexers request.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<SearchIndexer> listIndexers() {
-        return new PagedIterable<>(() -> {
-            Response<ListIndexersResult> response = listIndexersWithResponse(new RequestOptions());
-            return new PagedResponseBase<>(response.getRequest(), response.getStatusCode(), response.getHeaders(),
-                response.getValue().getIndexers(), null, null);
-        });
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ListIndexersResult listIndexers() {
+        return getIndexers();
     }
 
     /**
@@ -1618,7 +1610,7 @@ public PagedIterable<SearchIndexer> listIndexers() {
      * @return response from a List Indexers request along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<ListIndexersResult> listIndexersWithResponse(RequestOptions requestOptions) {
+    public Response<ListIndexersResult> listIndexersWithResponse(RequestOptions requestOptions) {
         return convertResponse(getIndexersWithResponse(requestOptions), ListIndexersResult.class);
     }
 

sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/SearchJavaDocCodeSnippets.java

@@ -23,7 +23,9 @@
 import com.azure.search.documents.indexes.models.GetIndexStatisticsResult;
 import com.azure.search.documents.indexes.models.InputFieldMappingEntry;
 import com.azure.search.documents.indexes.models.LexicalTokenizerName;
-
+import com.azure.search.documents.indexes.models.ListDataSourcesResult;
+import com.azure.search.documents.indexes.models.ListIndexersResult;
+import com.azure.search.documents.indexes.models.ListSynonymMapsResult;
 import com.azure.search.documents.indexes.models.OcrSkill;
 import com.azure.search.documents.indexes.models.OutputFieldMappingEntry;
 import com.azure.search.documents.indexes.models.SearchAlias;
@@ -985,8 +987,8 @@ public void getSynonymMapWithResponse() {
      */
     public void listSynonymMaps() {
         // BEGIN: com.azure.search.documents.indexes.SearchIndexClient.listSynonymMaps
-        PagedIterable<SynonymMap> synonymMaps = SEARCH_INDEX_CLIENT.listSynonymMaps();
-        for (SynonymMap synonymMap: synonymMaps) {
+        ListSynonymMapsResult synonymMaps = SEARCH_INDEX_CLIENT.listSynonymMaps();
+        for (SynonymMap synonymMap: synonymMaps.getSynonymMaps()) {
             System.out.printf("The synonymMap name is %s. The ETag of synonymMap is %s.%n", synonymMap.getName(),
                 synonymMap.getETag());
         }
@@ -1347,9 +1349,9 @@ public void getSynonymMapWithResponseAsync() {
     public void listSynonymMapsAsync() {
         // BEGIN: com.azure.search.documents.indexes.SearchIndexAsyncClient.listSynonymMaps
         SEARCH_INDEX_ASYNC_CLIENT.listSynonymMaps()
-            .subscribe(synonymMap ->
+            .subscribe(result -> result.getSynonymMaps().forEach(synonymMap ->
                 System.out.printf("The synonymMap name is %s. The ETag of synonymMap is %s.%n",
-                    synonymMap.getName(), synonymMap.getETag()));
+                    synonymMap.getName(), synonymMap.getETag())));
         // END: com.azure.search.documents.indexes.SearchIndexAsyncClient.listSynonymMaps
     }
 
@@ -1517,8 +1519,8 @@ public void getSearchIndexerWithResponse() {
      */
     public void listIndexers() {
         // BEGIN: com.azure.search.documents.indexes.SearchIndexerClient.listIndexers
-        PagedIterable<SearchIndexer> indexers = SEARCH_INDEXER_CLIENT.listIndexers();
-        for (SearchIndexer indexer: indexers) {
+        ListIndexersResult indexers = SEARCH_INDEXER_CLIENT.listIndexers();
+        for (SearchIndexer indexer: indexers.getIndexers()) {
             System.out.printf("The indexer name is %s. The ETag of indexer is %s.%n", indexer.getName(),
                 indexer.getETag());
         }
@@ -1752,8 +1754,8 @@ public void getDataSourceWithResponse() {
      */
     public void listDataSources() {
         // BEGIN: com.azure.search.documents.indexes.SearchIndexerClient.listDataSourceConnections
-        PagedIterable<SearchIndexerDataSourceConnection> dataSources = SEARCH_INDEXER_CLIENT.listDataSourceConnections();
-        for (SearchIndexerDataSourceConnection dataSource: dataSources) {
+        ListDataSourcesResult dataSources = SEARCH_INDEXER_CLIENT.listDataSourceConnections();
+        for (SearchIndexerDataSourceConnection dataSource: dataSources.getDataSources()) {
             System.out.printf("The dataSource name is %s. The ETag of dataSource is %s.%n", dataSource.getName(),
                 dataSource.getETag());
         }
@@ -2103,9 +2105,9 @@ public void getSearchIndexerWithResponseAsync() {
     public void listIndexersAsync() {
         // BEGIN: com.azure.search.documents.indexes.SearchIndexerAsyncClient.listIndexers
         SEARCH_INDEXER_ASYNC_CLIENT.listIndexers()
-            .subscribe(indexer ->
+            .subscribe(result -> result.getIndexers().forEach(indexer ->
                 System.out.printf("The indexer name is %s. The ETag of indexer is %s.%n", indexer.getName(),
-                    indexer.getETag()));
+                    indexer.getETag())));
         // END: com.azure.search.documents.indexes.SearchIndexerAsyncClient.listIndexers
     }
 
@@ -2307,9 +2309,9 @@ public void getDataSourceWithResponseAsync() {
     public void listDataSourcesAsync() {
         // BEGIN: com.azure.search.documents.indexes.SearchIndexerAsyncClient.listDataSourceConnections
         SEARCH_INDEXER_ASYNC_CLIENT.listDataSourceConnections()
-            .subscribe(dataSource ->
+            .subscribe(result -> result.getDataSources().forEach(dataSource ->
                 System.out.printf("The dataSource name is %s. The ETag of dataSource is %s.%n",
-                    dataSource.getName(), dataSource.getETag()));
+                    dataSource.getName(), dataSource.getETag())));
         // END: com.azure.search.documents.indexes.SearchIndexerAsyncClient.listDataSourceConnections
     }