Migrate to elasticsearch 7.0.0

Author: Clément Tourrière

README.md

@@ -256,7 +256,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-pathhierarchy/releases/download/v6.7.1.1/pathhierarchy-aggregation-6.7.1.1.zip`
+`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.0.0.0/pathhierarchy-aggregation-7.0.0.0.zip`
 
 | elasticsearch version | plugin version | plugin url |
 | --------------------- | -------------- | ---------- |
@@ -269,6 +269,7 @@ To install it, launch this command in Elasticsearch directory replacing the url
 | 6.5.4 | 6.5.4.1 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v6.5.4.1/pathhierarchy-aggregation-6.5.4.1.zip |
 | 6.6.2 | 6.6.2.0 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v6.6.2.0/pathhierarchy-aggregation-6.6.2.0.zip |
 | 6.7.1 | 6.7.1.1 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v6.7.1.1/pathhierarchy-aggregation-6.7.1.1.zip |
+| 7.0.0 | 7.0.0.0 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.0.0.0/pathhierarchy-aggregation-7.0.0.0.zip |
 
 
 License

gradle.properties

@@ -1,2 +1,2 @@
-es_version = 6.7.1
-plugin_version = 6.7.1.1
+es_version = 7.0.0
+plugin_version = 7.0.0.0

src/test/resources/rest-api-spec/test/PathHierarchy/20_path_hierarchy.yml

@@ -1,43 +1,45 @@
 setup:
-- do:
-    indices.create:
-      index: filesystem
-      body:
-        mappings:
-          file:
+  - do:
+      indices.create:
+        index: filesystem
+        body:
+          settings:
+            number_of_shards: 1
+            number_of_replicas: 0
+          mappings:
             properties:
               path:
                 type: keyword
-                index: false
-                doc_values: true
+              views:
+                type: integer
+
+  - do:
+      cluster.health:
+        wait_for_status: green
 
 ---
 "Test with filesystem arborescence":
   - do:
       index:
         index: filesystem
-        type: file
         id: 1
         body: { "path": "/My documents/Spreadsheets/Budget_2013.xls", "views": 10 }
 
   - do:
       index:
         index: filesystem
-        type: file
         id: 2
         body: { "path": "/My documents/Spreadsheets/Budget_2014.xls", "views": 7 }
 
   - do:
       index:
         index: filesystem
-        type: file
         id: 3
         body: { "path": "/My documents/Test.txt", "views": 1 }
 
   - do:
       index:
         index: filesystem
-        type: file
         id: 4
         body: { "path": "/My documents/Spreadsheets//Budget_2014.xls", "views": 12 }
 
@@ -48,6 +50,7 @@ setup:
 # basic test
   - do:
       search:
+        rest_total_hits_as_int: true
         body: {
           "size" : 0,
           "aggs" : {
@@ -96,6 +99,7 @@ setup:
 # test size
   - do:
       search:
+        rest_total_hits_as_int: true
         body: {
           "size" : 0,
           "aggs" : {
@@ -120,14 +124,15 @@ setup:
 # test depth
   - do:
       search:
+        rest_total_hits_as_int: true
         body: {
           "size" : 0,
           "aggs" : {
             "tree" : {
               "path_hierarchy" : {
                 "field" : "path",
                 "separator": "/",
-                "order": [ {"_count": "desc"}, {"_key": "asc"}],
+                "order": [{"_count": "desc"}, {"_key": "asc"}],
                 "depth": 2
               },
               "aggs": {
@@ -155,14 +160,15 @@ setup:
 # test keep_blank_path
   - do:
       search:
+        rest_total_hits_as_int: true
         body: {
           "size" : 0,
           "aggs" : {
             "tree" : {
               "path_hierarchy" : {
                 "field" : "path",
                 "separator": "/",
-                "order": [ {"_count": "desc"}, {"_key": "asc"}],
+                "order": [{"_count": "desc"}, {"_key": "asc"}],
                 "keep_blank_path": "true"
               },
               "aggs": {
@@ -209,6 +215,7 @@ setup:
 # test multi characters separator
   - do:
       search:
+        rest_total_hits_as_int: true
         body: {
           "size" : 0,
           "aggs" : {