Update to Elasticsearch 7.0.0-beta1

Note this is not a complete work as it will require elastic/elasticsearch#38944 to be fixed first.

Author: dadoonet

README.md

@@ -11,11 +11,10 @@ Versions
 
 | elasticsearch-beyonder  | elasticsearch | Release date |
 |:-----------------------:|:-------------:|:------------:|
-| 6.5                     | 6.5 -> 6.x    |  2019-01-04  |
-| 6.3                     | 6.3 -> 6.4    |  2018-07-21  |
-| 6.0                     | 6.0 -> 6.2    |  2018-02-05  |
-| 5.1                     | 5.x           |  2017-07-12  |
-| 5.0                     | 5.x           |  2017-07-11  |
+| 7.0-SNAPSHOT            | 7.x           |              |
+| 6.5-SNAPSHOT            | 6.x           |              |
+| 5.1                     | 5.x, 6.x      |  2017-07-12  |
+| 5.0                     | 5.x, 6.x      |  2017-07-11  |
 | 2.1.0                   | 2.0, 2.1      |  2015-11-25  |
 | 2.0.0                   |      2.0      |  2015-10-24  |
 | 1.5.0                   |      1.5      |  2015-03-27  |
@@ -26,7 +25,8 @@ Versions
 Documentation
 =============
 
-* For 6.x elasticsearch versions, you are reading the latest documentation.
+* For 7.x elasticsearch versions, you are reading the latest documentation.
+* For 6.x elasticsearch versions, look at [master branch](https://github.com/dadoonet/elasticsearch-beyonder/tree/master).
 * For 5.x elasticsearch versions, look at [es-5.x branch](https://github.com/dadoonet/elasticsearch-beyonder/tree/es-5.x).
 * For 2.x elasticsearch versions, look at [es-2.1 branch](https://github.com/dadoonet/elasticsearch-beyonder/tree/es-2.1).
 
@@ -49,7 +49,7 @@ Import elasticsearch-beyonder in you project `pom.xml` file:
 <dependency>
   <groupId>fr.pilato.elasticsearch</groupId>
   <artifactId>elasticsearch-beyonder</artifactId>
-  <version>6.5</version>
+  <version>7.0-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -62,7 +62,7 @@ For example, here is how to import the REST Client to your project:
 <dependency>
     <groupId>org.elasticsearch.client</groupId>
     <artifactId>elasticsearch-rest-client</artifactId>
-    <version>6.5.3</version>
+    <version>7.0.0-beta1</version>
 </dependency>
 ```
 
@@ -72,21 +72,10 @@ For example, here is how to import the Transport Client to your project (depreca
 <dependency>
     <groupId>org.elasticsearch.client</groupId>
     <artifactId>transport</artifactId>
-    <version>6.5.3</version>
+    <version>7.0.0-beta1</version>
 </dependency>
 ```
 
-For example, here is how to import the Secured Transport Client to your project (deprecated):
-
-```xml
-<dependency>
-    <groupId>org.elasticsearch.client</groupId>
-    <artifactId>x-pack-transport</artifactId>
-    <version>6.5.3</version>
-</dependency>
-```
-
-
 
 Adding Beyonder to your client
 ------------------------------
@@ -114,7 +103,7 @@ In that case, Beyonder will search for resources from `models/myelasticsearch`.
 
 ## Using REST Client (recommended)
 
-Elasticsearch now provides a [Rest Client](https://www.elastic.co/guide/en/elasticsearch/client/java-rest/6.5/index.html).
+Elasticsearch provides a [Rest Client](https://www.elastic.co/guide/en/elasticsearch/client/java-rest/7.0/index.html).
 It's the recommended way as the Transport Client is now deprecated and will be removed in a next major version.
 
 Just pass to Beyonder a Rest Client instance:
@@ -149,16 +138,6 @@ Client client = new PreBuiltTransportClient(Settings.EMPTY)
 ElasticsearchBeyonder.start(client);
 ```
 
-## Using Secured Transport Client (deprecated)
-
-To use the deprecated TransportClient, just pass it to Beyonder:
-
-```java
-Client client = new PreBuiltXPackTransportClient(Settings.builder().put("xpack.security.user", "elastic:changeme").build())
-           .addTransportAddress(new InetSocketTransportAddress(new InetSocketAddress("127.0.0.1", 9300)));
-ElasticsearchBeyonder.start(client);
-```
-
 Managing indices
 ----------------
 
@@ -174,9 +153,16 @@ For example, create the following file `src/main/resources/elasticsearch/twitter
 
 ```javascript
 {
-  "settings" : {
-    "number_of_shards" : 3,
-    "number_of_replicas" : 2
+  "settings": {
+    "number_of_shards": 3,
+    "number_of_replicas": 2
+  },
+  "mappings": {
+    "properties": {
+      "message": {
+        "type": "text"
+      }
+    }
   }
 }
 ```
@@ -185,31 +171,6 @@ By default, Beyonder will not overwrite an index if it already exists.
 This can be overridden by setting `force` to `true` in the expanded factory method
 `ElasticsearchBeyonder.start()`.
 
-Managing types (deprecated)
----------------------------
-
-This feature will be removed in the next future. Define your mapping within the index settings (see above)
-or using a template (see below).
-
-If you define a file named `elasticsearch/twitter/tweet.json`, it will be automatically applied as the mapping for
-the `tweet` type in the `twitter` index.
-
-For example, create the following file `src/main/resources/elasticsearch/twitter/tweet.json` in your project:
-
-```javascript
-{
-  "tweet" : {
-    "properties" : {
-      "message" : {"type" : "string", "store" : "yes"}
-    }
-  }
-}
-```
-
-By default, Beyonder will attempt to merge defined mappings with existing ones.
-This can be overridden by setting `merge` to `false` in the expanded factory method
-`ElasticsearchBeyonder.start()`.
-
 Managing templates
 ------------------
 
@@ -226,12 +187,9 @@ in your project:
         "number_of_shards" : 1
     },
     "mappings" : {
-        "tweet" : {
-            "properties" : {
-                "message" : {
-                    "type" : "string",
-                    "store" : "yes"
-                }
+        "properties" : {
+            "message" : {
+                "type" : "text"
             }
         }
     }

pom.xml

@@ -5,7 +5,7 @@
     <groupId>fr.pilato.elasticsearch</groupId>
     <artifactId>elasticsearch-beyonder</artifactId>
     <packaging>jar</packaging>
-    <version>6.6-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
     <name>Elasticsearch Beyonder</name>
     <url>https://github.com/dadoonet/elasticsearch-beyonder</url>
     <description>
@@ -22,7 +22,7 @@ when an elasticsearch client starts.
     </licenses>
 
     <properties>
-        <elasticsearch.version>6.5.3</elasticsearch.version>
+        <elasticsearch.version>7.0.0-beta1</elasticsearch.version>
         <test.elasticsearch.version>${elasticsearch.version}</test.elasticsearch.version>
         <slf4j.version>1.7.25</slf4j.version>
         <log4j.version>2.11.1</log4j.version>
@@ -49,7 +49,7 @@ when an elasticsearch client starts.
         <connection>scm:git:[email protected]:dadoonet/elasticsearch-beyonder.git</connection>
         <developerConnection>scm:git:[email protected]:dadoonet/elasticsearch-beyonder.git</developerConnection>
       <tag>HEAD</tag>
-  </scm>
+    </scm>
 
     <issueManagement>
         <system>GitHub</system>
@@ -96,7 +96,7 @@ when an elasticsearch client starts.
         <repository>
             <id>elastic-lucene-snapshots</id>
             <name>Elastic Lucene Snapshots</name>
-            <url>http://s3.amazonaws.com/download.elasticsearch.org/lucenesnapshots/6d9c714052</url>
+            <url>http://s3.amazonaws.com/download.elasticsearch.org/lucenesnapshots/83f9835</url>
             <releases><enabled>true</enabled></releases>
             <snapshots><enabled>false</enabled></snapshots>
         </repository>
@@ -110,6 +110,16 @@ when an elasticsearch client starts.
             <artifactId>transport</artifactId>
             <version>${elasticsearch.version}</version>
             <optional>true</optional>
+            <!--
+                Temporary workaround to be removed with final 7.0.0
+                See https://github.com/elastic/elasticsearch/issues/38944
+             -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.elasticsearch</groupId>
+                    <artifactId>elasticsearch-ssl-config</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
@@ -299,6 +309,9 @@ when an elasticsearch client starts.
                             <name>dadoonet/docker-elasticsearch:${project.version}</name>
                             <build>
                                 <from>${integ.elasticsearch.image}:${integ.elasticsearch.version}</from>
+                                <env>
+                                    <discovery.type>single-node</discovery.type>
+                                </env>
                             </build>
                             <run>
                                 <ports>

src/main/java/fr/pilato/elasticsearch/tools/ElasticsearchBeyonder.java

@@ -22,7 +22,6 @@
 import fr.pilato.elasticsearch.tools.SettingsFinder.Defaults;
 import fr.pilato.elasticsearch.tools.index.IndexFinder;
 import fr.pilato.elasticsearch.tools.template.TemplateFinder;
-import fr.pilato.elasticsearch.tools.type.TypeFinder;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.RestClient;
 import org.slf4j.Logger;
@@ -34,7 +33,6 @@
 import static fr.pilato.elasticsearch.tools.index.IndexElasticsearchUpdater.createIndex;
 import static fr.pilato.elasticsearch.tools.index.IndexElasticsearchUpdater.updateSettings;
 import static fr.pilato.elasticsearch.tools.template.TemplateElasticsearchUpdater.createTemplate;
-import static fr.pilato.elasticsearch.tools.type.TypeElasticsearchUpdater.createMapping;
 
 /**
  * By default, indexes are created with their default Elasticsearch settings. You can specify
@@ -116,13 +114,6 @@ public static void start(RestClient client, String root, boolean merge, boolean
 		for (String indexName : indexNames) {
 			createIndex(client, root, indexName, force);
 			updateSettings(client, root, indexName);
-
-			// create types
-			List<String> types = TypeFinder.findTypes(root, indexName);
-			for (String typeName : types) {
-				createMapping(client, root, indexName, typeName, merge);
-			}
-
 		}
 		logger.info("start done. Rock & roll!");
 	}
@@ -166,13 +157,6 @@ public static void start(Client client, String root) throws Exception {
 		for (String indexName : indexNames) {
 			createIndex(client, root, indexName, force);
 			updateSettings(client, root, indexName);
-
-			// create types
-			List<String> types = TypeFinder.findTypes(root, indexName);
-			for (String typeName : types) {
-				createMapping(client, root, indexName, typeName, merge);
-			}
-
 		}
 		logger.info("start done. Rock & roll!");
 	}