You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/11/01 10:51:25 UTC
[james-project] 04/06: JAMES-2917 Solve some RequestOptions related
deprecation warnings
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 0d72783ff472b0a0e027bb2473465cc3c5985c73
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Oct 10 13:08:24 2019 +0700
JAMES-2917 Solve some RequestOptions related deprecation warnings
---
.../java/org/apache/james/backends/es/search/ScrolledSearch.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/search/ScrolledSearch.java b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/search/ScrolledSearch.java
index 3a083e0..834f801 100644
--- a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/search/ScrolledSearch.java
+++ b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/search/ScrolledSearch.java
@@ -32,6 +32,7 @@ import org.elasticsearch.action.search.ClearScrollRequest;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchScrollRequest;
+import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.search.SearchHit;
@@ -46,7 +47,7 @@ public class ScrolledSearch {
ScrollIterator(RestHighLevelClient client, SearchRequest searchRequest) {
this.client = client;
ListenerToFuture<SearchResponse> listener = new ListenerToFuture<>();
- client.searchAsync(searchRequest, listener);
+ client.searchAsync(searchRequest, RequestOptions.DEFAULT, listener);
this.searchResponseFuture = listener.getFuture();
}
@@ -55,7 +56,7 @@ public class ScrolledSearch {
public void close() throws IOException {
ClearScrollRequest clearScrollRequest = new ClearScrollRequest();
clearScrollRequest.addScrollId(searchResponseFuture.join().getScrollId());
- client.clearScroll(clearScrollRequest);
+ client.clearScroll(clearScrollRequest, RequestOptions.DEFAULT);
}
@Override
@@ -68,10 +69,11 @@ public class ScrolledSearch {
public SearchResponse next() {
SearchResponse result = searchResponseFuture.join();
ListenerToFuture<SearchResponse> listener = new ListenerToFuture<>();
- client.searchScrollAsync(
+ client.scrollAsync(
new SearchScrollRequest()
.scrollId(result.getScrollId())
.scroll(TIMEOUT),
+ RequestOptions.DEFAULT,
listener);
searchResponseFuture = listener.getFuture();
return result;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org