JAMES-3492

README.adoc

@@ -165,7 +165,7 @@ You need a running *s3* compatible objectstorage in docker. To achieve this run:
 
 You need a running *ElasticSearch* in docker. To achieve this run:
 
-    $ docker run -d --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:6.3.2
+    $ docker run -d --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:7.10.2
 
 If you want to handle attachment text extraction before indexing in ElasticSearch (this makes attachments searchable)
 and if you want to use all the JMAP search capabilities, you also need to start *Tika*.
@@ -237,7 +237,7 @@ You need a running *cassandra* in docker. To achieve this run:
 
 You need a running *ElasticSearch* in docker. To achieve this run:
 
-    $ docker run -d --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:6.3.2
+    $ docker run -d --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:7.10.2
 
 If you want to handle attachment text extraction before indexing in ElasticSearch (this makes attachments searchable)
 and if you want to use all the JMAP search capabilities, you also need to start *Tika*.

backends-common/cassandra/pom.xml

@@ -84,7 +84,7 @@
             <artifactId>commons-beanutils</artifactId>
             <scope>test</scope>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
         </dependency>

backends-common/elasticsearch-v7/src/main/java/org/apache/james/backends/es/v7/IndexCreationFactory.java

@@ -23,14 +23,15 @@
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 
 import java.io.IOException;
+import java.util.Optional;
 
 import javax.inject.Inject;
 
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
-import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.indices.CreateIndexRequest;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,7 +64,11 @@ public AliasSpecificationStep addAlias(AliasName aliasName) {
         }
 
         public ReactorElasticSearchClient createIndexAndAliases(ReactorElasticSearchClient client) {
-            return new IndexCreationPerformer(nbShards, nbReplica, waitForActiveShards, indexName, aliases.build()).createIndexAndAliases(client);
+            return new IndexCreationPerformer(nbShards, nbReplica, waitForActiveShards, indexName, aliases.build()).createIndexAndAliases(client, Optional.empty());
+        }
+
+        public ReactorElasticSearchClient createIndexAndAliases(ReactorElasticSearchClient client, XContentBuilder mappingContent) {
+            return new IndexCreationPerformer(nbShards, nbReplica, waitForActiveShards, indexName, aliases.build()).createIndexAndAliases(client, Optional.of(mappingContent));
         }
     }
 
@@ -82,10 +87,10 @@ public IndexCreationPerformer(int nbShards, int nbReplica, int waitForActiveShar
             this.aliases = aliases;
         }
 
-        public ReactorElasticSearchClient createIndexAndAliases(ReactorElasticSearchClient client) {
+        public ReactorElasticSearchClient createIndexAndAliases(ReactorElasticSearchClient client, Optional<XContentBuilder> mappingContent) {
             Preconditions.checkNotNull(indexName);
             try {
-                createIndexIfNeeded(client, indexName, generateSetting(nbShards, nbReplica, waitForActiveShards));
+                createIndexIfNeeded(client, indexName, generateSetting(nbShards, nbReplica, waitForActiveShards), mappingContent);
                 aliases.forEach(Throwing.<AliasName>consumer(alias -> createAliasIfNeeded(client, indexName, alias))
                     .sneakyThrow());
             } catch (IOException e) {
@@ -111,12 +116,13 @@ private boolean aliasExist(ReactorElasticSearchClient client, AliasName aliasNam
                 .existsAlias(new GetAliasesRequest().aliases(aliasName.getValue()), RequestOptions.DEFAULT);
         }
 
-        private void createIndexIfNeeded(ReactorElasticSearchClient client, IndexName indexName, XContentBuilder settings) throws IOException {
+        private void createIndexIfNeeded(ReactorElasticSearchClient client, IndexName indexName, XContentBuilder settings, Optional<XContentBuilder> mappingContent) throws IOException {
             try {
-                client.indices()
-                    .create(
-                        new CreateIndexRequest(indexName.getValue())
-                            .source(settings), RequestOptions.DEFAULT);
+                CreateIndexRequest request = new CreateIndexRequest(indexName.getValue()).source(settings);
+                mappingContent.ifPresent(request::mapping);
+                client.indices().create(
+                    request,
+                    RequestOptions.DEFAULT);
             } catch (ElasticsearchStatusException exception) {
                 if (exception.getMessage().contains(INDEX_ALREADY_EXISTS_EXCEPTION_MESSAGE)) {
                     LOGGER.info("Index [{}] already exists", indexName.getValue());
@@ -185,6 +191,22 @@ private XContentBuilder generateSetting(int nbShards, int nbReplica, int waitFor
     public static final String KEEP_MAIL_AND_URL = "keep_mail_and_url";
     public static final String SNOWBALL_KEEP_MAIL_AND_URL = "snowball_keep_mail_and_token";
     public static final String ENGLISH_SNOWBALL = "english_snowball";
+    public static final String BOOLEAN = "boolean";
+    public static final String TYPE = "type";
+    public static final String LONG = "long";
+    public static final String DOUBLE = "double";
+    public static final String KEYWORD = "keyword";
+    public static final String PROPERTIES = "properties";
+    public static final String ROUTING = "_routing";
+    public static final String REQUIRED = "required";
+    public static final String DATE = "date";
+    public static final String FORMAT = "format";
+    public static final String NESTED = "nested";
+    public static final String FIELDS = "fields";
+    public static final String RAW = "raw";
+    public static final String ANALYZER = "analyzer";
+    public static final String NORMALIZER = "normalizer";
+    public static final String SEARCH_ANALYZER = "search_analyzer";
 
     @Inject
     public IndexCreationFactory(ElasticSearchConfiguration configuration) {