From 0ce2c499d568c94dc8406134c097fad0e9305886 Mon Sep 17 00:00:00 2001
From: Peter-Josef Meisch <pj.meisch@sothawo.com>
Date: Thu, 15 Oct 2020 17:25:40 +0200
Subject: [PATCH] DATAES-951 - Revert DATAES-934.

Original PR: #537
---
 .../repository/ElasticsearchRepository.java    |  7 -------
 .../support/SimpleElasticsearchRepository.java |  6 ------
 ...lasticsearchRepositoryIntegrationTests.java | 18 ------------------
 3 files changed, 31 deletions(-)

diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java b/src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java
index 9d938cc82..7cfd552fb 100644
--- a/src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java
+++ b/src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java
@@ -75,13 +75,6 @@ public interface ElasticsearchRepository<T, ID> extends PagingAndSortingReposito
 	 */
 	Page<T> search(Query searchQuery);
 
-	/**
-	 * execute the given query and return the result in a SearchPage.
-	 * 
-	 * @since 4.1
-	 */
-	SearchPage<T> searchQuery(Query query);
-
 	/**
 	 * Search for similar entities using a morelikethis query
 	 * 
diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java
index cf390be2a..67b457ec0 100644
--- a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java
+++ b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java
@@ -253,12 +253,6 @@ public class SimpleElasticsearchRepository<T, ID> implements ElasticsearchReposi
 		return (Page<T>) SearchHitSupport.unwrapSearchHits(page);
 	}
 
-	@Override
-	public SearchPage<T> searchQuery(Query query) {
-		SearchHits<T> searchHits = execute(operations -> operations.search(query, entityClass, getIndexCoordinates()));
-		return SearchHitSupport.searchPageFor(searchHits, query.getPageable());
-	}
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public Page<T> searchSimilar(T entity, @Nullable String[] fields, Pageable pageable) {
diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/simple/SimpleElasticsearchRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/simple/SimpleElasticsearchRepositoryIntegrationTests.java
index ee0fdf4bb..9205aa49e 100644
--- a/src/test/java/org/springframework/data/elasticsearch/repository/support/simple/SimpleElasticsearchRepositoryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/simple/SimpleElasticsearchRepositoryIntegrationTests.java
@@ -718,24 +718,6 @@ public class SimpleElasticsearchRepositoryIntegrationTests {
 				.containsExactlyInAnyOrder("id-one", "id-two", "id-three");
 	}
 
-	@Test // DATAES-934
-	@DisplayName("should use query and return SearchPage")
-	void shouldUseQueryAndReturnSearchPage() {
-
-		List<SampleEntity> entities = createSampleEntitiesWithMessage("test", 20);
-		repository.saveAll(entities);
-
-		Criteria criteria = new Criteria("message").is("test");
-		CriteriaQuery query = new CriteriaQuery(new Criteria("message").is("test"));
-		query.setPageable(PageRequest.of(0, 8));
-
-		SearchPage<SampleEntity> searchPage = repository.searchQuery(query);
-
-		assertThat(searchPage.getTotalElements()).isEqualTo(20l);
-		assertThat(searchPage.stream().count()).isEqualTo(8l);
-		assertThat(searchPage.nextPageable().getOffset()).isEqualTo(8l);
-	}
-
 	private static List<SampleEntity> createSampleEntitiesWithMessage(String message, int numberOfEntities) {
 
 		List<SampleEntity> sampleEntities = new ArrayList<>();