Automatically close scroll context

src/main/java/org/springframework/data/elasticsearch/core/StreamQueries.java

@@ -66,10 +66,14 @@ static <T> SearchHitsIterator<T> streamResults(int maxCount, SearchScrollHits<T>
 			private volatile Iterator<SearchHit<T>> currentScrollHits = searchHits.iterator();
 			private volatile boolean continueScroll = currentScrollHits.hasNext();
 			private volatile ScrollState scrollState = new ScrollState(searchHits.getScrollId());
+			private volatile boolean isClosed = false;
 
 			@Override
 			public void close() {
-				clearScrollConsumer.accept(scrollState.getScrollIds());
+				if (!isClosed) {
+					clearScrollConsumer.accept(scrollState.getScrollIds());
+					isClosed = true;
+				}
 			}
 
 			@Override
@@ -96,18 +100,24 @@ public TotalHitsRelation getTotalHitsRelation() {
 			@Override
 			public boolean hasNext() {
 
-				if (!continueScroll || (maxCount > 0 && currentCount.get() >= maxCount)) {
-					return false;
+				boolean hasNext = false;
+
+				if (!isClosed && continueScroll && (maxCount <= 0 || currentCount.get() < maxCount)) {
+
+					if (!currentScrollHits.hasNext()) {
+						SearchScrollHits<T> nextPage = continueScrollFunction.apply(scrollState.getScrollId());
+						currentScrollHits = nextPage.iterator();
+						scrollState.updateScrollId(nextPage.getScrollId());
+						continueScroll = currentScrollHits.hasNext();
+					}
+					hasNext = currentScrollHits.hasNext();
 				}
 
-				if (!currentScrollHits.hasNext()) {
-					SearchScrollHits<T> nextPage = continueScrollFunction.apply(scrollState.getScrollId());
-					currentScrollHits = nextPage.iterator();
-					scrollState.updateScrollId(nextPage.getScrollId());
-					continueScroll = currentScrollHits.hasNext();
+				if (!hasNext) {
+					close();
 				}
 
-				return currentScrollHits.hasNext();
+				return hasNext;
 			}
 
 			@Override

src/test/java/org/springframework/data/elasticsearch/core/StreamQueriesTest.java

@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.data.util.StreamUtils;
 
@@ -39,6 +40,8 @@ public void shouldCallClearScrollOnIteratorClose() {
 		// given
 		List<SearchHit<String>> hits = new ArrayList<>();
 		hits.add(getOneSearchHit());
+		hits.add(getOneSearchHit());
+		hits.add(getOneSearchHit());
 
 		SearchScrollHits<String> searchHits = newSearchScrollHits(hits, "1234");
 
@@ -51,16 +54,35 @@ public void shouldCallClearScrollOnIteratorClose() {
 				scrollId -> newSearchScrollHits(Collections.emptyList(), scrollId), //
 				scrollIds -> clearScrollCalled.set(true));
 
-		while (iterator.hasNext()) {
-			iterator.next();
-		}
+		iterator.next();
 		iterator.close();
 
 		// then
 		assertThat(clearScrollCalled).isTrue();
 
 	}
 
+	@Test // #1745
+	@DisplayName("should call clearScroll when no more data is available")
+	void shouldCallClearScrollWhenNoMoreDataIsAvailable() {
+
+		List<SearchHit<String>> hits = new ArrayList<>();
+		hits.add(getOneSearchHit());
+		SearchScrollHits<String> searchHits = newSearchScrollHits(hits, "1234");
+		AtomicBoolean clearScrollCalled = new AtomicBoolean(false);
+
+		SearchHitsIterator<String> iterator = StreamQueries.streamResults( //
+				0, //
+				searchHits, //
+				scrollId -> newSearchScrollHits(Collections.emptyList(), scrollId), //
+				scrollIds -> clearScrollCalled.set(true));
+
+		while (iterator.hasNext()) {
+			iterator.next();
+		}
+
+		assertThat(clearScrollCalled).isTrue();
+	}
 	private SearchHit<String> getOneSearchHit() {
 		return new SearchHit<String>(null, null, null, 0, null, null, null, null, null, null, "one");
 	}