From 464fc31d878b9a62f833b718347d6a6d59e444e1 Mon Sep 17 00:00:00 2001
From: Steven <steven.pearce@nowyoyo.com>
Date: Sun, 3 Oct 2021 18:08:49 +0100
Subject: [PATCH] AbstractElasticsearchTemplate.searchForStream use Query
 scrolltime.

Original Pull Request #1951
Closes #1950
---
 .../elasticsearch/core/AbstractElasticsearchTemplate.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java
index 590fa1613..20ed1b86f 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java
@@ -69,6 +69,7 @@ import org.springframework.util.Assert;
  * @author Peter-Josef Meisch
  * @author Roman Puchkovskiy
  * @author Subhobrata Dey
+ * @author Steven Pearce
  */
 public abstract class AbstractElasticsearchTemplate implements ElasticsearchOperations, ApplicationContextAware {
 
@@ -370,7 +371,8 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 	@Override
 	public <T> SearchHitsIterator<T> searchForStream(Query query, Class<T> clazz, IndexCoordinates index) {
 
-		long scrollTimeInMillis = Duration.ofMinutes(1).toMillis();
+		Duration scrollTime = query.getScrollTime() != null ? query.getScrollTime() : Duration.ofMinutes(1);
+		long scrollTimeInMillis = scrollTime.toMillis();
 		// noinspection ConstantConditions
 		int maxCount = query.isLimiting() ? query.getMaxResults() : 0;