fixed tests

persistence-modules/spring-data-elasticsearch/pom.xml

@@ -37,11 +37,6 @@
             <version>${spring-data-elasticsearch.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-high-level-client</artifactId>
-            <version>${elasticsearch.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>

persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/SpringContextManualTest.java

@@ -9,8 +9,7 @@ import com.baeldung.spring.data.es.config.Config;
 
 /**
  * 
- * This Manual test requires:
+ * This Manual test requires: * Elasticsearch instance running on host
- * * Elasticsearch instance running on host
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)

persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchManualTest.java

@@ -35,9 +35,8 @@ import org.springframework.data.elasticsearch.client.RestClients;
 
 /**
  * 
- * This Manual test requires:
+ * This Manual test requires: * Elasticsearch instance running on host * with
- * * Elasticsearch instance running on host
+ * cluster name = elasticsearch
- * * with cluster name = elasticsearch
  *
  */
 public class ElasticSearchManualTest {
@@ -90,11 +89,8 @@ public class ElasticSearchManualTest {
   public void givenSearchRequest_whenMatchAll_thenReturnAllResults() throws Exception {
     SearchRequest searchRequest = new SearchRequest();
     SearchResponse response = client.search(searchRequest, RequestOptions.DEFAULT);
-        SearchHit[] searchHits = response
+    SearchHit[] searchHits = response.getHits().getHits();
-          .getHits()
+    List<Person> results = Arrays.stream(searchHits).map(hit -> JSON.parseObject(hit.getSourceAsString(), Person.class))
-          .getHits();
-        List<Person> results = Arrays.stream(searchHits)
-          .map(hit -> JSON.parseObject(hit.getSourceAsString(), Person.class))
         .collect(Collectors.toList());
 
     results.forEach(System.out::println);
@@ -102,11 +98,8 @@ public class ElasticSearchManualTest {
 
   @Test
   public void givenSearchParameters_thenReturnResults() throws Exception {
-      SearchSourceBuilder builder = new SearchSourceBuilder()
+    SearchSourceBuilder builder = new SearchSourceBuilder().postFilter(QueryBuilders.rangeQuery("age").from(5).to(15))
-        .postFilter(QueryBuilders.rangeQuery("age").from(5).to(15))
+        .from(0).size(60).explain(true);
-        .from(0)
-        .size(60)
-        .explain(true);
 
     SearchRequest searchRequest = new SearchRequest();
     searchRequest.searchType(SearchType.DFS_QUERY_THEN_FETCH);
@@ -114,11 +107,8 @@ public class ElasticSearchManualTest {
 
     SearchResponse response = client.search(searchRequest, RequestOptions.DEFAULT);
 
-        builder = new SearchSourceBuilder()
+    builder = new SearchSourceBuilder().postFilter(QueryBuilders.simpleQueryStringQuery("+John -Doe OR Janette"))
-          .postFilter(QueryBuilders.simpleQueryStringQuery("+John -Doe OR Janette"))
+        .from(0).size(60).explain(true);
-          .from(0)
-          .size(60)
-          .explain(true);
 
     searchRequest = new SearchRequest();
     searchRequest.searchType(SearchType.DFS_QUERY_THEN_FETCH);
@@ -126,10 +116,7 @@ public class ElasticSearchManualTest {
 
     SearchResponse response2 = client.search(searchRequest, RequestOptions.DEFAULT);
 
-        builder = new SearchSourceBuilder()
+    builder = new SearchSourceBuilder().postFilter(QueryBuilders.matchQuery("John", "Name*")).from(0).size(60)
-          .postFilter(QueryBuilders.matchQuery("John", "Name*"))
-          .from(0)
-          .size(60)
         .explain(true);
     searchRequest = new SearchRequest();
     searchRequest.searchType(SearchType.DFS_QUERY_THEN_FETCH);
@@ -141,20 +128,14 @@ public class ElasticSearchManualTest {
     response3.getHits();
 
     final List<Person> results = Arrays.stream(response.getHits().getHits())
-          .map(hit -> JSON.parseObject(hit.getSourceAsString(), Person.class))
+        .map(hit -> JSON.parseObject(hit.getSourceAsString(), Person.class)).collect(Collectors.toList());
-          .collect(Collectors.toList());
     results.forEach(System.out::println);
   }
 
   @Test
   public void givenContentBuilder_whenHelpers_thanIndexJson() throws IOException {
-        XContentBuilder builder = XContentFactory
+    XContentBuilder builder = XContentFactory.jsonBuilder().startObject().field("fullName", "Test")
-          .jsonBuilder()
+        .field("salary", "11500").field("age", "10").endObject();
-          .startObject()
-          .field("fullName", "Test")
-          .field("salary", "11500")
-          .field("age", "10")
-          .endObject();
 
     IndexRequest indexRequest = new IndexRequest("people", "Doe");
     indexRequest.source(builder);

persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/GeoQueriesManualTest.java

@@ -33,10 +33,8 @@ import com.baeldung.spring.data.es.config.Config;
 
 /**
  * 
- * This Manual test requires:
+ * This Manual test requires: * Elasticsearch instance running on host * with
- * * Elasticsearch instance running on host
+ * cluster name = elasticsearch * and further configurations
- * * with cluster name = elasticsearch
- * * and further configurations
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -57,39 +55,26 @@ public class GeoQueriesManualTest {
     String jsonObject = "{\"Wonders\":{\"properties\":{\"name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"region\":{\"type\":\"geo_shape\",\"tree\":\"quadtree\",\"precision\":\"1m\"},\"location\":{\"type\":\"geo_point\"}}}}";
     CreateIndexRequest req = new CreateIndexRequest(WONDERS_OF_WORLD);
     req.mapping(WONDERS, jsonObject, XContentType.JSON);
-        client.admin()
+    client.admin().indices().create(req).actionGet();
-          .indices()
-          .create(req)
-          .actionGet();
   }
 
   @Test
   public void givenGeoShapeData_whenExecutedGeoShapeQuery_thenResultNonEmpty() throws IOException {
     String jsonObject = "{\"name\":\"Agra\",\"region\":{\"type\":\"envelope\",\"coordinates\":[[75,30.2],[80.1, 25]]}}";
-        IndexResponse response = client.prepareIndex(WONDERS_OF_WORLD, WONDERS)
+    IndexResponse response = client.prepareIndex(WONDERS_OF_WORLD, WONDERS).setSource(jsonObject, XContentType.JSON)
-          .setSource(jsonObject, XContentType.JSON)
         .get();
 
     String tajMahalId = response.getId();
-        client.admin()
+    client.admin().indices().prepareRefresh(WONDERS_OF_WORLD).get();
-          .indices()
-          .prepareRefresh(WONDERS_OF_WORLD)
-          .get();
 
     Coordinate topLeft = new Coordinate(74, 31.2);
     Coordinate bottomRight = new Coordinate(81.1, 24);
-        QueryBuilder qb = QueryBuilders
+    QueryBuilder qb = QueryBuilders.geoShapeQuery("region", new EnvelopeBuilder(topLeft, bottomRight));
-            .geoShapeQuery("region", new EnvelopeBuilder(topLeft, bottomRight));
 
-        SearchResponse searchResponse = client.prepareSearch(WONDERS_OF_WORLD)
+    SearchResponse searchResponse = client.prepareSearch(WONDERS_OF_WORLD).setTypes(WONDERS).setQuery(qb).execute()
-          .setTypes(WONDERS)
-          .setQuery(qb)
-          .execute()
         .actionGet();
 
-        List<String> ids = Arrays.stream(searchResponse.getHits()
+    List<String> ids = Arrays.stream(searchResponse.getHits().getHits()).map(SearchHit::getId)
-          .getHits())
-          .map(SearchHit::getId)
         .collect(Collectors.toList());
 
     assertTrue(ids.contains(tajMahalId));
@@ -98,26 +83,16 @@ public class GeoQueriesManualTest {
   @Test
   public void givenGeoPointData_whenExecutedGeoBoundingBoxQuery_thenResultNonEmpty() {
     String jsonObject = "{\"name\":\"Pyramids of Giza\",\"location\":[31.131302,29.976480]}";
-        IndexResponse response = client.prepareIndex(WONDERS_OF_WORLD, WONDERS)
+    IndexResponse response = client.prepareIndex(WONDERS_OF_WORLD, WONDERS).setSource(jsonObject, XContentType.JSON)
-          .setSource(jsonObject, XContentType.JSON)
         .get();
     String pyramidsOfGizaId = response.getId();
-        client.admin()
+    client.admin().indices().prepareRefresh(WONDERS_OF_WORLD).get();
-          .indices()
-          .prepareRefresh(WONDERS_OF_WORLD)
-          .get();
 
-        QueryBuilder qb = QueryBuilders.geoBoundingBoxQuery("location")
+    QueryBuilder qb = QueryBuilders.geoBoundingBoxQuery("location").setCorners(31, 30, 28, 32);
-            .setCorners(31,30,28,32);
 
-        SearchResponse searchResponse = client.prepareSearch(WONDERS_OF_WORLD)
+    SearchResponse searchResponse = client.prepareSearch(WONDERS_OF_WORLD).setTypes(WONDERS).setQuery(qb).execute()
-          .setTypes(WONDERS)
-          .setQuery(qb)
-          .execute()
         .actionGet();
-        List<String> ids = Arrays.stream(searchResponse.getHits()
+    List<String> ids = Arrays.stream(searchResponse.getHits().getHits()).map(SearchHit::getId)
-          .getHits())
-          .map(SearchHit::getId)
         .collect(Collectors.toList());
     assertTrue(ids.contains(pyramidsOfGizaId));
   }
@@ -125,27 +100,16 @@ public class GeoQueriesManualTest {
   @Test
   public void givenGeoPointData_whenExecutedGeoDistanceQuery_thenResultNonEmpty() {
     String jsonObject = "{\"name\":\"Lighthouse of alexandria\",\"location\":[31.131302,29.976480]}";
-        IndexResponse response = client.prepareIndex(WONDERS_OF_WORLD, WONDERS)
+    IndexResponse response = client.prepareIndex(WONDERS_OF_WORLD, WONDERS).setSource(jsonObject, XContentType.JSON)
-          .setSource(jsonObject, XContentType.JSON)
         .get();
     String lighthouseOfAlexandriaId = response.getId();
-        client.admin()
+    client.admin().indices().prepareRefresh(WONDERS_OF_WORLD).get();
-          .indices()
-          .prepareRefresh(WONDERS_OF_WORLD)
-          .get();
 
-        QueryBuilder qb = QueryBuilders.geoDistanceQuery("location")
+    QueryBuilder qb = QueryBuilders.geoDistanceQuery("location").point(29.976, 31.131).distance(10, DistanceUnit.MILES);
-          .point(29.976, 31.131)
-          .distance(10, DistanceUnit.MILES);
 
-        SearchResponse searchResponse = client.prepareSearch(WONDERS_OF_WORLD)
+    SearchResponse searchResponse = client.prepareSearch(WONDERS_OF_WORLD).setTypes(WONDERS).setQuery(qb).execute()
-          .setTypes(WONDERS)
-          .setQuery(qb)
-          .execute()
         .actionGet();
-        List<String> ids = Arrays.stream(searchResponse.getHits()
+    List<String> ids = Arrays.stream(searchResponse.getHits().getHits()).map(SearchHit::getId)
-          .getHits())
-          .map(SearchHit::getId)
         .collect(Collectors.toList());
     assertTrue(ids.contains(lighthouseOfAlexandriaId));
   }
@@ -153,14 +117,10 @@ public class GeoQueriesManualTest {
   @Test
   public void givenGeoPointData_whenExecutedGeoPolygonQuery_thenResultNonEmpty() {
     String jsonObject = "{\"name\":\"The Great Rann of Kutch\",\"location\":[69.859741,23.733732]}";
-        IndexResponse response = client.prepareIndex(WONDERS_OF_WORLD, WONDERS)
+    IndexResponse response = client.prepareIndex(WONDERS_OF_WORLD, WONDERS).setSource(jsonObject, XContentType.JSON)
-          .setSource(jsonObject, XContentType.JSON)
         .get();
     String greatRannOfKutchid = response.getId();
-        client.admin()
+    client.admin().indices().prepareRefresh(WONDERS_OF_WORLD).get();
-          .indices()
-          .prepareRefresh(WONDERS_OF_WORLD)
-          .get();
 
     List<GeoPoint> allPoints = new ArrayList<GeoPoint>();
     allPoints.add(new GeoPoint(22.733, 68.859));
@@ -168,14 +128,9 @@ public class GeoQueriesManualTest {
     allPoints.add(new GeoPoint(23, 70.859));
     QueryBuilder qb = QueryBuilders.geoPolygonQuery("location", allPoints);
 
-        SearchResponse searchResponse = client.prepareSearch(WONDERS_OF_WORLD)
+    SearchResponse searchResponse = client.prepareSearch(WONDERS_OF_WORLD).setTypes(WONDERS).setQuery(qb).execute()
-          .setTypes(WONDERS)
-          .setQuery(qb)
-          .execute()
         .actionGet();
-        List<String> ids = Arrays.stream(searchResponse.getHits()
+    List<String> ids = Arrays.stream(searchResponse.getHits().getHits()).map(SearchHit::getId)
-          .getHits())
-          .map(SearchHit::getId)
         .collect(Collectors.toList());
     assertTrue(ids.contains(greatRannOfKutchid));
   }

persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/spring/data/es/ElasticSearchManualTest.java

@@ -29,9 +29,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * 
- * This Manual test requires:
+ * This Manual test requires: * Elasticsearch instance running on host * with
- * * Elasticsearch instance running on host
+ * cluster name = elasticsearch
- * * with cluster name = elasticsearch
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -88,26 +87,29 @@ public class ElasticSearchManualTest {
     @Test
     public void givenPersistedArticles_whenSearchByAuthorsName_thenRightFound() {
 
-        final Page<Article> articleByAuthorName = articleService
+        final Page<Article> articleByAuthorName = articleService.findByAuthorName(johnSmith.getName(),
-          .findByAuthorName(johnSmith.getName(), PageRequest.of(0, 10));
+                PageRequest.of(0, 10));
         assertEquals(2L, articleByAuthorName.getTotalElements());
     }
 
     @Test
     public void givenCustomQuery_whenSearchByAuthorsName_thenArticleIsFound() {
-        final Page<Article> articleByAuthorName = articleService.findByAuthorNameUsingCustomQuery("Smith", PageRequest.of(0, 10));
+        final Page<Article> articleByAuthorName = articleService.findByAuthorNameUsingCustomQuery("Smith",
+                PageRequest.of(0, 10));
         assertEquals(2L, articleByAuthorName.getTotalElements());
     }
 
     @Test
     public void givenTagFilterQuery_whenSearchByTag_thenArticleIsFound() {
-        final Page<Article> articleByAuthorName = articleService.findByFilteredTagQuery("elasticsearch", PageRequest.of(0, 10));
+        final Page<Article> articleByAuthorName = articleService.findByFilteredTagQuery("elasticsearch",
+                PageRequest.of(0, 10));
         assertEquals(3L, articleByAuthorName.getTotalElements());
     }
 
     @Test
     public void givenTagFilterQuery_whenSearchByAuthorsName_thenArticleIsFound() {
-        final Page<Article> articleByAuthorName = articleService.findByAuthorsNameAndFilteredTagQuery("Doe", "elasticsearch", PageRequest.of(0, 10));
+        final Page<Article> articleByAuthorName = articleService.findByAuthorsNameAndFilteredTagQuery("Doe",
+                "elasticsearch", PageRequest.of(0, 10));
         assertEquals(2L, articleByAuthorName.getTotalElements());
     }
 

persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/spring/data/es/ElasticSearchQueryManualTest.java

@@ -20,8 +20,10 @@ import com.baeldung.spring.data.es.model.Author;
 import com.baeldung.spring.data.es.service.ArticleService;
 
 import org.apache.lucene.search.join.ScoreMode;
+import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.client.Client;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.index.query.MultiMatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
@@ -29,8 +31,9 @@ import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.BucketOrder;
 import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation;
-import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
+import org.elasticsearch.search.aggregations.bucket.terms.ParsedStringTerms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -59,7 +62,7 @@ public class ElasticSearchQueryManualTest {
     private ArticleService articleService;
 
     @Autowired
-    private Client client;
+    private RestHighLevelClient client;
 
     private final Author johnSmith = new Author("John Smith");
     private final Author johnDoe = new Author("John Doe");
@@ -141,13 +144,18 @@ public class ElasticSearchQueryManualTest {
     }
 
     @Test
-    public void givenAnalyzedQuery_whenMakeAggregationOnTermCount_thenEachTokenCountsSeparately() {
+    public void givenAnalyzedQuery_whenMakeAggregationOnTermCount_thenEachTokenCountsSeparately() throws Exception {
         final TermsAggregationBuilder aggregation = AggregationBuilders.terms("top_tags").field("title");
-        final SearchResponse response = client.prepareSearch("blog").setTypes("article").addAggregation(aggregation)
+        
-          .execute().actionGet();
+        final SearchSourceBuilder builder = new SearchSourceBuilder().aggregation(aggregation);
+        final SearchRequest searchRequest = new SearchRequest("blog")
+          .types("article")
+          .source(builder);
+
+        final SearchResponse response = client.search(searchRequest, RequestOptions.DEFAULT);
         
         final Map<String, Aggregation> results = response.getAggregations().asMap();
-        final StringTerms topTags = (StringTerms) results.get("top_tags");
+        final ParsedStringTerms topTags = (ParsedStringTerms) results.get("top_tags");
 
         final List<String> keys = topTags.getBuckets().stream()
           .map(MultiBucketsAggregation.Bucket::getKeyAsString)
@@ -157,14 +165,20 @@ public class ElasticSearchQueryManualTest {
     }
 
     @Test
-    public void givenNotAnalyzedQuery_whenMakeAggregationOnTermCount_thenEachTermCountsIndividually() {
+    public void givenNotAnalyzedQuery_whenMakeAggregationOnTermCount_thenEachTermCountsIndividually() throws Exception {
         final TermsAggregationBuilder aggregation = AggregationBuilders.terms("top_tags").field("tags")
           .order(BucketOrder.count(false));
-        final SearchResponse response = client.prepareSearch("blog").setTypes("article").addAggregation(aggregation)
+
-          .execute().actionGet();
+        final SearchSourceBuilder builder = new SearchSourceBuilder().aggregation(aggregation);
+        final SearchRequest searchRequest = new SearchRequest()
+          .indices("blog")
+          .types("article")
+          .source(builder);
+
+        final SearchResponse response = client.search(searchRequest, RequestOptions.DEFAULT);
 
         final Map<String, Aggregation> results = response.getAggregations().asMap();
-        final StringTerms topTags = (StringTerms) results.get("top_tags");
+        final ParsedStringTerms topTags = (ParsedStringTerms) results.get("top_tags");
 
         final List<String> keys = topTags.getBuckets().stream()
           .map(MultiBucketsAggregation.Bucket::getKeyAsString)