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 48e0e838e8b3ed33cdc605b2f59abe959dd415bc Author: Benoit Tellier <[email protected]> AuthorDate: Sat May 18 16:44:56 2019 +0700 JAMES-2765 TimeOut values was implicit --- .../main/java/org/apache/james/backends/es/v6/ElasticSearchIndexer.java | 2 +- .../java/org/apache/james/backends/es/v6/search/ScrollIterable.java | 2 +- .../java/org/apache/james/backends/es/v6/search/ScrollIterableTest.java | 2 +- .../james/quota/search/elasticsearch/ElasticSearchQuotaSearcher.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/ElasticSearchIndexer.java b/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/ElasticSearchIndexer.java index 6cf3d4a..c2e5a7d 100644 --- a/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/ElasticSearchIndexer.java +++ b/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/ElasticSearchIndexer.java @@ -45,7 +45,7 @@ import com.google.common.base.Preconditions; public class ElasticSearchIndexer { private static final int DEBUG_MAX_LENGTH_CONTENT = 1000; private static final int DEFAULT_BATCH_SIZE = 100; - private static final TimeValue TIMEOUT = new TimeValue(60000); + private static final TimeValue TIMEOUT = TimeValue.timeValueMinutes(1); private static final Logger LOGGER = LoggerFactory.getLogger(ElasticSearchIndexer.class); diff --git a/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/search/ScrollIterable.java b/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/search/ScrollIterable.java index 78ed814..475343a 100644 --- a/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/search/ScrollIterable.java +++ b/backends-common/elasticsearch-v6/src/main/java/org/apache/james/backends/es/v6/search/ScrollIterable.java @@ -33,7 +33,7 @@ import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.common.unit.TimeValue; public class ScrollIterable implements Iterable<SearchResponse> { - private static final TimeValue TIMEOUT = new TimeValue(60000); + private static final TimeValue TIMEOUT = TimeValue.timeValueMinutes(1); private final RestHighLevelClient client; private final SearchRequest searchRequest; diff --git a/backends-common/elasticsearch-v6/src/test/java/org/apache/james/backends/es/v6/search/ScrollIterableTest.java b/backends-common/elasticsearch-v6/src/test/java/org/apache/james/backends/es/v6/search/ScrollIterableTest.java index 3840181..2d239aa 100644 --- a/backends-common/elasticsearch-v6/src/test/java/org/apache/james/backends/es/v6/search/ScrollIterableTest.java +++ b/backends-common/elasticsearch-v6/src/test/java/org/apache/james/backends/es/v6/search/ScrollIterableTest.java @@ -50,7 +50,7 @@ import org.junit.Test; public class ScrollIterableTest { - private static final TimeValue TIMEOUT = new TimeValue(6000); + private static final TimeValue TIMEOUT = TimeValue.timeValueMinutes(1); private static final int SIZE = 2; private static final String MESSAGE = "message"; private static final IndexName INDEX_NAME = new IndexName("index"); diff --git a/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcher.java b/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcher.java index 80d2342..19cefef 100644 --- a/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcher.java +++ b/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcher.java @@ -43,7 +43,7 @@ import org.elasticsearch.search.sort.SortOrder; import com.github.steveash.guavate.Guavate; public class ElasticSearchQuotaSearcher implements QuotaSearcher { - private static final TimeValue TIMEOUT = new TimeValue(60000); + private static final TimeValue TIMEOUT = TimeValue.timeValueMinutes(1); private final RestHighLevelClient client; private final AliasName readAlias; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
