Migrate plugin to elasticsearch 7.0.0

Author: Clément Tourrière

README.md

@@ -70,7 +70,7 @@ Plugin versions are available for (at least) all minor versions of Elasticsearch
 The first 3 digits of plugin version is Elasticsearch versioning. The last digit is used for plugin versioning under an elasticsearch version.
 
 To install it, launch this command in Elasticsearch directory replacing the url by the correct link for your Elasticsearch version (see table)
-`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-geoclustering/releases/download/v6.7.0.0/geopoint-clustering-aggregation-6.7.0.0.zip`
+`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-geoclustering/releases/download/v7.0.0.0/geopoint-clustering-aggregation-7.0.0.0.zip`
 
 | elasticsearch version | plugin version | plugin url |
 | --------------------- | -------------- | ---------- |
@@ -82,5 +82,6 @@ To install it, launch this command in Elasticsearch directory replacing the url
 | 6.5.4 | 6.5.4.0 | https://github.com/opendatasoft/elasticsearch-aggregation-geoclustering/releases/download/v6.5.4.0/geopoint-clustering-aggregation-6.5.4.0.zip|
 | 6.6.2 | 6.6.2.0 | https://github.com/opendatasoft/elasticsearch-aggregation-geoclustering/releases/download/v6.6.2.0/geopoint-clustering-aggregation-6.6.2.0.zip|
 | 6.7.0 | 6.7.0.0 | https://github.com/opendatasoft/elasticsearch-aggregation-geoclustering/releases/download/v6.7.0.0/geopoint-clustering-aggregation-6.7.0.0.zip|
+| 7.0.0 | 7.0.0.0 | https://github.com/opendatasoft/elasticsearch-aggregation-geoclustering/releases/download/v7.0.0.0/geopoint-clustering-aggregation-7.0.0.0.zip|
 
 

gradle.properties

@@ -1,2 +1,2 @@
-es_version = 6.7.0
-plugin_version = 6.7.0.0
+es_version = 7.0.0
+plugin_version = 7.0.0.0

src/main/java/com/opendatasoft/elasticsearch/search/aggregations/bucket/geopointclustering/GeoPointClusteringAggregator.java

@@ -1,6 +1,7 @@
 package com.opendatasoft.elasticsearch.search.aggregations.bucket.geopointclustering;
 
 import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.ScoreMode;
 import org.elasticsearch.common.geo.GeoHashUtils;
 import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.common.lease.Releasables;
@@ -51,8 +52,11 @@ public class GeoPointClusteringAggregator extends BucketsAggregator {
     }
 
     @Override
-    public boolean needsScores() {
-        return (valuesSource != null && valuesSource.needsScores()) || super.needsScores();
+    public ScoreMode scoreMode() {
+        if (valuesSource != null && valuesSource.needsScores()) {
+            return ScoreMode.COMPLETE;
+        }
+        return super.scoreMode();
     }
 
     @Override

src/test/resources/rest-api-spec/test/GeoPointClusteringAggregation/20_geo_clustering.yml

@@ -8,113 +8,97 @@ setup:
           settings:
             number_of_shards: 3
           mappings:
-            test:
-              "properties":
-                "point":
-                  "type": "geo_point"
+            "properties":
+              "point":
+                "type": "geo_point"
 
   - do:
       index:
         index:  test
-        type:   test
         id:     1
         body:   { "point": [2.454929, 48.821578]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     2
         body:   { "point": [2.245858, 48.86914]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     3
         body:   { "point": [2.240358, 48.863481]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     4
         body:   { "point": [2.25292, 48.847176]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     5
         body:   { "point": [2.279111, 48.872383]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     6
         body:   { "point": [2.336267, 48.822021]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     7
         body:   { "point": [2.338677, 48.822672]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     8
         body:   { "point": [2.336643, 48.822493]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     9
         body:   { "point": [2.438465, 48.84204]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     10
         body:   { "point": [2.381554, 48.835382]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     11
         body:   { "point": [2.407744, 48.83733]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     12
         body:   { "point": [2.34521, 48.849358]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     13
         body:   { "point": [2.252938, 48.846041]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     14
         body:   { "point": [2.279715, 48.871775]}
 
   - do:
       index:
         index:  test
-        type:   test
         id:     15
         body:   { "point": [2.380629, 48.879757]}
 
@@ -132,6 +116,7 @@ setup:
 
   - do:
       search:
+        rest_total_hits_as_int: true
         index: test
         body: {"aggs": { "gc" : { "geo_point_clustering": {"field": "point", "zoom": 1} } } }
 
@@ -149,6 +134,7 @@ setup:
 
   - do:
       search:
+        rest_total_hits_as_int: true
         index: test
         body: {"aggs": { "gc" : { "geo_point_clustering": {"field": "point", "zoom": 9} } } }
 
@@ -169,6 +155,7 @@ setup:
 
   - do:
       search:
+        rest_total_hits_as_int: true
         index: test
         body: {"aggs": { "gc" : { "geo_point_clustering": {"field": "point", "zoom": 15} } } }