DATAES-770 - Release version 3.2.7 (Moore SR7).

Original PR: #429

(cherry picked from commit 539c1ee6e7)

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,110 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL =
-            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: : " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

.travis.yml

@@ -1,22 +1,8 @@
+dist: xenial
+
 language: java
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
-before_install:
-  - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.deb && sudo dpkg -i --force-confnew elasticsearch-${ES_VERSION}.deb && sudo service elasticsearch restart
-  - sleep 10
-
-env:
-  global:
-  - ES_VERSION=6.5.1
-
-addons:
-  apt:
-    packages:
-    - oracle-java8-set-default
-    - oracle-java8-installer
-
-sudo: true
-
-script: "mvn clean dependency:list test -Dsort"
+script: "mvn clean dependency:list test -Dsort -U -B"

CI.adoc

@@ -0,0 +1,43 @@
+= Continuous Integration
+
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmaster&subject=Moore%20(master)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F3.1.x&subject=Lovelace%20(3.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F2.1.x&subject=Ingalls%20(2.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
+
+== Running CI tasks locally
+
+Since this pipeline is purely Docker-based, it's easy to:
+
+* Debug what went wrong on your local machine.
+* Test out a a tweak to your `test.sh` script before sending it out.
+* Experiment against a new image before submitting your pull request.
+
+All of these use cases are great reasons to essentially run what the CI server does on your local machine.
+
+IMPORTANT: To do this you must have Docker installed on your machine.
+
+1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-elasticsearch-github adoptopenjdk/openjdk8:latest /bin/bash`
++
+This will launch the Docker image and mount your source code at `spring-data-elasticsearch-github`.
++
+2. `cd spring-data-elasticsearch-github`
++
+Next, run your tests from inside the container:
++
+3. `./mvnw clean dependency:list test -Dsort` (or whatever profile you need to test out)
+
+Since the container is binding to your source, you can make edits from your IDE and continue to run build jobs.
+
+If you need to package things up, do this:
+
+1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-elasticsearch-github adoptopenjdk/openjdk8:latest /bin/bash`
++
+This will launch the Docker image and mount your source code at `spring-data-elasticsearch-github`.
++
+2. `cd spring-data-elasticsearch-github`
++
+Next, try to package everything up from inside the container:
++
+3. `./mvnw -Pci,snapshot -Dmaven.test.skip=true clean package`
+
+NOTE: Docker containers can eat up disk space fast! From time to time, run `docker system prune` to clean out old images.

Jenkinsfile

@@ -0,0 +1,114 @@
+pipeline {
+	agent none
+
+	triggers {
+		pollSCM 'H/10 * * * *'
+		upstream(upstreamProjects: "spring-data-commons/2.2.x", threshold: hudson.model.Result.SUCCESS)
+	}
+
+	options {
+		disableConcurrentBuilds()
+		buildDiscarder(logRotator(numToKeepStr: '14'))
+	}
+
+	stages {
+		stage("Test") {
+			when {
+				anyOf {
+					branch '3.2.x'
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			parallel {
+				stage("test: baseline") {
+					agent {
+						docker {
+							image 'adoptopenjdk/openjdk8:latest'
+							label 'data'
+							args '-v $HOME:/tmp/jenkins-home'
+						}
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					steps {
+						sh 'rm -rf ?'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B'
+					}
+				}
+			}
+		}
+		stage('Release to artifactory') {
+			when {
+				anyOf {
+					branch '3.2.x'
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			agent {
+				docker {
+					image 'adoptopenjdk/openjdk8:latest'
+					label 'data'
+					args '-v $HOME:/tmp/jenkins-home'
+				}
+			}
+			options { timeout(time: 20, unit: 'MINUTES') }
+
+			environment {
+				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+			}
+
+			steps {
+				sh 'rm -rf ?'
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
+						'-Dartifactory.server=https://repo.spring.io ' +
+						"-Dartifactory.username=${ARTIFACTORY_USR} " +
+						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+						"-Dartifactory.staging-repository=libs-snapshot-local " +
+						"-Dartifactory.build-name=spring-data-elasticsearch " +
+						"-Dartifactory.build-number=${BUILD_NUMBER} " +
+						'-Dmaven.test.skip=true clean deploy -U -B'
+			}
+		}
+		stage('Publish documentation') {
+			when {
+				branch '3.2.x'
+			}
+			agent {
+				docker {
+					image 'adoptopenjdk/openjdk8:latest'
+					label 'data'
+					args '-v $HOME:/tmp/jenkins-home'
+				}
+			}
+			options { timeout(time: 20, unit: 'MINUTES') }
+
+			environment {
+				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+			}
+
+			steps {
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
+						'-Dartifactory.server=https://repo.spring.io ' +
+						"-Dartifactory.username=${ARTIFACTORY_USR} " +
+						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+						"-Dartifactory.distribution-repository=temp-private-local " +
+						'-Dmaven.test.skip=true clean deploy -U -B'
+			}
+		}
+	}
+
+	post {
+		changed {
+			script {
+				slackSend(
+						color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger',
+						channel: '#spring-data-dev',
+						message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}")
+				emailext(
+						subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}",
+						mimeType: 'text/html',
+						recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']],
+						body: "<a href=\"${env.BUILD_URL}\">${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}</a>")
+			}
+		}
+	}
+}

README.adoc

@@ -0,0 +1,212 @@
+image:https://spring.io/badges/spring-data-elasticsearch/ga.svg[Spring Data Elasticsearch,link=https://projects.spring.io/spring-data-elasticsearch#quick-start] image:https://spring.io/badges/spring-data-elasticsearch/snapshot.svg[Spring Data Elasticsearch,link=https://projects.spring.io/spring-data-elasticsearch#quick-start]
+
+= Spring Data for Elasticsearch image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmaster&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]]
+
+The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
+
+The Spring Data Elasticsearch project provides integration with the https://www.elastic.co/[Elasticsearch] search engine. Key functional areas of Spring Data Elasticsearch are a POJO centric model for interacting with a Elasticsearch Documents and easily writing a Repository style data access layer.
+
+This project is lead and maintained by the community.
+
+== Features
+
+* Spring configuration support using Java based `@Configuration` classes or an XML namespace for a ES clients instances.
+* `ElasticsearchTemplate` helper class that increases productivity performing common ES operations. Includes integrated object mapping between documents and POJOs.
+* Feature Rich Object Mapping integrated with Spring’s Conversion Service
+* Annotation based mapping metadata but extensible to support other metadata formats
+* Automatic implementation of `Repository` interfaces including support for custom finder methods.
+* CDI support for repositories
+
+== Code of Conduct
+
+This project is governed by the link:CODE_OF_CONDUCT.adoc[Spring Code of Conduct]. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+
+== Getting Started
+
+Here is a quick teaser of an application using Spring Data Repositories in Java:
+
+[source,java]
+----
+public interface PersonRepository extends CrudRepository<Person, Long> {
+
+  List<Person> findByLastname(String lastname);
+
+  List<Person> findByFirstnameLike(String firstname);
+}
+
+@Service
+public class MyService {
+
+  private final PersonRepository repository;
+
+  public MyService(PersonRepository repository) {
+    this.repository = repository;
+  }
+
+  public void doWork() {
+
+    repository.deleteAll();
+
+    Person person = new Person();
+    person.setFirstname("Oliver");
+    person.setLastname("Gierke");
+    repository.save(person);
+
+    List<Person> lastNameResults = repository.findByLastname("Gierke");
+    List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");
+ }
+}
+----
+
+Using Node Client
+
+[source,xml]
+----
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <elasticsearch:node-client id="client" local="true"/>
+
+    <bean name="elasticsearchTemplate" class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
+        <constructor-arg name="client" ref="client"/>
+    </bean>
+
+</beans>
+----
+
+Using Transport Client
+
+[source,xml]
+----
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <elasticsearch:repositories base-package="com.xyz.acme"/>
+
+    <elasticsearch:transport-client id="client" cluster-nodes="ip:9300,ip:9300" cluster-name="elasticsearch" />
+
+    <bean name="elasticsearchTemplate" class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
+        <constructor-arg name="client" ref="client"/>
+    </bean>
+
+</beans>
+----
+
+=== Maven configuration
+
+Add the Maven dependency:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-elasticsearch</artifactId>
+  <version>${version}.RELEASE</version>
+</dependency>
+----
+
+// NOTE: since Github does not support include directives, the content of
+// the src/main/asciidoc/reference/preface.adoc file is duplicated here
+// Always change both files!
+**Compatibility Matrix**
+
+The compatibility between Spring Data Elasticsearch, Elasticsearch client drivers and Spring Boot versions can be found in the https://docs.spring.io/spring-data/elasticsearch/docs/3.2.0.RC3/reference/html/#preface.versions[reference documentation].
+
+To use the Release candidate versions of the upcoming major version, use our Maven milestone repository and declare the appropriate dependency version:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-elasticsearch</artifactId>
+  <version>${version}.RCx</version> <!-- x being 1, 2, ... -->
+</dependency>
+
+<repository>
+  <id>spring-libs-snapshot</id>
+  <name>Spring Snapshot Repository</name>
+  <url>https://repo.spring.io/libs-milestone</url>
+</repository>
+----
+
+If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.springframework.data</groupId>
+  <artifactId>spring-data-elasticsearch</artifactId>
+  <version>${version}.BUILD-SNAPSHOT</version>
+</dependency>
+
+<repository>
+  <id>spring-libs-snapshot</id>
+  <name>Spring Snapshot Repository</name>
+  <url>https://repo.spring.io/libs-snapshot</url>
+</repository>
+----
+
+== Getting Help
+
+Having trouble with Spring Data? We’d love to help!
+
+* Check the
+https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/[reference documentation], and https://docs.spring.io/spring-data/elasticsearch/docs/current/api/[Javadocs].
+* Learn the Spring basics – Spring Data builds on Spring Framework, check the https://spring.io[spring.io] web-site for a wealth of reference documentation.
+If you are just starting out with Spring, try one of the https://spring.io/guides[guides].
+* If you are upgrading, check out the https://docs.spring.io/spring-data/elasticsearch/docs/current/changelog.txt[changelog] for "`new and noteworthy`" features.
+* Ask a question - we monitor https://stackoverflow.com[stackoverflow.com] for questions tagged with https://stackoverflow.com/tags/spring-data[`spring-data-elasticsearch`].
+You can also chat with the community on https://gitter.im/spring-projects/spring-data[Gitter].
+* Report bugs with Spring Data for Elasticsearch at https://jira.spring.io/browse/DATAES[jira.spring.io/browse/DATAES].
+
+== Reporting Issues
+
+Spring Data uses JIRA as issue tracking system to record bugs and feature requests. If you want to raise an issue, please follow the recommendations below:
+
+* Before you log a bug, please search the
+https://jira.spring.io/browse/DATAES[issue tracker] to see if someone has already reported the problem.
+* If the issue doesn’t already exist, https://jira.spring.io/browse/DATAES[create a new issue].
+* Please provide as much information as possible with the issue report, we like to know the version of Spring Data that you are using and JVM version.
+* If you need to paste code, or include a stack trace use JIRA `{code}…{code}` escapes before and after your text.
+* If possible try to create a test-case or project that replicates the issue. Attach a link to your code or a compressed file containing your code.
+
+== Building from Source
+
+You don’t need to build from source to use Spring Data (binaries in https://repo.spring.io[repo.spring.io]), but if you want to try out the latest and greatest, Spring Data can be easily built with the https://github.com/takari/maven-wrapper[maven wrapper].
+You also need JDK 1.8.
+
+[source,bash]
+----
+ $ ./mvnw clean install
+----
+
+If you want to build with the regular `mvn` command, you will need https://maven.apache.org/run-maven/index.html[Maven v3.5.0 or above].
+
+_Also see link:CONTRIBUTING.adoc[CONTRIBUTING.adoc] if you wish to submit pull requests, and in particular please sign the https://cla.pivotal.io/sign/spring[Contributor’s Agreement] before your first non-trivial change._
+
+=== Building reference documentation
+
+Building the documentation builds also the project without running tests.
+
+[source,bash]
+----
+ $ ./mvnw clean install -Pdistribute
+----
+
+The generated documentation is available from `target/site/reference/html/index.html`.
+
+== Examples
+
+For examples on using the Spring Data for Elasticsearch, see the https://github.com/spring-projects/spring-data-examples/tree/master/elasticsearch/example[spring-data-examples] project.
+
+== License
+
+Spring Data for Elasticsearch Open Source software released under the https://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].

README.md

@@ -1,324 +0,0 @@
-Spring Data Elasticsearch
-=========================
-
-Spring Data implementation for ElasticSearch
-
-Spring Data makes it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services as well as provide improved support for relational database technologies.
-
-The Spring Data Elasticsearch project provides integration with the [elasticsearch](https://www.elastic.co/) search engine.
-
-Guide
-------------
-
-* [Reference Documentation](https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/)
-* [API Documentation](https://docs.spring.io/spring-data/elasticsearch/docs/current/api/)
-* [Spring Data Project](https://projects.spring.io/spring-data)
-* [Sample Test Application](https://github.com/BioMedCentralLtd/spring-data-elasticsearch-sample-application)
-* [Issues](https://jira.springsource.org/browse/DATAES)
-* [Spring Data Elasticsearch Google Group](https://groups.google.com/d/forum/spring-data-elasticsearch-devs)
-* [Questions](https://stackoverflow.com/questions/tagged/spring-data-elasticsearch)
-
-
-Quick Start
------------
-Wiki page for [Getting Started](https://github.com/spring-projects/spring-data-elasticsearch/wiki/How-to-start-with-spring-data-elasticsearch)
-
-### Maven configuration
-
-Add the Maven dependency:
-
-```xml
-<dependency>
-    <groupId>org.springframework.data</groupId>
-    <artifactId>spring-data-elasticsearch</artifactId>
-    <version>x.y.z.RELEASE</version>
-</dependency>
-```
-
-If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare
-the appropriate dependency version.
-
-```xml
-<dependency>
-  <groupId>org.springframework.data</groupId>
-  <artifactId>spring-data-elasticsearch</artifactId>
-  <version>x.y.z.BUILD-SNAPSHOT</version>
-</dependency>
-
-<repository>
-  <id>spring-libs-snapshot</id>
-  <name>Spring Snapshot Repository</name>
-  <url>https://repo.spring.io/libs-snapshot</url>
-</repository>
-```
-
-| spring data elasticsearch | elasticsearch |
-|:-------------------------:|:-------------:|
-| 3.2.x                     | 6.5.0         |
-| 3.1.x                     | 6.2.2         |
-| 3.0.x                     | 5.5.0         |
-| 2.1.x                     | 2.4.0         |
-| 2.0.x                     | 2.2.0         |
-| 1.3.x                     | 1.5.2         |
-
-
-### ElasticsearchRepository
-A default implementation of ElasticsearchRepository, aligning to the generic Repository Interfaces, is provided. Spring can do the Repository implementation for you depending on method names in the interface definition.
-
-The ElasticsearchCrudRepository extends PagingAndSortingRepository
-
-```java
-    public interface ElasticsearchCrudRepository<T, ID extends Serializable> extends ElasticsearchRepository<T, ID>, PagingAndSortingRepository<T, ID> {
-    }
-```
-
-Extending ElasticsearchRepository for custom methods
-
-```java
-    public interface BookRepository extends Repository<Book, String> {
-
-        List<Book> findByNameAndPrice(String name, Integer price);
-
-        List<Book> findByNameOrPrice(String name, Integer price);
-        
-        Page<Book> findByName(String name,Pageable page);
-
-        Page<Book> findByNameNot(String name,Pageable page);
-
-        Page<Book> findByPriceBetween(int price,Pageable page);
-
-        Page<Book> findByNameLike(String name,Pageable page);
-
-        @Query("{\"bool\" : {\"must\" : {\"term\" : {\"message\" : \"?0\"}}}}")
-        Page<Book> findByMessage(String message, Pageable pageable);
-    }
-```
-Indexing a single document with Repository
-
-```java
-        @Autowired
-        private SampleElasticsearchRepository repository;
-
-        String documentId = "123456";
-        SampleEntity sampleEntity = new SampleEntity();
-        sampleEntity.setId(documentId);
-        sampleEntity.setMessage("some message");
-
-        repository.save(sampleEntity);
-```
-
-Indexing multiple Document(bulk index) using Repository
-
-```java
-        @Autowired
-        private SampleElasticsearchRepository repository;
-
-        String documentId = "123456";
-        SampleEntity sampleEntity1 = new SampleEntity();
-        sampleEntity1.setId(documentId);
-        sampleEntity1.setMessage("some message");
-
-        String documentId2 = "123457"
-        SampleEntity sampleEntity2 = new SampleEntity();
-        sampleEntity2.setId(documentId2);
-        sampleEntity2.setMessage("test message");
-
-        List<SampleEntity> sampleEntities = Arrays.asList(sampleEntity1, sampleEntity2);
-
-        //bulk index
-        repository.save(sampleEntities);
-```
-
-
-### ElasticsearchTemplate
-
-ElasticsearchTemplate is the central support class for elasticsearch operations.
-
-Indexing a single document using Elasticsearch Template
-
-```java
-        String documentId = "123456";
-        SampleEntity sampleEntity = new SampleEntity();
-        sampleEntity.setId(documentId);
-        sampleEntity.setMessage("some message");
-        IndexQuery indexQuery = new IndexQueryBuilder().withId(sampleEntity.getId()).withObject(sampleEntity).build();
-        elasticsearchTemplate.index(indexQuery);
-```
-
-Indexing multiple Document(bulk index) using Elasticsearch Template
-
-```java
-        @Autowired
-        private ElasticsearchTemplate elasticsearchTemplate;
-
-        List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
-        //first document
-        String documentId = "123456";
-        SampleEntity sampleEntity1 = new SampleEntity();
-        sampleEntity1.setId(documentId);
-        sampleEntity1.setMessage("some message");
-
-        IndexQuery indexQuery1 = new IndexQueryBuilder().withId(sampleEntity1.getId()).withObject(sampleEntity1).build();
-        indexQueries.add(indexQuery1);
-
-        //second document
-        String documentId2 = "123457";
-        SampleEntity sampleEntity2 = new SampleEntity();
-        sampleEntity2.setId(documentId2);
-        sampleEntity2.setMessage("some message");
-
-        IndexQuery indexQuery2 = new IndexQueryBuilder().withId(sampleEntity2.getId()).withObject(sampleEntity2).build()
-        indexQueries.add(indexQuery2);
-
-        //bulk index
-        elasticsearchTemplate.bulkIndex(indexQueries);
-```
-
-Searching entities using Elasticsearch Template
-
-```java
-        @Autowired
-        private ElasticsearchTemplate elasticsearchTemplate;
-
-        SearchQuery searchQuery = new NativeSearchQueryBuilder()
-        .withQuery(queryString(documentId).field("id"))
-        .build();
-        Page<SampleEntity> sampleEntities = elasticsearchTemplate.queryForPage(searchQuery,SampleEntity.class);
-```
-
-### Reactive Elasticsearch
-
-The `ReactiveElasticsearchClient` is a non official driver based on `WebClient`.
-It uses the request/response objects provided by the Elasticsearch core project.
-
-```java
-@Configuration
-public class Config {
-
-  @Bean
-  ReactiveElasticsearchClient client() {
-
-    ClientConfiguration clientConfiguration = ClientConfiguration.builder()
-      .connectedTo("localhost:9200", "localhost:9291")
-      .build();
-
-    return ReactiveRestClients.create(clientConfiguration);
-  }
-}
-
-// ...
-
-Mono<IndexResponse> response = client.index(request ->
-
-  request.index("spring-data")
-    .type("elasticsearch")
-    .id(randomID())
-    .source(singletonMap("feature", "reactive-client"))
-    .setRefreshPolicy(IMMEDIATE)
-);
-```
-
-The reactive client response, especially for search operations, is bound to the `from` (offset) & `size` (limit) options of the request.
-
-`ReactiveElasticsearchOperations` is the gateway to executing high level commands against an Elasticsearch cluster using the `ReactiveElasticsearchClient`.
-The easiest way of setting up the `ReactiveElasticsearchTemplate` is via `AbstractReactiveElasticsearchConfiguration`.
-
-```java
-@Configuration
-public class Config extends AbstractReactiveElasticsearchConfiguration {
-
-    @Bean
-    @Override
-    public ReactiveElasticsearchClient reactiveElasticsearchClient() {
-        // ...
-    }
-}
-```
-
-If needed the `ReactiveElasticsearchTemplate` can be configured with default `RefreshPolicy` and `IndicesOptions` that get applied to the related requests by overriding the defaults of `refreshPolicy()` and `indicesOptions()`.
-
-```java
-template.save(new Person("Bruce Banner", 42))
-    .doOnNext(System.out::println)
-    .flatMap(person -> template.findById(person.id, Person.class))
-    .doOnNext(System.out::println)
-    .flatMap(person -> template.delete(person))
-    .doOnNext(System.out::println)
-    .flatMap(id -> template.count(Person.class))
-    .doOnNext(System.out::println)
-    .subscribe();
-```
-
-The above outputs the following sequence on the console.
-
-```bash
-> Person(id=QjWCWWcBXiLAnp77ksfR, name=Bruce Banner, age=42)
-> Person(id=QjWCWWcBXiLAnp77ksfR, name=Bruce Banner, age=42)
-> QjWCWWcBXiLAnp77ksfR
-> 0
-```
-
-### XML Namespace
-
-You can set up repository scanning via xml configuration, which will happily create your repositories.
-
-Using Node Client
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
-       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <elasticsearch:node-client id="client" local="true"/>
-
-    <bean name="elasticsearchTemplate" class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
-        <constructor-arg name="client" ref="client"/>
-    </bean>
-
-</beans>
-```
-
-Using Transport Client
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
-       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <elasticsearch:repositories base-package="com.xyz.acme"/>
-
-    <elasticsearch:transport-client id="client" cluster-nodes="ip:9300,ip:9300" cluster-name="elasticsearch" />
-
-    <bean name="elasticsearchTemplate" class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
-        <constructor-arg name="client" ref="client"/>
-    </bean>
-
-</beans>
-```
-
-## Help Pages
-
-* [Geo distance and location search](https://github.com/spring-projects/spring-data-elasticsearch/wiki/Geo-indexing-and-request)
-* [Custom object mapper](https://github.com/spring-projects/spring-data-elasticsearch/wiki/Custom-ObjectMapper)
-
-## Contributing to Spring Data
-
-Here are some ways for you to get involved in the community:
-
-* Get involved with the Spring community on Stack OverFlow.  Please help out on the [forum](https://stackoverflow.com/questions/tagged/spring-data-elasticsearch) by responding to questions and joining the debate.
-* Create [JIRA](https://jira.spring.io/browse/DATAES/) tickets for bugs and new features and comment and vote on the ones that you are interested in.  
-* Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](https://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing.
-* Watch for upcoming articles on Spring by [subscribing](https://www.springsource.org/node/feed) to springframework.org
-
-Before we accept a non-trivial patch or pull request we will need you to [sign the Contributor License Agreement](https://cla.pivotal.io/sign/spring). Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. If you forget to do so, you'll be reminded when you submit a pull request. Active contributors might be asked to join the core team, and given the ability to merge pull requests.
-
-
-Code formatting for [Eclipse and Intellij](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide)
-
-[More information about contributing to Spring Data](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc)

SECURITY.adoc

@@ -0,0 +1,9 @@
+# Security Policy
+
+## Supported Versions
+
+Please see the https://spring.io/projects/spring-data-elasticsearch[Spring Data Elasticsearch] project page for supported versions.
+
+## Reporting a Vulnerability
+
+Please don't raise security vulnerabilities here. Head over to https://pivotal.io/security to learn how to disclose them responsibly.

ci/build.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env sh
-
-set -euo pipefail
-
-[[ -d $PWD/maven && ! -d $HOME/.m2 ]] && ln -s $PWD/maven $HOME/.m2
-
-spring_data_elasticsearch_artifactory=$(pwd)/spring-data-elasticsearch-artifactory
-
-rm -rf $HOME/.m2/repository/org/springframework/data 2> /dev/null || :
-
-cd spring-data-elasticsearch-github
-
-./mvnw deploy \
-    -Dmaven.test.skip=true \
-    -DaltDeploymentRepository=distribution::default::file://${spring_data_elasticsearch_artifactory}

ci/build.yml

@@ -1,20 +0,0 @@
----
-platform: linux
-
-image_resource:
-  type: docker-image
-  source:
-    repository: openjdk
-    tag: 8-jdk-alpine
-
-inputs:
-- name: spring-data-elasticsearch-github
-
-outputs:
-- name: spring-data-elasticsearch-artifactory
-
-caches:
-- path: maven
-
-run:
-  path: spring-data-elasticsearch-github/ci/build.sh

ci/test.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env sh
-
-set -euo pipefail
-
-[[ -d $PWD/maven && ! -d $HOME/.m2 ]] && ln -s $PWD/maven $HOME/.m2
-
-rm -rf $HOME/.m2/repository/org/springframework/data 2> /dev/null || :
-
-cd spring-data-elasticsearch-github
-
-./mvnw clean dependency:list test -P${PROFILE} -Dsort

ci/test.yml

@@ -1,20 +0,0 @@
----
-platform: linux
-
-image_resource:
-  type: docker-image
-  source:
-    repository: openjdk
-    tag: 8-jdk-alpine
-
-inputs:
-- name: spring-data-elasticsearch-github
-
-outputs:
-- name: spring-data-elasticsearch-artifactory
-
-caches:
-- path: maven
-
-run:
-  path: spring-data-elasticsearch-github/ci/test.sh

pom.xml

@@ -5,12 +5,12 @@
 
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-elasticsearch</artifactId>
-    <version>3.2.0.M4</version>
+    <version>3.2.7.RELEASE</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.2.0.M4</version>
+		<version>2.2.7.RELEASE</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -19,9 +19,10 @@
 
 	<properties>
 		<commonslang>2.6</commonslang>
-		<elasticsearch>6.7.2</elasticsearch>
+		<elasticsearch>6.8.8</elasticsearch>
 		<log4j>2.9.1</log4j>
-		<springdata.commons>2.2.0.M4</springdata.commons>
+		<springdata.commons>2.2.7.RELEASE</springdata.commons>
+		<netty>4.1.39.Final</netty>
 		<java-module-name>spring.data.elasticsearch</java-module-name>
 	</properties>
 
@@ -72,6 +73,19 @@
 		<url>https://jira.spring.io/browse/DATAES</url>
 	</issueManagement>
 
+	<dependencyManagement>
+
+		<dependencies>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-bom</artifactId>
+				<version>${netty}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 
 		<!-- Spring -->
@@ -234,6 +248,24 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.tomakehurst</groupId>
+			<artifactId>wiremock-jre8</artifactId>
+			<version>2.25.1</version>
+			<scope>test</scope>
+			<exclusions>
+				<!-- these exclusions are needed because of Elasticsearch JarHell-->
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.ow2.asm</groupId>
+					<artifactId>asm</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 		<!-- Upgrade xbean to 4.5 to prevent incompatibilities due to ASM versions -->
 		<dependency>
 			<groupId>org.apache.xbean</groupId>
@@ -244,8 +276,8 @@
 
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>3.0-alpha-1</version>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -253,18 +285,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>wagon-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.asciidoctor</groupId>
-				<artifactId>asciidoctor-maven-plugin</artifactId>
-			</plugin>
 			<!--
 			please do not remove this configuration for surefire - we need that to avoid issue with jar hell
 			-->
@@ -276,34 +296,60 @@
 					<useFile>false</useFile>
 					<includes>
 						<include>**/*Tests.java</include>
+						<include>**/*Test.java</include>
 					</includes>
 					<systemPropertyVariables>
 						<es.set.netty.runtime.available.processors>false</es.set.netty.runtime.available.processors>
 					</systemPropertyVariables>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.asciidoctor</groupId>
+				<artifactId>asciidoctor-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 
 	<profiles>
 		<profile>
-			<id>release</id>
+
+			<id>ci</id>
+
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.jfrog.buildinfo</groupId>
-						<artifactId>artifactory-maven-plugin</artifactId>
-						<inherited>false</inherited>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-checkstyle-plugin</artifactId>
+						<configuration>
+							<checkstyleRules>
+								<module name="Checker">
+
+									<!-- Configure checker to use UTF-8 encoding -->
+									<property name="charset" value="UTF-8"/>
+
+									<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck"/>
+								</module>
+							</checkstyleRules>
+							<includes>**/*</includes>
+							<excludes>.git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy</excludes>
+							<sourceDirectories>./</sourceDirectories>
+						</configuration>
 					</plugin>
 				</plugins>
 			</build>
+
 		</profile>
+
 	</profiles>
 
 	<repositories>
 		<repository>
-			<id>spring-libs-milestone</id>
-			<url>https://repo.spring.io/libs-milestone</url>
+			<id>spring-libs-release</id>
+			<url>https://repo.spring.io/libs-release</url>
 		</repository>
 	</repositories>
 

src/main/asciidoc/index.adoc

@@ -1,15 +1,7 @@
 = Spring Data Elasticsearch - Reference Documentation
-BioMed Central Development Team; Oliver Drotbohm; Greg Turnquist; Christoph Strobl;
+BioMed Central Development Team; Oliver Drotbohm; Greg Turnquist; Christoph Strobl; Peter-Josef Meisch
 :revnumber: {version}
 :revdate: {localdate}
-:toc:
-:toc-placement!:
-:linkcss:
-:doctype: book
-:docinfo: shared
-:source-highlighter: prettify
-:icons: font
-:imagesdir: images
 ifdef::backend-epub3[:front-cover-image: image:epub-cover.png[Front Cover,1050,1600]]
 :spring-data-commons-docs: ../../../../spring-data-commons/src/main/asciidoc
 
@@ -30,9 +22,8 @@ include::{spring-data-commons-docs}/repositories.adoc[]
 :leveloffset: +1
 include::reference/elasticsearch-clients.adoc[]
 include::reference/elasticsearch-object-mapping.adoc[]
-include::reference/data-elasticsearch.adoc[]
-include::reference/reactive-elasticsearch-operations.adoc[]
-include::reference/reactive-elasticsearch-repositories.adoc[]
+include::reference/elasticsearch-operations.adoc[]
+include::reference/elasticsearch-repositories.adoc[]
 include::reference/elasticsearch-misc.adoc[]
 :leveloffset: -1
 

src/main/asciidoc/preface.adoc

@@ -1,20 +1,44 @@
+[[preface]]
 = Preface
 
-The Spring Data Elasticsearch project applies core Spring concepts to the development of solutions using the Elasticsearch Search Engine. We have povided a "template" as a high-level abstraction for storing,querying,sorting and faceting documents. You will notice similarities to the Spring data solr and mongodb support in the Spring Framework.
+The Spring Data Elasticsearch project applies core Spring concepts to the development of solutions using the Elasticsearch Search Engine. It provides:
 
-[[project]]
-[preface]
+* _Templates_ as a high-level abstraction for storing, querying, sorting and faceting documents.
+* _Repositories_ which for example enable the user to express queries by defining interfaces having customized method names (for basic information about repositories see <<repositories>>).
+
+You will notice similarities to the Spring data solr and mongodb support in the Spring Framework.
+
+include::reference/elasticsearch-new.adoc[leveloffset=+1]
+
+[[preface.metadata]]
 == Project Metadata
 
 * Version Control - https://github.com/spring-projects/spring-data-elasticsearch
+* API Documentation - https://docs.spring.io/spring-data/elasticsearch/docs/current/api/
 * Bugtracker - https://jira.spring.io/browse/DATAES
 * Release repository - https://repo.spring.io/libs-release
 * Milestone repository - https://repo.spring.io/libs-milestone
 * Snapshot repository - https://repo.spring.io/libs-snapshot
 
-[[requirements]]
-[preface]
+[[preface.requirements]]
 == Requirements
 
-Requires https://www.elastic.co/downloads/elasticsearch[Elasticsearch] 0.20.2 and above or optional dependency or not even that if you are using Embedded Node Client
+Requires an installation of https://www.elastic.co/products/elasticsearch[Elasticsearch].
 
+[[preface.versions]]
+=== Versions
+// NOTE: since Github does not support include directives, the content of
+// this file is duplicated in the toplevel README
+// Always change both files!
+
+The following table shows the Elasticsearch versions that are used by Spring Data release trains and version of Spring Data Elasticsearch included in that, as well as the Spring Boot versions refering to that particular Spring Data release train:
+[cols="^,^,^,^",options="header"]
+|===
+|Spring Data Release Train |Spring Data Elasticsearch |Elasticsearch | Spring Boot
+|Moore |3.2.x |6.8.8 |2.2.x
+|Lovelace |3.1.x |6.2.2|2.1.x
+|Kayfootnote:oom[Out of maintenance]|3.0.xfootnote:oom[] |5.5.0 |2.0.xfootnote:oom[]
+|Ingallsfootnote:oom[]|2.1.xfootnote:oom[] |2.4.0 |1.5.xfootnote:oom[]
+|===
+
+Support for upcoming versions of Elasticsearch is being tracked and general compatibility should be given assuming the usage of the <<elasticsearch.clients.rest,high-level REST client>>.

src/main/asciidoc/reference/data-elasticsearch.adoc

@@ -1,288 +0,0 @@
-[[elasticsearch.repositories]]
-= Elasticsearch Repositories
-
-This chapter includes details of the Elasticsearch repository implementation.
-
-[[elasticsearch.introduction]]
-== Introduction
-
-[[elasticsearch.namespace]]
-=== Spring Namespace
-
-The Spring Data Elasticsearch module contains a custom namespace allowing definition of repository beans as well as elements for instantiating a `ElasticsearchServer` .
-
-Using the `repositories` element looks up Spring Data repositories as described in <<repositories.create-instances>> .
-
-.Setting up Elasticsearch repositories using Namespace
-====
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
-xsi:schemaLocation="http://www.springframework.org/schema/beans
-https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-http://www.springframework.org/schema/data/elasticsearch
-https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd">
-
-    <elasticsearch:repositories base-package="com.acme.repositories" />
-    
-</beans>
-----
-====
-
-Using the `Transport Client` or `Node Client` element registers an instance of `Elasticsearch Server` in the context. 
-
-.Transport Client using Namespace
-====
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
-xsi:schemaLocation="http://www.springframework.org/schema/beans
-https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-http://www.springframework.org/schema/data/elasticsearch
-https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd">
-
-    <elasticsearch:transport-client id="client" cluster-nodes="localhost:9300,someip:9300" />
-    
-</beans> 
-----
-====
-
-.Node Client using Namespace
-====
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
-xsi:schemaLocation="http://www.springframework.org/schema/beans
-https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-http://www.springframework.org/schema/data/elasticsearch
-https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd">
-
-    <elasticsearch:node-client id="client" local="true"" />
-    
-</beans> 
-----
-====
-
-[[elasticsearch.annotation]]
-=== Annotation based configuration
-
-The Spring Data Elasticsearch repositories support cannot only be activated through an XML namespace but also using an annotation through JavaConfig.
-
-.Spring Data Elasticsearch repositories using JavaConfig
-====
-[source,java]
-----
-@Configuration
-@EnableElasticsearchRepositories(basePackages = "org/springframework/data/elasticsearch/repositories")
-static class Config {
-
-    @Bean
-    public ElasticsearchOperations elasticsearchTemplate() {
-        return new ElasticsearchTemplate(nodeBuilder().local(true).node().client());
-    }
-}                
-----
-====
-
-The configuration above sets up an `Embedded Elasticsearch Server` which is used by the `ElasticsearchTemplate` . Spring Data Elasticsearch Repositories are activated using the `@EnableElasticsearchRepositories` annotation, which essentially carries the same attributes as the XML namespace does. If no base package is configured, it will use the one the configuration class resides in.
-
-[[elasticsearch.cdi]]
-=== Elasticsearch Repositores using CDI
-
-The Spring Data Elasticsearch repositories can also be set up using CDI functionality.
-
-.Spring Data Elasticsearch repositories using JavaConfig
-====
-[source,java]
-----
-class ElasticsearchTemplateProducer {
-
-    @Produces
-    @ApplicationScoped
-    public ElasticsearchOperations createElasticsearchTemplate() {
-        return new ElasticsearchTemplate(nodeBuilder().local(true).node().client());
-    }
-}
-
-class ProductService {
-
-    private ProductRepository repository;
-
-    public Page<Product> findAvailableBookByName(String name, Pageable pageable) {
-        return repository.findByAvailableTrueAndNameStartingWith(name, pageable);
-    }
-
-    @Inject
-    public void setRepository(ProductRepository repository) {
-        this.repository = repository;
-    }
-}                
-----
-====
-
-[[elasticsearch.query-methods]]
-== Query methods
-
-[[elasticsearch.query-methods.finders]]
-=== Query lookup strategies
-
-The Elasticsearch module supports all basic query building  feature as String,Abstract,Criteria or have it being derived from the method name.
-
-==== Declared queries
-
-Deriving the query from the method name is not always sufficient and/or may result in unreadable method names. In this case one might make either use of `@Query` annotation (see <<elasticsearch.query-methods.at-query>> ).
-
-[[elasticsearch.query-methods.criterions]]
-=== Query creation
-
-Generally the query creation mechanism for Elasticsearch works as described in <<repositories.query-methods>> . Here's a short example of what a Elasticsearch query method translates into: 
-
-.Query creation from method names
-====
-[source,java]
-----
-public interface BookRepository extends Repository<Book, String>
-{
-    List<Book> findByNameAndPrice(String name, Integer price);
-}                
-----
-====
-
-The method name above will be translated into the following Elasticsearch json query
-
-[source]
-----
-{ "bool" :
-    { "must" :
-        [
-            { "field" : {"name" : "?"} },
-            { "field" : {"price" : "?"} }
-        ] 
-    }
-}                    
-----
-
-A list of supported keywords for Elasticsearch is shown below. 
-
-[cols="1,2,3", options="header"]
-.Supported keywords inside method names
-|===
-| Keyword
-| Sample
-| Elasticsearch Query String| `And`
-| `findByNameAndPrice`
-| `{"bool" : {"must" : [ {"field" : {"name" : "?"}},
-                                        {"field" : {"price" : "?"}} ]}}`
-
-| `Or`
-| `findByNameOrPrice`
-| `{"bool" : {"should" : [ {"field" : {"name" : "?"}},
-                                        {"field" : {"price" : "?"}} ]}}`
-
-| `Is`
-| `findByName`
-| `{"bool" : {"must" : {"field" : {"name" : "?"}}}}`
-
-| `Not`
-| `findByNameNot`
-| `{"bool" : {"must_not" : {"field" : {"name" : "?"}}}}`
-
-| `Between`
-| `findByPriceBetween`
-| `{"bool" : {"must" : {"range" : {"price" : {"from" :
-                                        ?,"to" : ?,"include_lower" : true,"include_upper" : true}}}}}`
-
-| `LessThanEqual`
-| `findByPriceLessThan`
-| `{"bool" : {"must" : {"range" : {"price" : {"from" :
-                                        null,"to" : ?,"include_lower" : true,"include_upper" :
-                                        true}}}}}`
-
-| `GreaterThanEqual`
-| `findByPriceGreaterThan`
-| `{"bool" : {"must" : {"range" : {"price" : {"from" :
-                                        ?,"to" : null,"include_lower" : true,"include_upper" :
-                                        true}}}}}`
-
-| `Before`
-| `findByPriceBefore`
-| `{"bool" : {"must" : {"range" : {"price" : {"from" :
-                                        null,"to" : ?,"include_lower" : true,"include_upper" :
-                                        true}}}}}`
-
-| `After`
-| `findByPriceAfter`
-| `{"bool" : {"must" : {"range" : {"price" : {"from" :
-                                        ?,"to" : null,"include_lower" : true,"include_upper" :
-                                        true}}}}}`
-
-| `Like`
-| `findByNameLike`
-| `{"bool" : {"must" : {"field" : {"name" : {"query" :
-                                        "?*","analyze_wildcard" : true}}}}}`
-
-| `StartingWith`
-| `findByNameStartingWith`
-| `{"bool" : {"must" : {"field" : {"name" : {"query" :
-                                        "?*","analyze_wildcard" : true}}}}}`
-
-| `EndingWith`
-| `findByNameEndingWith`
-| `{"bool" : {"must" : {"field" : {"name" : {"query" :
-                                        "*?","analyze_wildcard" : true}}}}}`
-
-| `Contains/Containing`
-| `findByNameContaining`
-| `{"bool" : {"must" : {"field" : {"name" : {"query" :
-                                        "*?*","analyze_wildcard" : true}}}}}`
-
-| `In`
-| `findByNameIn(Collection<String>names)`
-| `{"bool" : {"must" : {"bool" : {"should" : [ {"field" :
-                                        {"name" : "?"}}, {"field" : {"name" : "?"}} ]}}}}`
-
-| `NotIn`
-| `findByNameNotIn(Collection<String>names)`
-| `{"bool" : {"must_not" : {"bool" : {"should" : {"field" :
-                                        {"name" : "?"}}}}}}`
-
-| `Near`
-| `findByStoreNear`
-| `Not Supported Yet !`
-
-| `True`
-| `findByAvailableTrue`
-| `{"bool" : {"must" : {"field" : {"available" : true}}}}`
-
-| `False`
-| `findByAvailableFalse`
-| `{"bool" : {"must" : {"field" : {"available" : false}}}}`
-
-| `OrderBy`
-| `findByAvailableTrueOrderByNameDesc`
-| `{"sort" : [{ "name" : {"order" : "desc"} }],"bool" :
-                                        {"must" : {"field" : {"available" : true}}}}`
-|===
-
-[[elasticsearch.query-methods.at-query]]
-=== Using @Query Annotation
-
-.Declare query at the method using the `@Query` annotation.
-====
-[source,java]
-----
-public interface BookRepository extends ElasticsearchRepository<Book, String> {
-    @Query("{\"bool\" : {\"must\" : {\"field\" : {\"name\" : \"?0\"}}}}")
-    Page<Book> findByName(String name,Pageable pageable);
-}                
-----
-====

src/main/asciidoc/reference/elasticsearch-clients.adoc

@@ -3,14 +3,50 @@
 
 This chapter illustrates configuration and usage of supported Elasticsearch client implementations.
 
-Spring data Elasticsearch operates upon an Elasticsearch client that is connected to a single Elasticsearch node or a cluster.
+Spring data Elasticsearch operates upon an Elasticsearch client that is connected to a single Elasticsearch node or a cluster. Although the Elasticsearch Client can be used to work with the cluster,  applications using Spring Data Elasticsearch normally use the higher level abstractions of <<elasticsearch.operations>> and <<elasticsearch.repositories>>.
 
-WARNING: The well known `TransportClient` is deprecated as of Elasticsearch 7.0.0 and is expected to be removed in Elasticsearch 8.0.
+[[elasticsearch.clients.transport]]
+== Transport Client
+
+WARNING: The well known `TransportClient` is deprecated as of Elasticsearch 7 and will be removed in Elasticsearch 8. (https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/transport-client.html[see the Elasticsearch documentation]). Spring Data Elasticsearch will support the `TransportClient` as long as it is available in the used
+Elasticsearch <<elasticsearch.versions,version>>.
+
+We strongly recommend to use the <<elasticsearch.clients.rest>> instead of the `TransportClient`.
+
+.Transport Client
+====
+[source,java]
+----
+static class Config {
+
+  @Bean
+  Client client() {
+  	Settings settings = Settings.builder()
+  	  .put("cluster.name", "elasticsearch")   <1>
+      .build();
+  	TransportClient client = new PreBuiltTransportClient(settings);
+    client.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1")
+      , 9300));                               <2>
+    return client;
+  }
+}
+
+// ...
+
+IndexRequest request = new IndexRequest("spring-data", "elasticsearch", randomID())
+ .source(someObject)
+ .setRefreshPolicy(IMMEDIATE);
+
+IndexResponse response = client.index(request);
+----
+<1> The `TransportClient` must be configured with the cluster name.
+<2> The host and port to connect the client to.
+====
 
 [[elasticsearch.clients.rest]]
 == High Level REST Client
 
-The Java High Level REST Client provides a straight forward replacement for the `TransportClient` as it accepts and returns
+The Java High Level REST Client now is the default client of Elasticsearch, it provides a straight forward replacement for the `TransportClient` as it accepts and returns
 the very same request/response objects and therefore depends on the Elasticsearch core project.
 Asynchronous calls are operated upon a client managed thread pool and require a callback to be notified when the request is done.
 
@@ -18,6 +54,7 @@ Asynchronous calls are operated upon a client managed thread pool and require a
 ====
 [source,java]
 ----
+import org.springframework.beans.factory.annotation.Autowired;@Configuration
 static class Config {
 
   @Bean
@@ -27,20 +64,28 @@ static class Config {
       .connectedTo("localhost:9200", "localhost:9201")
       .build();
 
-    return RestClients.create(clientConfiguration).rest(); <2>
+    return RestClients.create(clientConfiguration).rest();                  <2>
   }
 }
 
+// ...
+
+  @Autowired
+  RestHighLevelClient highLevelClient;
+
+  RestClient lowLevelClient = highLevelClient.lowLevelClient();             <3>
+
 // ...
 
 IndexRequest request = new IndexRequest("spring-data", "elasticsearch", randomID())
   .source(singletonMap("feature", "high-level-rest-client"))
   .setRefreshPolicy(IMMEDIATE);
 
-IndexResponse response = client.index(request);
+IndexResponse response = highLevelClient.index(request);
 ----
-<1> Use the builder to provide cluster addresses, set default `HttpHeaders` or enbale SSL.
-<2> Next to the `rest()` client it is also possible to obtain the `lowLevelRest()` client.
+<1> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
+<2> Create the RestHighLevelClient.
+<3> It is also possible to obtain the `lowLevelRest()` client.
 ====
 
 [[elasticsearch.clients.reactive]]
@@ -59,8 +104,15 @@ static class Config {
   @Bean
   ReactiveElasticsearchClient client() {
 
-    ClientConfiguration clientConfiguration = ClientConfiguration.builder() <1>
+    ClientConfiguration clientConfiguration = ClientConfiguration.builder()   <1>
       .connectedTo("localhost:9200", "localhost:9291")
+      .withWebClientConfigurer(webClient -> {                                 <2>
+        ExchangeStrategies exchangeStrategies = ExchangeStrategies.builder()
+            .codecs(configurer -> configurer.defaultCodecs()
+                .maxInMemorySize(-1))
+            .build();
+        return webClient.mutate().exchangeStrategies(exchangeStrategies).build();
+       })
       .build();
 
     return ReactiveRestClients.create(clientConfiguration);
@@ -78,7 +130,8 @@ Mono<IndexResponse> response = client.index(request ->
     .setRefreshPolicy(IMMEDIATE);
 );
 ----
-<1> Use the builder to provide cluster addresses, set default `HttpHeaders` or enbale SSL.
+<1> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
+<2> when configuring a reactive client, the `withWebClientConfigurer` hook can be used to customize the WebClient.
 ====
 
 NOTE: The ReactiveClient response, especially for search operations, is bound to the `from` (offset) & `size` (limit) options of the request.
@@ -92,19 +145,28 @@ Client behaviour can be changed via the `ClientConfiguration` that allows to set
 ====
 [source,java]
 ----
+// optional if Basic Auhtentication is needed
+HttpHeaders defaultHeaders = new HttpHeaders();
+defaultHeaders.setBasicAuth(USER_NAME, USER_PASS);                      <1>
 
 ClientConfiguration clientConfiguration = ClientConfiguration.builder()
-  .connectedTo("localhost:9200", "localhost:9291") <1>
-  .withConnectTimeout(Duration.ofSeconds(5)) <2>
-  .withSocketTimeout(Duration.ofSeconds(3)) <3>
-  .useSsl()
+  .connectedTo("localhost:9200", "localhost:9291")                      <2>
+  .withConnectTimeout(Duration.ofSeconds(5))                            <3>
+  .withSocketTimeout(Duration.ofSeconds(3))                             <4>
+  .useSsl()                                                             <5>
+  .withDefaultHeaders(defaultHeaders)                                   <6>
+  .withBasicAuth(username, password)                                    <7>
   . // ... other options
   .build();
 
 ----
-<1> Use the builder to provide cluster addresses, set default `HttpHeaders` or enbale SSL.
-<2> Set the connection timeout. Default is 10 sec.
-<3> Set the socket timeout. Default is 5 sec.
+<1> Define default headers, if they need to be customized
+<2> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
+<3> Set the connection timeout. Default is 10 sec.
+<4> Set the socket timeout. Default is 5 sec.
+<5> Optionally enable SSL.
+<6> Optionally set headers.
+<7> Add basic authentication.
 ====
 
 [[elasticsearch.clients.logging]]
@@ -119,5 +181,4 @@ to be turned on as outlined in the snippet below.
 <logger name="org.springframework.data.elasticsearch.client.WIRE" level="trace"/>
 ----
 
-NOTE: The above applies to both the `RestHighLevelClient` and `ReactiveElasticsearchClient` when obtained via `RestClients`
-respectively `ReactiveRestClients`.
+NOTE: The above applies to both the `RestHighLevelClient` and `ReactiveElasticsearchClient` when obtained via `RestClients` respectively `ReactiveRestClients`, is not available for the `TransportClient`.

src/main/asciidoc/reference/elasticsearch-misc.adoc

@@ -14,12 +14,12 @@ Filter Builder improves query speed.
 private ElasticsearchTemplate elasticsearchTemplate;
 
 SearchQuery searchQuery = new NativeSearchQueryBuilder()
-    .withQuery(matchAllQuery())
-    .withFilter(boolFilter().must(termFilter("id", documentId)))
-    .build();
-    
+  .withQuery(matchAllQuery())
+  .withFilter(boolFilter().must(termFilter("id", documentId)))
+  .build();
+  
 Page<SampleEntity> sampleEntities =
-    elasticsearchTemplate.queryForPage(searchQuery,SampleEntity.class);            
+  elasticsearchTemplate.queryForPage(searchQuery,SampleEntity.class);
 ----
 ====
 
@@ -33,21 +33,21 @@ Elasticsearch has a scroll API for getting big result set in chunks. `Elasticsea
 [source,java]
 ----
 SearchQuery searchQuery = new NativeSearchQueryBuilder()
-    .withQuery(matchAllQuery())
-    .withIndices(INDEX_NAME)
-    .withTypes(TYPE_NAME)
-    .withFields("message")
-    .withPageable(PageRequest.of(0, 10))
-    .build();
+  .withQuery(matchAllQuery())
+  .withIndices(INDEX_NAME)
+  .withTypes(TYPE_NAME)
+  .withFields("message")
+  .withPageable(PageRequest.of(0, 10))
+  .build();
 
 ScrolledPage<SampleEntity> scroll = elasticsearchTemplate.startScroll(1000, searchQuery, SampleEntity.class);
 
 String scrollId = scroll.getScrollId();
 List<SampleEntity> sampleEntities = new ArrayList<>();
 while (scroll.hasContent()) {
-    sampleEntities.addAll(scroll.getContent());
-    scrollId = scroll.getScrollId();
-    scroll = elasticsearchTemplate.continueScroll(scrollId, 1000, SampleEntity.class);
+  sampleEntities.addAll(scroll.getContent());
+  scrollId = scroll.getScrollId();
+  scroll = elasticsearchTemplate.continueScroll(scrollId, 1000, SampleEntity.class);
 }
 elasticsearchTemplate.clearScroll(scrollId);
 ----
@@ -60,18 +60,18 @@ elasticsearchTemplate.clearScroll(scrollId);
 [source,java]
 ----
 SearchQuery searchQuery = new NativeSearchQueryBuilder()
-    .withQuery(matchAllQuery())
-    .withIndices(INDEX_NAME)
-    .withTypes(TYPE_NAME)
-    .withFields("message")
-    .withPageable(PageRequest.of(0, 10))
-    .build();
+  .withQuery(matchAllQuery())
+  .withIndices(INDEX_NAME)
+  .withTypes(TYPE_NAME)
+  .withFields("message")
+  .withPageable(PageRequest.of(0, 10))
+  .build();
 
 CloseableIterator<SampleEntity> stream = elasticsearchTemplate.stream(searchQuery, SampleEntity.class);
 
 List<SampleEntity> sampleEntities = new ArrayList<>();
 while (stream.hasNext()) {
-    sampleEntities.add(stream.next());
+  sampleEntities.add(stream.next());
 }
 ----
 ====

src/main/asciidoc/reference/elasticsearch-new.adoc

@@ -0,0 +1,12 @@
+[[new-features]]
+= What's new
+
+[[new-features.3-2-0]]
+== New in Spring Data Elasticsearch 3.2
+
+* Secured Elasticsearch cluster support with Basic Authentication and SSL transport.
+* Upgrade to Elasticsearch 6.8.1.
+* Reactive programming support with <<elasticsearch.reactive.operations>> and <<elasticsearch.reactive.repositories>>.
+* Introduction of the <<elasticsearch.mapping.meta-model,ElasticsearchEntityMapper>> as an alternative to the Jackson `ObjectMapper`.
+* Field name customization in `@Field`.
+* Support for Delete by Query.

src/main/asciidoc/reference/elasticsearch-object-mapping.adoc

@@ -21,14 +21,16 @@ public class Config extends AbstractElasticsearchConfiguration { <1>
 
   @Override
   public RestHighLevelClient elasticsearchClient() {
-    return RestClients.create(ClientConfiguration.create("localhost:9200")).rest()
+    return RestClients.create(ClientConfiguration.create("localhost:9200")).rest();
   }
 }
 ----
 <1> `AbstractElasticsearchConfiguration` already defines a Jackson2 based `entityMapper` via `ElasticsearchConfigurationSupport`.
 ====
 
-WARNING: `CustomConversions`, `@ReadingConverter` & `@WritingConverter` cannot be applied when using the Jackson based `EntityMapper`.
+[WARNING]
+`CustomConversions`, `@ReadingConverter` & `@WritingConverter` cannot be applied when using the Jackson based `EntityMapper`.  +
+Setting the name of a mapped field with `@Field(name="custom-name")` also cannot be used with this Mapper.
 
 [[elasticsearch.mapping.meta-model]]
 == Meta Model Object Mapping
@@ -50,11 +52,12 @@ public class Config extends AbstractElasticsearchConfiguration {
 
   @Bean
   @Override
-  public EntityMapper entityMapper() { <1>
+  public EntityMapper entityMapper() {                                 <1>
 
-    ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(elasticsearchMappingContext(),
-      new DefaultConversionService()); <2>
-  	entityMapper.setConversions(elasticsearchCustomConversions()); <3>
+    ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(
+      elasticsearchMappingContext(), new DefaultConversionService()    <2>
+    );
+    entityMapper.setConversions(elasticsearchCustomConversions());     <3>
 
   	return entityMapper;
   }
@@ -72,10 +75,26 @@ for `Converter` registration.
 The `ElasticsearchEntityMapper` can use metadata to drive the mapping of objects to documents. The following annotations are available:
 
 * `@Id`: Applied at the field level to mark the field used for identity purpose.
-* `@Document`: Applied at the class level to indicate this class is a candidate for mapping to the database. You can specify the index name and index type where the document will be stored.
+* `@Document`: Applied at the class level to indicate this class is a candidate for mapping to the database. The most important attributes are:
+** `indexName`: the name of the index to store this entity in
+** `type`: the mapping type. If not set, the lowercased simple name of the class is used.
+** `shards`: the number of shards for the index.
+** `replicas`: the number of replicas for the index.
+** `refreshIntervall`: Refresh interval for the index. Used for index creation. Default value is _"1s"_.
+** `indexStoreType`:  Index storage type for the index. Used for index creation. Default value is _"fs"_.
+** `createIndex`: Configuration whether to create an index on repository bootstrapping. Default value is _true_.
+** `versionType`: Configuration of version management. Default value is _EXTERNAL_.
 * `@Transient`: By default all private fields are mapped to the document, this annotation excludes the field where it is applied from being stored in the database
 * `@PersistenceConstructor`: Marks a given constructor - even a package protected one - to use when instantiating the object from the database. Constructor arguments are mapped by name to the key values in the retrieved Document.
-* `@Field`: Applied at the field level and described the name of the field as it will be represented in the Elasticsearch document thus allowing the name to be different than the fieldname of the class.
+* `@Field`: Applied at the field level and defines properties of the field, most of the attributes map to the respective https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html[Elasticsearch Mapping] definitions:
+** `name`: The name of the field as it will be represented in the Elasticsearch document, if not set, the Java field name is used.
+** `type`: the field type, can be one of _Text, Integer, Long, Date, Float, Double, Boolean, Object, Auto, Nested, Ip, Attachment, Keyword_.
+** `format` and `pattern` custom definitions for the _Date_ type.
+** `store`: Flag wether the original field value should be store in Elasticsearch, default value is _false_.
+** `analyzer`, `searchAnalyzer`, `normalizer` for specifying custom custom analyzers and normalizer.
+** `copy_to`: the target field to copy multiple document fields to.
+* `@GeoPoint`: marks a field as _geo_point_ datatype. Can be omitted if the field is an instance of the `GeoPoint` class.
+
 
 The mapping metadata infrastructure is defined in a separate spring-data-commons project that is technology agnostic.
 
@@ -91,7 +110,7 @@ Those type hints are represented as `_class` attributes within the document and
 ====
 [source,java]
 ----
-public class Person { <1>
+public class Person {              <1>
 
   @Id String id;
   String firstname;
@@ -119,7 +138,7 @@ to already have entity information available when first reading data from the st
 ====
 [source,java]
 ----
-@TypeAlias("human") <1>
+@TypeAlias("human")                <1>
 public class Person {
 
   @Id String id;
@@ -129,7 +148,7 @@ public class Person {
 [source,json]
 ----
 {
-  "_class" : "human", <1>
+  "_class" : "human",              <1>
   "id" : ...
 }
 ----
@@ -235,16 +254,16 @@ public class Config extends AbstractElasticsearchConfiguration {
 
   @Override
   public RestHighLevelClient elasticsearchClient() {
-    return RestClients.create(ClientConfiguration.create("localhost:9200")).rest()
+    return RestClients.create(ClientConfiguration.create("localhost:9200")).rest();
   }
 
   @Bean
   @Override
   public EntityMapper entityMapper() {
 
-    ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(elasticsearchMappingContext(),
-      new DefaultConversionService());
-  	entityMapper.setConversions(elasticsearchCustomConversions()); <1>
+    ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(
+      elasticsearchMappingContext(), new DefaultConversionService());
+    entityMapper.setConversions(elasticsearchCustomConversions());  <1>
 
   	return entityMapper;
   }
@@ -252,10 +271,11 @@ public class Config extends AbstractElasticsearchConfiguration {
   @Bean
   @Override
   public ElasticsearchCustomConversions elasticsearchCustomConversions() {
-    return new ElasticsearchCustomConversions(Arrays.asList(new AddressToMap(), new MapToAddress())); <2>
+    return new ElasticsearchCustomConversions(
+      Arrays.asList(new AddressToMap(), new MapToAddress()));       <2>
   }
 
-  @WritingConverter <3>
+  @WritingConverter                                                 <3>
   static class AddressToMap implements Converter<Address, Map<String, Object>> {
 
     @Override
@@ -269,7 +289,7 @@ public class Config extends AbstractElasticsearchConfiguration {
     }
   }
 
-  @ReadingConverter <4>
+  @ReadingConverter                                                 <4>
   static class MapToAddress implements Converter<Map<String, Object>, Address> {
 
     @Override

src/main/asciidoc/reference/elasticsearch-operations.adoc

@@ -0,0 +1,135 @@
+[[elasticsearch.operations]]
+= Elasticsearch Operations
+
+Spring Data Elasticsearch uses two interfaces to define the operations that can be called against an Elasticsearch index. These are `ElasticsearchOperations` and `ReactiveElasticsearchOperations`. Whereas the first is used with the classic synchronous implementations, the second one uses reactive infrastructure.
+
+The default implementations of the interfaces offer:
+
+* Read/Write mapping support for domain types.
+* A rich query and criteria api.
+* Resource management and Exception translation.
+
+[[elasticsearch.operations.template]]
+== ElasticsearchTemplate
+
+The `ElasticsearchTemplate` is an implementation of the `ElasticsearchOperations` interface using the <<elasticsearch.clients.transport>>.
+
+.ElasticsearchTemplate configuration
+====
+[source,java]
+----
+@Configuration
+public class TransportClientConfig extends ElasticsearchConfigurationSupport {
+
+  @Bean
+  public Client elasticsearchClient() throws UnknownHostException {                 <1>
+    Settings settings = Settings.builder().put("cluster.name", "elasticsearch").build();
+    TransportClient client = new PreBuiltTransportClient(settings);
+    client.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300));
+    return client;
+  }
+
+  @Bean(name = {"elasticsearchOperations", "elasticsearchTemplate"})
+  public ElasticsearchTemplate elasticsearchTemplate() throws UnknownHostException { <2>
+  	return new ElasticsearchTemplate(elasticsearchClient(), entityMapper());
+  }
+
+  // use the ElasticsearchEntityMapper
+  @Bean
+  @Override
+  public EntityMapper entityMapper() {                                               <3>
+    ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(elasticsearchMappingContext(),
+  	  new DefaultConversionService());
+    entityMapper.setConversions(elasticsearchCustomConversions());
+    return entityMapper;
+  }
+}
+----
+<1> Setting up the <<elasticsearch.clients.transport>>.
+<2> Creating the `ElasticsearchTemplate` bean, offering both names, _elasticsearchOperations_ and _elasticsearchTemplate_.
+<3> Using the <<elasticsearch.mapping.meta-model>> ElasticsearchMapper.
+====
+
+[[elasticsearch.operations.resttemplate]]
+== ElasticsearchRestTemplate
+
+The `ElasticsearchRestTemplate` is an implementation of the `ElasticsearchOperations` interface using the <<elasticsearch.clients.rest>>.
+
+.ElasticsearchRestTemplate configuration
+====
+[source,java]
+----
+@Configuration
+public class RestClientConfig extends AbstractElasticsearchConfiguration {
+  @Override
+  public RestHighLevelClient elasticsearchClient() {       <1>
+    return RestClients.create(ClientConfiguration.localhost()).rest();
+  }
+
+  // no special bean creation needed                       <2>
+
+  // use the ElasticsearchEntityMapper
+  @Bean
+  @Override
+  public EntityMapper entityMapper() {                     <3>
+    ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(elasticsearchMappingContext(),
+        new DefaultConversionService());
+    entityMapper.setConversions(elasticsearchCustomConversions());
+
+    return entityMapper;
+  }
+}
+----
+<1> Setting up the <<elasticsearch.clients.rest>>.
+<2> The base class `AbstractElasticsearchConfiguration` already provides the `elasticsearchTemplate` bean.
+<3> Using the <<elasticsearch.mapping.meta-model>> ElasticsearchMapper.
+====
+
+[[elasticsearch.operations.usage]]
+== Usage examples
+
+As both `ElasticsearchTemplate` and `ElasticsearchRestTemplate` implement the `ElasticsearchOperations` interface, the code to use them is not different. The example shows how to use an injected `ElasticsearchOperations` instance in a Spring REST controller. The decision, if this is using the `TransportClient` or the `RestClient` is made by providing the
+ corresponding Bean with one of the configurations shown above.
+
+.ElasticsearchOperations usage
+====
+[source,java]
+----
+@RestController
+@RequestMapping("/")
+public class TestController {
+
+  private  ElasticsearchOperations elasticsearchOperations;
+
+  public TestController(ElasticsearchOperations elasticsearchOperations) { <1>
+    this.elasticsearchOperations = elasticsearchOperations;
+  }
+
+  @PostMapping("/person")
+  public String save(@RequestBody Person person) {                         <2>
+
+    IndexQuery indexQuery = new IndexQueryBuilder()
+      .withId(person.getId().toString())
+      .withObject(person)
+      .build();
+    String documentId = elasticsearchOperations.index(indexQuery);
+    return documentId;
+  }
+
+  @GetMapping("/person/{id}")
+  public Person findById(@PathVariable("id")  Long id) {                   <3>
+    Person person = elasticsearchOperations
+      .queryForObject(GetQuery.getById(id.toString()), Person.class);
+    return person;
+  }
+}
+
+----
+<1> Let Spring inject the provided `ElasticsearchOperations` bean in the constructor.
+<2> Store some entity in the Elasticsearch cluster.
+<3> Retrieve the entity with a query by id.
+====
+
+To see the full possibilities of `ElasticsearchOperations` please refer to the API documentation.
+
+include::reactive-elasticsearch-operations.adoc[leveloffset=+1]

src/main/asciidoc/reference/elasticsearch-repositories.adoc

@@ -0,0 +1,149 @@
+[[elasticsearch.repositories]]
+= Elasticsearch Repositories
+
+This chapter includes details of the Elasticsearch repository implementation.
+
+include::elasticsearch-repository-queries.adoc[leveloffset=+1]
+
+[[elasticsearch.annotation]]
+== Annotation based configuration
+
+The Spring Data Elasticsearch repositories support can be activated using an annotation through JavaConfig.
+
+.Spring Data Elasticsearch repositories using JavaConfig
+====
+[source,java]
+----
+@Configuration
+@EnableElasticsearchRepositories(                             <1>
+  basePackages = "org.springframework.data.elasticsearch.repositories"
+  )
+static class Config {
+
+  @Bean
+  public ElasticsearchOperations elasticsearchTemplate() {    <2>
+      // ...
+  }
+}
+
+class ProductService {
+
+  private ProductRepository repository;                       <3>
+
+  public ProductService(ProductRepository repository) {
+    this.repository = repository;
+  }
+
+  public Page<Product> findAvailableBookByName(String name, Pageable pageable) {
+    return repository.findByAvailableTrueAndNameStartingWith(name, pageable);
+  }
+}
+----
+
+<1> The `EnableElasticsearchRepositories` annotation activates the Repository support. If no base package is configured, it will use the one of the configuration class it is put on.
+<2> Provide a Bean named `elasticsearchTemplate` of type `ElasticsearchOperations` by using one of the configurations shown in the <<elasticsearch.operations>> chapter.
+<3> Let Spring inject the Repository bean into your class.
+====
+
+[[elasticsearch.cdi]]
+== Elasticsearch Repositories using CDI
+
+The Spring Data Elasticsearch repositories can also be set up using CDI functionality.
+
+.Spring Data Elasticsearch repositories using CDI
+====
+[source,java]
+----
+class ElasticsearchTemplateProducer {
+
+  @Produces
+  @ApplicationScoped
+  public ElasticsearchOperations createElasticsearchTemplate() {
+    // ...                               <1>
+  }
+}
+
+class ProductService {
+
+  private ProductRepository repository;  <2>
+  public Page<Product> findAvailableBookByName(String name, Pageable pageable) {
+    return repository.findByAvailableTrueAndNameStartingWith(name, pageable);
+  }
+  @Inject
+  public void setRepository(ProductRepository repository) {
+    this.repository = repository;
+  }
+}                
+----
+<1> Create a component by using the same calls as are used in the <<elasticsearch.operations>> chapter.
+<2> Let the CDI framework inject the Repository into your class.
+
+====
+
+[[elasticsearch.namespace]]
+== Spring Namespace
+
+The Spring Data Elasticsearch module contains a custom namespace allowing definition of repository beans as well as elements for instantiating a `ElasticsearchServer` .
+
+Using the `repositories` element looks up Spring Data repositories as described in <<repositories.create-instances>> .
+
+.Setting up Elasticsearch repositories using Namespace
+====
+[source,xml]
+----
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+       http://www.springframework.org/schema/data/elasticsearch
+       https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd">
+
+  <elasticsearch:repositories base-package="com.acme.repositories" />
+
+</beans>
+----
+====
+
+Using the `Transport Client` or `Rest Client` element registers an instance of `Elasticsearch Server` in the context.
+
+.Transport Client using Namespace
+====
+[source,xml]
+----
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+       http://www.springframework.org/schema/data/elasticsearch
+       https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd">
+
+  <elasticsearch:transport-client id="client" cluster-nodes="localhost:9300,someip:9300" />
+
+</beans>
+----
+====
+
+.Rest Client using Namespace
+====
+[source,xml]
+----
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch
+       https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
+       http://www.springframework.org/schema/beans
+       https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+  <elasticsearch:rest-client id="restClient" hosts="http://localhost:9200">
+
+</beans>
+----
+====
+
+include::reactive-elasticsearch-repositories.adoc[leveloffset=+1]

src/main/asciidoc/reference/elasticsearch-repository-queries.adoc

@@ -0,0 +1,302 @@
+[[elasticsearch.query-methods]]
+= Query methods
+
+[[elasticsearch.query-methods.finders]]
+== Query lookup strategies
+
+The Elasticsearch module supports all basic query building feature as string queries, native search queries, criteria based queries or have it being derived from the method name.
+
+=== Declared queries
+
+Deriving the query from the method name is not always sufficient and/or may result in unreadable method names. In this case one might make use of the `@Query` annotation (see <<elasticsearch.query-methods.at-query>> ).
+
+[[elasticsearch.query-methods.criterions]]
+== Query creation
+
+Generally the query creation mechanism for Elasticsearch works as described in <<repositories.query-methods>>. Here's a short example of what a Elasticsearch query method translates into:
+
+.Query creation from method names
+====
+[source,java]
+----
+interface BookRepository extends Repository<Book, String> {
+  List<Book> findByNameAndPrice(String name, Integer price);
+}
+----
+====
+
+The method name above will be translated into the following Elasticsearch json query
+
+[source]
+----
+{
+    "query": {
+        "bool" : {
+            "must" : [
+                { "query_string" : { "query" : "?", "fields" : [ "name" ] } },
+                { "query_string" : { "query" : "?", "fields" : [ "price" ] } }
+            ]
+        }
+    }
+}
+----
+
+A list of supported keywords for Elasticsearch is shown below.
+
+[cols="1,2,3", options="header"]
+.Supported keywords inside method names
+|===
+| Keyword
+| Sample
+| Elasticsearch Query String| `And`
+| `findByNameAndPrice`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      { "query_string" : { "query" : "?", "fields" : [ "name" ] } },
+      { "query_string" : { "query" : "?", "fields" : [ "price" ] } }
+    ]
+  }
+}}`
+
+| `Or`
+| `findByNameOrPrice`
+| `{ "query" : {
+"bool" : {
+"should" : [
+      { "query_string" : { "query" : "?", "fields" : [ "name" ] } },
+      { "query_string" : { "query" : "?", "fields" : [ "price" ] } }
+    ]
+  }
+}}`
+
+| `Is`
+| `findByName`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      { "query_string" : { "query" : "?", "fields" : [ "name" ] } }
+    ]
+  }
+}}`
+
+| `Not`
+| `findByNameNot`
+| `{ "query" : {
+"bool" : {
+"must_not" : [
+      { "query_string" : { "query" : "?", "fields" : [ "name" ] } }
+    ]
+  }
+}}`
+
+| `Between`
+| `findByPriceBetween`
+| `{ "query" : {
+"bool" : {
+"must" : [
+    {"range" : {"price" : {"from" : ?, "to" : ?, "include_lower" : true, "include_upper" : true } } }
+    ]
+  }
+}}`
+
+| `LessThan`
+| `findByPriceLessThan`
+| `{ "query" : {
+"bool" : {
+"must" : [
+    {"range" : {"price" : {"from" : null, "to" : ?, "include_lower" : true, "include_upper" : false } } }
+    ]
+  }
+}}`
+
+| `LessThanEqual`
+| `findByPriceLessThanEqual`
+| `{ "query" : {
+"bool" : {
+"must" : [
+    {"range" : {"price" : {"from" : null, "to" : ?, "include_lower" : true, "include_upper" : true } } }
+    ]
+  }
+}}`
+
+| `GreaterThan`
+| `findByPriceGreaterThan`
+| `{ "query" : {
+"bool" : {
+"must" : [
+    {"range" : {"price" : {"from" : ?, "to" : null, "include_lower" : false, "include_upper" : true } } }
+    ]
+  }
+}}`
+
+
+| `GreaterThanEqual`
+| `findByPriceGreaterThan`
+| `{ "query" : {
+"bool" : {
+"must" : [
+    {"range" : {"price" : {"from" : ?, "to" : null, "include_lower" : true, "include_upper" : true } } }
+    ]
+  }
+}}`
+
+| `Before`
+| `findByPriceBefore`
+| `{ "query" : {
+"bool" : {
+"must" : [
+    {"range" : {"price" : {"from" : null, "to" : ?, "include_lower" : true, "include_upper" : true } } }
+    ]
+  }
+}}`
+
+| `After`
+| `findByPriceAfter`
+| `{ "query" : {
+"bool" : {
+"must" : [
+    {"range" : {"price" : {"from" : ?, "to" : null, "include_lower" : true, "include_upper" : true } } }
+    ]
+  }
+}}`
+
+| `Like`
+| `findByNameLike`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      { "query_string" : { "query" : "?*", "fields" : [ "name" ] }, "analyze_wildcard": true }
+    ]
+  }
+}}`
+
+| `StartingWith`
+| `findByNameStartingWith`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      { "query_string" : { "query" : "?*", "fields" : [ "name" ] }, "analyze_wildcard": true }
+    ]
+  }
+}}`
+
+| `EndingWith`
+| `findByNameEndingWith`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      { "query_string" : { "query" : "*?", "fields" : [ "name" ] }, "analyze_wildcard": true }
+    ]
+  }
+}}`
+
+| `Contains/Containing`
+| `findByNameContaining`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      { "query_string" : { "query" : "\*?*", "fields" : [ "name" ] }, "analyze_wildcard": true }
+    ]
+  }
+}}`
+
+| `In`
+| `findByNameIn(Collection<String>names)`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      {"bool" : {"must" : [
+            {"terms" : {"name" : ["?","?"]}}
+          ]
+        }
+      }
+    ]
+  }
+}}`
+
+| `NotIn`
+| `findByNameNotIn(Collection<String>names)`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      {"bool" : {"must_not" : [
+            {"terms" : {"name" : ["?","?"]}}
+          ]
+        }
+      }
+    ]
+  }
+}}`
+
+| `Near`
+| `findByStoreNear`
+| `Not Supported Yet !`
+
+| `True`
+| `findByAvailableTrue`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      { "query_string" : { "query" : "true", "fields" : [ "available" ] } }
+    ]
+  }
+}}`
+
+| `False`
+| `findByAvailableFalse`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      { "query_string" : { "query" : "false", "fields" : [ "available" ] } }
+    ]
+  }
+}}`
+
+| `OrderBy`
+| `findByAvailableTrueOrderByNameDesc`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      { "query_string" : { "query" : "true", "fields" : [ "available" ] } }
+    ]
+  }
+}, "sort":[{"name":{"order":"desc"}}]
+}`
+
+|===
+
+== Method return types
+
+Repository methods can be defined to have the following return types for returning multiple Elements:
+
+* `List<T>`
+* `Stream<T>`
+* `AggregatedPage<T>`
+
+[[elasticsearch.query-methods.at-query]]
+== Using @Query Annotation
+
+.Declare query at the method using the `@Query` annotation.
+====
+[source,java]
+----
+interface BookRepository extends ElasticsearchRepository<Book, String> {
+    @Query("{\"match\": {\"name\": {\"query\": \"?0\"}}}")
+    Page<Book> findByName(String name,Pageable pageable);
+}
+----
+The String that is set as the annotation argument must be a valid Elasticsearch JSON query. It will be sent to Easticsearch as value of the query element; if for example the function is called with the parameter _John_, it would produce the following query body:
+[source,json]
+----
+{
+  "query": {
+    "match": {
+      "name": {
+        "query": "John"
+      }
+    }
+  }
+}
+----
+====

src/main/asciidoc/reference/reactive-elasticsearch-operations.adoc

@@ -3,11 +3,7 @@
 
 `ReactiveElasticsearchOperations` is the gateway to executing high level commands against an Elasticsearch cluster using the `ReactiveElasticsearchClient`.
 
-The `ReactiveElasticsearchTemplate` is the default implementation of `ReactiveElasticsearchOperations` and offers the following set of features.
-
-* Read/Write mapping support for domain types.
-* A rich query and criteria api.
-* Resource management and Exception translation.
+The `ReactiveElasticsearchTemplate` is the default implementation of `ReactiveElasticsearchOperations`.
 
 [[elasticsearch.reactive.template]]
 == Reactive Elasticsearch Template
@@ -28,11 +24,11 @@ dedicated configuration method hooks for `base package`, the `initial entity set
 @Configuration
 public class Config extends AbstractReactiveElasticsearchConfiguration {
 
-    @Bean <1>
-    @Override
-    public ReactiveElasticsearchClient reactiveElasticsearchClient() {
-        // ...
-    }
+  @Bean <1>
+  @Override
+  public ReactiveElasticsearchClient reactiveElasticsearchClient() {
+      // ...
+  }
 }
 ----
 <1> Configure the client to use. This can be done by `ReactiveRestClients` or directly via `DefaultReactiveElasticsearchClient`.
@@ -51,25 +47,22 @@ However one might want to be more in control over the actual components and use
 @Configuration
 public class Config {
 
-    @Bean <1>
-    public ReactiveElasticsearchClient reactiveElasticsearchClient() {
-        // ...
-    }
-
-    @Bean <2>
-    public ElasticsearchConverter elasticsearchConverter() {
-        return new MappingElasticsearchConverter(elasticsearchMappingContext());
-    }
-
-    @Bean <3>
-    public SimpleElasticsearchMappingContext elasticsearchMappingContext() {
-        return new SimpleElasticsearchMappingContext();
-    }
-
-    @Bean <4>
-    public ReactiveElasticsearchOperations reactiveElasticsearchOperations() {
-        return new ReactiveElasticsearchTemplate(reactiveElasticsearchClient(), elasticsearchConverter());
-    }
+  @Bean <1>
+  public ReactiveElasticsearchClient reactiveElasticsearchClient() {
+    // ...
+  }
+  @Bean <2>
+  public ElasticsearchConverter elasticsearchConverter() {
+    return new MappingElasticsearchConverter(elasticsearchMappingContext());
+  }
+  @Bean <3>
+  public SimpleElasticsearchMappingContext elasticsearchMappingContext() {
+    return new SimpleElasticsearchMappingContext();
+  }
+  @Bean <4>
+  public ReactiveElasticsearchOperations reactiveElasticsearchOperations() {
+    return new ReactiveElasticsearchTemplate(reactiveElasticsearchClient(), elasticsearchConverter());
+  }
 }
 ----
 <1> Configure the client to use. This can be done by `ReactiveRestClients` or directly via `DefaultReactiveElasticsearchClient`.
@@ -92,25 +85,24 @@ Consider the following:
 @Document(indexName = "marvel", type = "characters")
 public class Person {
 
-    private @Id String id;
-    private String name;
-    private int age;
-
-    // Getter/Setter omitted...
+  private @Id String id;
+  private String name;
+  private int age;
+  // Getter/Setter omitted...
 }
 ----
 
 [source,java]
 ----
-template.save(new Person("Bruce Banner", 42)) <1>
-    .doOnNext(System.out::println)
-    .flatMap(person -> template.findById(person.id, Person.class)) <2>
-    .doOnNext(System.out::println)
-    .flatMap(person -> template.delete(person)) <3>
-    .doOnNext(System.out::println)
-    .flatMap(id -> template.count(Person.class)) <4>
-    .doOnNext(System.out::println)
-    .subscribe(); <5>
+template.save(new Person("Bruce Banner", 42))                    <1>
+  .doOnNext(System.out::println)
+  .flatMap(person -> template.findById(person.id, Person.class)) <2>
+  .doOnNext(System.out::println)
+  .flatMap(person -> template.delete(person))                    <3>
+  .doOnNext(System.out::println)
+  .flatMap(id -> template.count(Person.class))                   <4>
+  .doOnNext(System.out::println)
+  .subscribe(); <5>
 ----
 
 The above outputs the following sequence on the console.

src/main/asciidoc/reference/reactive-elasticsearch-repositories.adoc

@@ -4,7 +4,7 @@
 Reactive Elasticsearch repository support builds on the core repository support explained in <<repositories>> utilizing
 operations provided via <<elasticsearch.reactive.operations>> executed by a <<elasticsearch.clients.reactive>>.
 
-Spring Data Elasticsearchs reactive repository support uses https://projectreactor.io/[Project Reactor] as its reactive
+Spring Data Elasticsearch reactive repository support uses https://projectreactor.io/[Project Reactor] as its reactive
 composition library of choice.
 
 There are 3 main interfaces to be used:
@@ -42,7 +42,7 @@ NOTE: Please note that the `id` property needs to be of type `String`.
 ====
 [source]
 ----
-public interface ReactivePersonRepository extends ReactiveSortingRepository<Person, String> {
+interface ReactivePersonRepository extends ReactiveSortingRepository<Person, String> {
 
   Flux<Person> findByFirstname(String firstname);                                   <1>
 

src/main/java/org/springframework/data/elasticsearch/ElasticsearchException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/NoSuchIndexException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/annotations/DateFormat.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/annotations/Document.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,41 +15,81 @@
  */
 package org.springframework.data.elasticsearch.annotations;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 import org.elasticsearch.index.VersionType;
+
 import org.springframework.data.annotation.Persistent;
 
 /**
- * Document
+ * Identifies a domain object to be persisted to Elasticsearch.
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Mason Chan
  * @author Ivan Greene
+ * @author Mark Paluch
  */
-
 @Persistent
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
+@Target({ ElementType.TYPE })
 public @interface Document {
 
+	/**
+	 * Name of the Elasticsearch index.
+	 * <ul>
+	 * <li>Lowercase only</li>
+	 * <li><Cannot include \, /, *, ?, ", <, >, |, ` ` (space character), ,, #/li>
+	 * <li>Cannot start with -, _, +</li>
+	 * <li>Cannot be . or ..</li>
+	 * <li>Cannot be longer than 255 bytes (note it is bytes, so multi-byte characters will count towards the 255 limit
+	 * faster)</li>
+	 * </ul>
+	 */
 	String indexName();
 
+	/**
+	 * Mapping type name.
+	 */
 	String type() default "";
 
+	/**
+	 * Use server-side settings when creating the index.
+	 */
 	boolean useServerConfiguration() default false;
 
+	/**
+	 * Number of shards for the index {@link #indexName()}. Used for index creation.
+	 */
 	short shards() default 5;
 
+	/**
+	 * Number of replicas for the index {@link #indexName()}. Used for index creation.
+	 */
 	short replicas() default 1;
 
+	/**
+	 * Refresh interval for the index {@link #indexName()}. Used for index creation.
+	 */
 	String refreshInterval() default "1s";
 
+	/**
+	 * Index storage type for the index {@link #indexName()}. Used for index creation.
+	 */
 	String indexStoreType() default "fs";
 
+	/**
+	 * Configuration whether to create an index on repository bootstrapping.
+	 */
 	boolean createIndex() default true;
 
+	/**
+	 * Configuration of version management.
+	 */
 	VersionType versionType() default VersionType.EXTERNAL;
 }

src/main/java/org/springframework/data/elasticsearch/annotations/Field.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/annotations/FieldType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,16 @@ package org.springframework.data.elasticsearch.annotations;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Artur Konczak
+ * @author Zeng Zetang
  */
 public enum FieldType {
 	Text,
+	Byte,
+	Short,
 	Integer,
 	Long,
 	Date,
+	Half_Float,
 	Float,
 	Double,
 	Boolean,

src/main/java/org/springframework/data/elasticsearch/annotations/GeoPointField.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/annotations/InnerField.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/annotations/Mapping.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/annotations/MultiField.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/annotations/Parent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/annotations/Query.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/annotations/Setting.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,15 +20,21 @@ import java.net.SocketAddress;
 import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 
+import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 
 import org.springframework.http.HttpHeaders;
+import org.springframework.web.reactive.function.client.WebClient;
 
 /**
  * Configuration interface exposing common client configuration properties for Elasticsearch clients.
  *
  * @author Mark Paluch
+ * @author Peter-Josef Meisch
+ * @author Huw Ayling-Miller
+ * @author Henrique Amaral
  * @since 3.2
  */
 public interface ClientConfiguration {
@@ -117,6 +123,13 @@ public interface ClientConfiguration {
 	 */
 	Optional<SSLContext> getSslContext();
 
+	/**
+	 * Returns the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if unconfigured.
+	 *
+	 * @return the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if unconfigured.
+	 */
+	Optional<HostnameVerifier> getHostNameVerifier();
+
 	/**
 	 * Returns the {@link java.time.Duration connect timeout}.
 	 *
@@ -134,6 +147,27 @@ public interface ClientConfiguration {
 	 */
 	Duration getSocketTimeout();
 
+	/**
+	 * Returns the path prefix that should be prepended to HTTP(s) requests for Elasticsearch behind a proxy.
+	 *
+	 * @return the path prefix.
+	 * @since 3.2.4
+	 */
+	String getPathPrefix();
+
+	/**
+	 * returns an optionally set proxy in the form host:port
+	 *
+	 * @return the optional proxy
+	 * @since 3.2.4
+	 */
+	Optional<String> getProxy();
+
+	/**
+	 * @return the function for configuring a WebClient.
+	 */
+	Function<WebClient, WebClient> getWebClientConfigurer();
+
 	/**
 	 * @author Christoph Strobl
 	 */
@@ -200,6 +234,16 @@ public interface ClientConfiguration {
 		 * @return the {@link TerminalClientConfigurationBuilder}.
 		 */
 		TerminalClientConfigurationBuilder usingSsl(SSLContext sslContext);
+
+		/**
+		 * Connect via {@literal https} using the givens {@link SSLContext} and HostnameVerifier {@link HostnameVerifier}
+		 * .<br />
+		 * <strong>NOTE</strong> You need to leave out the protocol in
+		 * {@link ClientConfigurationBuilderWithRequiredEndpoint#connectedTo(String)}.
+		 *
+		 * @return the {@link TerminalClientConfigurationBuilder}.
+		 */
+		TerminalClientConfigurationBuilder usingSsl(SSLContext sslContext, HostnameVerifier hostnameVerifier);
 	}
 
 	/**
@@ -257,6 +301,38 @@ public interface ClientConfiguration {
 		 */
 		TerminalClientConfigurationBuilder withSocketTimeout(Duration timeout);
 
+		/**
+		 * Configure the username and password to be sent as a Basic Authentication header
+		 *
+		 * @param username the username. Must not be {@literal null}.
+		 * @param password the password. Must not be {@literal null}.
+		 * @return the {@link TerminalClientConfigurationBuilder}
+		 */
+		TerminalClientConfigurationBuilder withBasicAuth(String username, String password);
+
+		/**
+		 * Configure the path prefix that will be prepended to any HTTP(s) requests
+		 *
+		 * @param pathPrefix the pathPrefix.
+		 * @return the {@link TerminalClientConfigurationBuilder}
+		 * @since 3.2.4
+		 */
+		TerminalClientConfigurationBuilder withPathPrefix(String pathPrefix);
+
+		/**
+		 * @param proxy a proxy formatted as String {@literal host:port}.
+		 * @return the {@link TerminalClientConfigurationBuilder}.
+		 */
+		TerminalClientConfigurationBuilder withProxy(String proxy);
+
+		/**
+		 * set customization hook in case of a reactive configuration
+		 * 
+		 * @param webClientConfigurer function to configure the WebClient
+		 * @return the {@link TerminalClientConfigurationBuilder}.
+		 */
+		TerminalClientConfigurationBuilder withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer);
+
 		/**
 		 * Build the {@link ClientConfiguration} object.
 		 *

src/main/java/org/springframework/data/elasticsearch/client/ClientConfigurationBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,10 @@ import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 
 import org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationBuilderWithRequiredEndpoint;
@@ -30,12 +32,16 @@ import org.springframework.data.elasticsearch.client.ClientConfiguration.Termina
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.web.reactive.function.client.WebClient;
 
 /**
  * Default builder implementation for {@link ClientConfiguration}.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Peter-Josef Meisch
+ * @author Huw Ayling-Miller
+ * @author Henrique Amaral
  * @since 3.2
  */
 class ClientConfigurationBuilder
@@ -45,8 +51,14 @@ class ClientConfigurationBuilder
 	private HttpHeaders headers = HttpHeaders.EMPTY;
 	private boolean useSsl;
 	private @Nullable SSLContext sslContext;
+	private @Nullable HostnameVerifier hostnameVerifier;
 	private Duration connectTimeout = Duration.ofSeconds(10);
 	private Duration soTimeout = Duration.ofSeconds(5);
+	private String username;
+	private String password;
+	private String pathPrefix;
+	private String proxy;
+	private Function<WebClient, WebClient> webClientConfigurer;
 
 	/*
 	 * (non-Javadoc)
@@ -75,6 +87,13 @@ class ClientConfigurationBuilder
 		return this;
 	}
 
+	@Override
+	public MaybeSecureClientConfigurationBuilder withProxy(String proxy) {
+		Assert.hasLength(proxy, "proxy must not be null or empty");
+		this.proxy = proxy;
+		return this;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder#usingSsl()
@@ -100,6 +119,22 @@ class ClientConfigurationBuilder
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder#usingSsl(javax.net.ssl.SSLContext, javax.net.ssl.HostnameVerifier)
+	 */
+	@Override
+	public TerminalClientConfigurationBuilder usingSsl(SSLContext sslContext, HostnameVerifier hostnameVerifier) {
+
+		Assert.notNull(sslContext, "SSL Context must not be null");
+		Assert.notNull(hostnameVerifier, "Host Name Verifier must not be null");
+
+		this.useSsl = true;
+		this.sslContext = sslContext;
+		this.hostnameVerifier = hostnameVerifier;
+		return this;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration.TerminalClientConfigurationBuilder#withDefaultHeaders(org.springframework.http.HttpHeaders)
@@ -109,7 +144,9 @@ class ClientConfigurationBuilder
 
 		Assert.notNull(defaultHeaders, "Default HTTP headers must not be null");
 
-		this.headers = defaultHeaders;
+		this.headers = new HttpHeaders();
+		this.headers.addAll(defaultHeaders);
+
 		return this;
 	}
 
@@ -139,17 +176,54 @@ class ClientConfigurationBuilder
 		return this;
 	}
 
+	@Override
+	public TerminalClientConfigurationBuilder withBasicAuth(String username, String password) {
+
+		Assert.notNull(username, "username must not be null");
+		Assert.notNull(password, "password must not be null");
+
+		this.username = username;
+		this.password = password;
+
+		return this;
+	}
+
+	@Override
+	public TerminalClientConfigurationBuilder withPathPrefix(String pathPrefix) {
+		this.pathPrefix = pathPrefix;
+
+		return this;
+	}
+
+	@Override
+	public TerminalClientConfigurationBuilder withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer) {
+
+		Assert.notNull(webClientConfigurer, "webClientConfigurer must not be null");
+
+		this.webClientConfigurer = webClientConfigurer;
+		return this;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationBuilderWithOptionalDefaultHeaders#build()
 	 */
 	@Override
 	public ClientConfiguration build() {
-		return new DefaultClientConfiguration(this.hosts, this.headers, this.useSsl, this.sslContext, this.soTimeout,
-				this.connectTimeout);
+
+		if (username != null && password != null) {
+			if (HttpHeaders.EMPTY.equals(headers)) {
+				headers = new HttpHeaders();
+			}
+			headers.setBasicAuth(username, password);
+		}
+
+		return new DefaultClientConfiguration(hosts, headers, useSsl, sslContext, soTimeout, connectTimeout, pathPrefix,
+				hostnameVerifier, proxy, webClientConfigurer);
 	}
 
 	private static InetSocketAddress parse(String hostAndPort) {
 		return InetSocketAddressParser.parse(hostAndPort, ElasticsearchHost.DEFAULT_PORT);
 	}
+
 }

src/main/java/org/springframework/data/elasticsearch/client/ClientLogger.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/ClusterNodes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/DefaultClientConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,17 +21,22 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 
+import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
+import org.springframework.web.reactive.function.client.WebClient;
 
 /**
  * Default {@link ClientConfiguration} implementation.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Huw Ayling-Miller
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 class DefaultClientConfiguration implements ClientConfiguration {
@@ -42,9 +47,14 @@ class DefaultClientConfiguration implements ClientConfiguration {
 	private final @Nullable SSLContext sslContext;
 	private final Duration soTimeout;
 	private final Duration connectTimeout;
+	private final String pathPrefix;
+	private final @Nullable HostnameVerifier hostnameVerifier;
+	private final String proxy;
+	private final Function<WebClient, WebClient> webClientConfigurer;
 
 	DefaultClientConfiguration(List<InetSocketAddress> hosts, HttpHeaders headers, boolean useSsl,
-			@Nullable SSLContext sslContext, Duration soTimeout, Duration connectTimeout) {
+			@Nullable SSLContext sslContext, Duration soTimeout, Duration connectTimeout, @Nullable String pathPrefix,
+			@Nullable HostnameVerifier hostnameVerifier, String proxy, Function<WebClient, WebClient> webClientConfigurer) {
 
 		this.hosts = Collections.unmodifiableList(new ArrayList<>(hosts));
 		this.headers = new HttpHeaders(headers);
@@ -52,60 +62,59 @@ class DefaultClientConfiguration implements ClientConfiguration {
 		this.sslContext = sslContext;
 		this.soTimeout = soTimeout;
 		this.connectTimeout = connectTimeout;
+		this.pathPrefix = pathPrefix;
+		this.hostnameVerifier = hostnameVerifier;
+		this.proxy = proxy;
+		this.webClientConfigurer = webClientConfigurer;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration#getEndpoints()
-	 */
 	@Override
 	public List<InetSocketAddress> getEndpoints() {
 		return this.hosts;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration#getDefaultHeaders()
-	 */
 	@Override
 	public HttpHeaders getDefaultHeaders() {
 		return this.headers;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration#useSsl()
-	 */
 	@Override
 	public boolean useSsl() {
 		return this.useSsl;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration#getSslContext()
-	 */
 	@Override
 	public Optional<SSLContext> getSslContext() {
 		return Optional.ofNullable(this.sslContext);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration#getConnectTimeout()
-	 */
+	@Override
+	public Optional<HostnameVerifier> getHostNameVerifier() {
+		return Optional.ofNullable(this.hostnameVerifier);
+	}
+
 	@Override
 	public Duration getConnectTimeout() {
 		return this.connectTimeout;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration#getSocketTimeout()
-	 */
 	@Override
 	public Duration getSocketTimeout() {
 		return this.soTimeout;
 	}
 
+	@Override
+	public String getPathPrefix() {
+		return this.pathPrefix;
+	}
+
+	@Override
+	public Optional<String> getProxy() {
+		return Optional.ofNullable(proxy);
+	}
+
+	@Override
+	public Function<WebClient, WebClient> getWebClientConfigurer() {
+		return webClientConfigurer != null ? webClientConfigurer : Function.identity();
+	}
 }

src/main/java/org/springframework/data/elasticsearch/client/ElasticsearchHost.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/InetSocketAddressParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/NoReachableHostException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/RestClientFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/RestClients.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 
 import org.apache.http.Header;
@@ -52,6 +53,9 @@ import org.springframework.util.Assert;
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Huw Ayling-Miller
+ * @author Henrique Amaral
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 public final class RestClients {
@@ -75,6 +79,11 @@ public final class RestClients {
 		HttpHost[] httpHosts = formattedHosts(clientConfiguration.getEndpoints(), clientConfiguration.useSsl()).stream()
 				.map(HttpHost::create).toArray(HttpHost[]::new);
 		RestClientBuilder builder = RestClient.builder(httpHosts);
+
+		if (clientConfiguration.getPathPrefix() != null) {
+			builder.setPathPrefix(clientConfiguration.getPathPrefix());
+		}
+
 		HttpHeaders headers = clientConfiguration.getDefaultHeaders();
 
 		if (!headers.isEmpty()) {
@@ -87,7 +96,9 @@ public final class RestClients {
 		builder.setHttpClientConfigCallback(clientBuilder -> {
 
 			Optional<SSLContext> sslContext = clientConfiguration.getSslContext();
+			Optional<HostnameVerifier> hostNameVerifier = clientConfiguration.getHostNameVerifier();
 			sslContext.ifPresent(clientBuilder::setSSLContext);
+			hostNameVerifier.ifPresent(clientBuilder::setSSLHostnameVerifier);
 
 			if (ClientLogger.isEnabled()) {
 
@@ -114,6 +125,8 @@ public final class RestClients {
 
 			clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());
 
+			clientConfiguration.getProxy().map(HttpHost::create).ifPresent(clientBuilder::setProxy);
+
 			return clientBuilder;
 		});
 

src/main/java/org/springframework/data/elasticsearch/client/TransportClientFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 
 	@Override
 	public boolean isSingleton() {
-		return false;
+		return true;
 	}
 
 	@Override

src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 package org.springframework.data.elasticsearch.client.reactive;
 
 import io.netty.channel.ChannelOption;
+import io.netty.handler.ssl.ApplicationProtocolConfig;
 import io.netty.handler.ssl.ClientAuth;
+import io.netty.handler.ssl.IdentityCipherSuiteFilter;
 import io.netty.handler.ssl.JdkSslContext;
 import io.netty.handler.timeout.ReadTimeoutHandler;
 import io.netty.handler.timeout.WriteTimeoutHandler;
@@ -47,7 +49,6 @@ import javax.net.ssl.SSLContext;
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.action.ActionRequest;
-import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.admin.indices.close.CloseIndexRequest;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
@@ -58,6 +59,8 @@ import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
+import org.elasticsearch.action.bulk.BulkRequest;
+import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.get.GetRequest;
@@ -77,6 +80,8 @@ import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.Request;
+import org.elasticsearch.client.core.CountRequest;
+import org.elasticsearch.client.core.CountResponse;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.DeprecationHandler;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
@@ -122,6 +127,9 @@ import org.springframework.web.reactive.function.client.WebClient.RequestBodySpe
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Peter-Josef Meisch
+ * @author Huw Ayling-Miller
+ * @author Henrique Amaral
  * @since 3.2
  * @see ClientConfiguration
  * @see ReactiveRestClients
@@ -204,11 +212,16 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 
 		if (clientConfiguration.useSsl()) {
 
-			httpClient = httpClient.secure(sslConfig -> {
+			Optional<SSLContext> sslContext = clientConfiguration.getSslContext();
 
-				Optional<SSLContext> sslContext = clientConfiguration.getSslContext();
-				sslContext.ifPresent(it -> sslConfig.sslContext(new JdkSslContext(it, true, ClientAuth.NONE)));
-			});
+			if (sslContext.isPresent()) {
+				httpClient = httpClient.secure(sslContextSpec -> {
+					sslContextSpec.sslContext(new JdkSslContext(sslContext.get(), true, null, IdentityCipherSuiteFilter.INSTANCE,
+							ApplicationProtocolConfig.DISABLED, ClientAuth.NONE, null, false));
+				});
+			} else {
+				httpClient = httpClient.secure();
+			}
 
 			scheme = "https";
 		}
@@ -216,7 +229,13 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 		ReactorClientHttpConnector connector = new ReactorClientHttpConnector(httpClient);
 		WebClientProvider provider = WebClientProvider.create(scheme, connector);
 
-		return provider.withDefaultHeaders(clientConfiguration.getDefaultHeaders());
+		if (clientConfiguration.getPathPrefix() != null) {
+			provider = provider.withPathPrefix(clientConfiguration.getPathPrefix());
+		}
+
+		provider = provider.withDefaultHeaders(clientConfiguration.getDefaultHeaders()) //
+				.withWebClientConfigurer(clientConfiguration.getWebClientConfigurer());
+		return provider;
 	}
 
 	/*
@@ -319,6 +338,17 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.publishNext();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#count(org.springframework.http.HttpHeaders, org.elasticsearch.action.search.SearchRequest)
+	 */
+	@Override
+	public Mono<Long> count(HttpHeaders headers, CountRequest countRequest) {
+		return sendRequest(countRequest, RequestCreator.count(), CountResponse.class, headers) //
+				.map(CountResponse::getCount) //
+				.next();
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#ping(org.springframework.http.HttpHeaders, org.elasticsearch.action.search.SearchRequest)
@@ -423,6 +453,16 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.publishNext();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#bulk(org.springframework.http.HttpHeaders, org.elasticsearch.action.bulk.BulkRequest)
+	 */
+	@Override
+	public Mono<BulkResponse> bulk(HttpHeaders headers, BulkRequest bulkRequest) {
+		return sendRequest(bulkRequest, RequestCreator.bulk(), BulkResponse.class, headers) //
+				.publishNext();
+	}
+
 	// --> INDICES
 
 	/*
@@ -553,13 +593,12 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 
 	// -->
 
-	private <Req extends ActionRequest, Resp extends ActionResponse> Flux<Resp> sendRequest(Req request,
-			Function<Req, Request> converter, Class<Resp> responseType, HttpHeaders headers) {
+	private <Req extends ActionRequest, Resp> Flux<Resp> sendRequest(Req request, Function<Req, Request> converter,
+			Class<Resp> responseType, HttpHeaders headers) {
 		return sendRequest(converter.apply(request), responseType, headers);
 	}
 
-	private <AR extends ActionResponse> Flux<AR> sendRequest(Request request, Class<AR> responseType,
-			HttpHeaders headers) {
+	private <Resp> Flux<Resp> sendRequest(Request request, Class<Resp> responseType, HttpHeaders headers) {
 
 		String logId = ClientLogger.newLogId();
 
@@ -742,6 +781,18 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 			};
 		}
 
+		static Function<BulkRequest, Request> bulk() {
+
+			return request -> {
+
+				try {
+					return RequestConverters.bulk(request);
+				} catch (IOException e) {
+					throw new ElasticsearchException("Could not parse request", e);
+				}
+			};
+		}
+
 		// --> INDICES
 
 		static Function<GetIndexRequest, Request> indexExists() {
@@ -776,6 +827,10 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 			return RequestConverters::flushIndex;
 		}
 
+		static Function<CountRequest, Request> count() {
+			return RequestConverters::count;
+		}
+
 	}
 
 	/**

src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultWebClientProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ import java.net.InetSocketAddress;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.client.reactive.ClientHttpConnector;
@@ -32,6 +33,8 @@ import org.springframework.web.reactive.function.client.WebClient.Builder;
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Huw Ayling-Miller
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 class DefaultWebClientProvider implements WebClientProvider {
@@ -42,6 +45,8 @@ class DefaultWebClientProvider implements WebClientProvider {
 	private final @Nullable ClientHttpConnector connector;
 	private final Consumer<Throwable> errorListener;
 	private final HttpHeaders headers;
+	private final String pathPrefix;
+	private final Function<WebClient, WebClient> webClientConfigurer;
 
 	/**
 	 * Create new {@link DefaultWebClientProvider} with empty {@link HttpHeaders} and no-op {@literal error listener}.
@@ -50,35 +55,38 @@ class DefaultWebClientProvider implements WebClientProvider {
 	 * @param connector can be {@literal null}.
 	 */
 	DefaultWebClientProvider(String scheme, @Nullable ClientHttpConnector connector) {
-		this(scheme, connector, e -> {}, HttpHeaders.EMPTY);
+		this(scheme, connector, e -> {}, HttpHeaders.EMPTY, null, Function.identity());
 	}
 
 	/**
 	 * Create new {@link DefaultWebClientProvider} with empty {@link HttpHeaders} and no-op {@literal error listener}.
-	 * 
+	 *
 	 * @param scheme must not be {@literal null}.
-	 * @param connector can be {@literal null}.
-	 * @param errorListener must not be {@literal null}.
-	 * @param headers must not be {@literal null}.
+     * @param connector can be {@literal null}.
+     * @param errorListener must not be {@literal null}.
+     * @param headers must not be {@literal null}.
+     * @param pathPrefix can be {@literal null}
+     * @param webClientConfigurer must not be {@literal null}.
 	 */
 	private DefaultWebClientProvider(String scheme, @Nullable ClientHttpConnector connector,
-			Consumer<Throwable> errorListener, HttpHeaders headers) {
+			Consumer<Throwable> errorListener, HttpHeaders headers, @Nullable String pathPrefix,
+			Function<WebClient, WebClient> webClientConfigurer) {
 
 		Assert.notNull(scheme, "Scheme must not be null! A common scheme would be 'http'.");
-		Assert.notNull(errorListener, "ErrorListener must not be null! You may want use a no-op one 'e -> {}' instead.");
+		Assert.notNull(errorListener, "errorListener must not be null! You may want use a no-op one 'e -> {}' instead.");
 		Assert.notNull(headers, "headers must not be null! Think about using 'HttpHeaders.EMPTY' as an alternative.");
+		Assert.notNull(webClientConfigurer,
+				"webClientConfigurer must not be null! You may want use a no-op one 'Function.identity()' instead.");
 
 		this.cachedClients = new ConcurrentHashMap<>();
 		this.scheme = scheme;
 		this.connector = connector;
 		this.errorListener = errorListener;
 		this.headers = headers;
+		this.pathPrefix = pathPrefix;
+		this.webClientConfigurer = webClientConfigurer;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.reactive.WebClientProvider#get(java.net.InetSocketAddress)
-	 */
 	@Override
 	public WebClient get(InetSocketAddress endpoint) {
 
@@ -87,19 +95,21 @@ class DefaultWebClientProvider implements WebClientProvider {
 		return this.cachedClients.computeIfAbsent(endpoint, this::createWebClientForSocketAddress);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.reactive.WebClientProvider#getDefaultHeaders()
-	 */
 	@Override
 	public HttpHeaders getDefaultHeaders() {
 		return headers;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.reactive.WebClientProvider#withDefaultHeaders(org.springframework.http.HttpHeaders)
-	 */
+	@Override
+	public Consumer<Throwable> getErrorListener() {
+		return this.errorListener;
+	}
+
+	@Override
+	public String getPathPrefix() {
+		return pathPrefix;
+	}
+
 	@Override
 	public WebClientProvider withDefaultHeaders(HttpHeaders headers) {
 
@@ -109,31 +119,33 @@ class DefaultWebClientProvider implements WebClientProvider {
 		merged.addAll(this.headers);
 		merged.addAll(headers);
 
-		return new DefaultWebClientProvider(this.scheme, this.connector, errorListener, merged);
+		return new DefaultWebClientProvider(scheme, connector, errorListener, merged, pathPrefix, webClientConfigurer);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.reactive.WebClientProvider#getErrorListener()
-	 */
-	@Override
-	public Consumer<Throwable> getErrorListener() {
-		return this.errorListener;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.reactive.WebClientProvider#withErrorListener(java.util.function.Consumer)
-	 */
 	@Override
 	public WebClientProvider withErrorListener(Consumer<Throwable> errorListener) {
 
 		Assert.notNull(errorListener, "Error listener must not be null.");
 
 		Consumer<Throwable> listener = this.errorListener.andThen(errorListener);
-		return new DefaultWebClientProvider(this.scheme, this.connector, listener, this.headers);
+		return new DefaultWebClientProvider(scheme, this.connector, listener, headers, pathPrefix, webClientConfigurer);
 	}
 
+	@Override
+	public WebClientProvider withPathPrefix(String pathPrefix) {
+		Assert.notNull(pathPrefix, "pathPrefix must not be null.");
+
+		return new DefaultWebClientProvider(this.scheme, this.connector, this.errorListener, this.headers, pathPrefix,
+				webClientConfigurer);
+	}
+
+	@Override
+	public WebClientProvider withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer) {
+		return new DefaultWebClientProvider(scheme, connector, errorListener, headers, pathPrefix, webClientConfigurer);
+
+	}
+
+
 	protected WebClient createWebClientForSocketAddress(InetSocketAddress socketAddress) {
 
 		Builder builder = WebClient.builder().defaultHeaders(it -> it.addAll(getDefaultHeaders()));
@@ -142,7 +154,9 @@ class DefaultWebClientProvider implements WebClientProvider {
 			builder = builder.clientConnector(connector);
 		}
 
-		String baseUrl = String.format("%s://%s:%d", this.scheme, socketAddress.getHostString(), socketAddress.getPort());
-		return builder.baseUrl(baseUrl).filter((request, next) -> next.exchange(request).doOnError(errorListener)).build();
+		String baseUrl = String.format("%s://%s:%d%s", this.scheme, socketAddress.getHostString(), socketAddress.getPort(),
+				pathPrefix == null ? "" : '/' + pathPrefix);
+		WebClient webClient = builder.baseUrl(baseUrl).filter((request, next) -> next.exchange(request).doOnError(errorListener)).build();
+		return webClientConfigurer.apply(webClient);
 	}
 }

src/main/java/org/springframework/data/elasticsearch/client/reactive/HostProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/reactive/MultiNodeHostProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,29 +15,22 @@
  */
 package org.springframework.data.elasticsearch.client.reactive;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.List;
-
 import org.elasticsearch.action.ActionResponse;
-import org.springframework.core.ParameterizedTypeReference;
+
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseCookie;
-import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.reactive.ClientHttpResponse;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.reactive.function.BodyExtractor;
 import org.springframework.web.reactive.function.client.ClientResponse;
-import org.springframework.web.reactive.function.client.ExchangeStrategies;
 
 /**
- * Extension to {@link ActionResponse} that also implements {@link ClientResponse}.
+ * Extension to {@link ActionResponse} that also delegates to {@link ClientResponse}.
  *
  * @author Christoph Strobl
+ * @author Peter-Josef Meisch
+ * @author Mark Paluch
  * @since 3.2
  */
-class RawActionResponse extends ActionResponse implements ClientResponse {
+class RawActionResponse extends ActionResponse {
 
 	private final ClientResponse delegate;
 
@@ -49,129 +42,23 @@ class RawActionResponse extends ActionResponse implements ClientResponse {
 		return new RawActionResponse(response);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#statusCode()
-	 */
-	@Override
 	public HttpStatus statusCode() {
 		return delegate.statusCode();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#rawStatusCode()
-	 */
-	@Override
-	public int rawStatusCode() {
-		return delegate.rawStatusCode();
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.web.reactive.function.client.ClientResponse#headers()
 	 */
-	@Override
-	public Headers headers() {
+	public ClientResponse.Headers headers() {
 		return delegate.headers();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#cookies()
-	 */
-	@Override
-	public MultiValueMap<String, ResponseCookie> cookies() {
-		return delegate.cookies();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#strategies()
-	 */
-	@Override
-	public ExchangeStrategies strategies() {
-		return delegate.strategies();
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.web.reactive.function.client.ClientResponse#body(org.springframework.web.reactive.function.BodyExtractor)
 	 */
-	@Override
 	public <T> T body(BodyExtractor<T, ? super ClientHttpResponse> extractor) {
 		return delegate.body(extractor);
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#bodyToMono(java.lang.Class)
-	 */
-	@Override
-	public <T> Mono<T> bodyToMono(Class<? extends T> elementClass) {
-		return delegate.bodyToMono(elementClass);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#bodyToMono(org.springframework.core.ParameterizedTypeReference)
-	 */
-	@Override
-	public <T> Mono<T> bodyToMono(ParameterizedTypeReference<T> typeReference) {
-		return delegate.bodyToMono(typeReference);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#bodyToFlux(java.lang.Class)
-	 */
-	@Override
-	public <T> Flux<T> bodyToFlux(Class<? extends T> elementClass) {
-		return delegate.bodyToFlux(elementClass);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#bodyToFlux(org.springframework.core.ParameterizedTypeReference)
-	 */
-	@Override
-	public <T> Flux<T> bodyToFlux(ParameterizedTypeReference<T> typeReference) {
-		return delegate.bodyToFlux(typeReference);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#toEntity(java.lang.Class)
-	 */
-	@Override
-	public <T> Mono<ResponseEntity<T>> toEntity(Class<T> bodyType) {
-		return delegate.toEntity(bodyType);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#toEntity(org.springframework.core.ParameterizedTypeReference)
-	 */
-	@Override
-	public <T> Mono<ResponseEntity<T>> toEntity(ParameterizedTypeReference<T> typeReference) {
-		return delegate.toEntity(typeReference);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#toEntityList(java.lang.Class)
-	 */
-	@Override
-	public <T> Mono<ResponseEntity<List<T>>> toEntityList(Class<T> elementType) {
-		return delegate.toEntityList(elementType);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.web.reactive.function.client.ClientResponse#toEntityList(org.springframework.core.ParameterizedTypeReference)
-	 */
-	@Override
-	public <T> Mono<ResponseEntity<List<T>>> toEntityList(ParameterizedTypeReference<T> typeReference) {
-		return delegate.toEntityList(typeReference);
-	}
 }

src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,8 @@ import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
+import org.elasticsearch.action.bulk.BulkRequest;
+import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.get.GetRequest;
@@ -41,11 +43,11 @@ import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateResponse;
+import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.index.get.GetResult;
 import org.elasticsearch.index.reindex.BulkByScrollResponse;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.search.SearchHit;
-
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
 import org.springframework.http.HttpHeaders;
@@ -58,6 +60,8 @@ import org.springframework.web.reactive.function.client.WebClient;
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Peter-Josef Meisch
+ * @author Henrique Amaral
  * @since 3.2
  * @see ClientConfiguration
  * @see ReactiveRestClients
@@ -329,6 +333,47 @@ public interface ReactiveElasticsearchClient {
 	 */
 	Mono<DeleteResponse> delete(HttpHeaders headers, DeleteRequest deleteRequest);
 
+	/**
+	 * Execute a {@link SearchRequest} against the {@literal count} API.
+	 *
+	 * @param consumer new {@literal null}.
+	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-count.html">Count API on
+	 *      elastic.co</a>
+	 * @return the {@link Mono} emitting the count result.
+	 * @since 3.2.4
+	 */
+	default Mono<Long> count(Consumer<CountRequest> consumer) {
+
+		CountRequest countRequest = new CountRequest();
+		consumer.accept(countRequest);
+		return count(countRequest);
+	}
+
+	/**
+	 * Execute a {@link SearchRequest} against the {@literal count} API.
+	 *
+	 * @param countRequest must not be {@literal null}.
+	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-count.html">Count API on
+	 *      elastic.co</a>
+	 * @return the {@link Mono} emitting the count result.
+	 * @since 3.2.4
+	 */
+	default Mono<Long> count(CountRequest countRequest) {
+		return count(HttpHeaders.EMPTY, countRequest);
+	}
+
+	/**
+	 * Execute a {@link SearchRequest} against the {@literal count} API.
+	 *
+	 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
+	 * @param countRequest must not be {@literal null}.
+	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-count.html">Count API on
+	 *      elastic.co</a>
+	 * @return the {@link Mono} emitting the count result.
+	 * @since 3.2.4
+	 */
+	Mono<Long> count(HttpHeaders headers, CountRequest countRequest);
+
 	/**
 	 * Execute a {@link SearchRequest} against the {@literal search} API.
 	 *
@@ -430,6 +475,44 @@ public interface ReactiveElasticsearchClient {
 	 */
 	Mono<BulkByScrollResponse> deleteBy(HttpHeaders headers, DeleteByQueryRequest deleteRequest);
 
+	/**
+	 * Execute a {@link BulkRequest} against the {@literal bulk} API.
+	 *
+	 * @param consumer never {@literal null}.
+	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html">Bulk API on
+	 *      elastic.co</a>
+	 * @return a {@link Mono} emitting the emitting operation response.
+	 */
+	default Mono<BulkResponse> bulk(Consumer<BulkRequest> consumer) {
+
+		BulkRequest request = new BulkRequest();
+		consumer.accept(request);
+		return bulk(request);
+	}
+
+	/**
+	 * Execute a {@link BulkRequest} against the {@literal bulk} API.
+	 *
+	 * @param bulkRequest must not be {@literal null}.
+	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html">Bulk API on
+	 *      elastic.co</a>
+	 * @return a {@link Mono} emitting the emitting operation response.
+	 */
+	default Mono<BulkResponse> bulk(BulkRequest bulkRequest) {
+		return bulk(HttpHeaders.EMPTY, bulkRequest);
+	}
+
+	/**
+	 * Execute a {@link BulkRequest} against the {@literal bulk} API.
+	 *
+	 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
+	 * @param bulkRequest must not be {@literal null}.
+	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html">Bulk API on
+	 *      elastic.co</a>
+	 * @return a {@link Mono} emitting operation response.
+	 */
+	Mono<BulkResponse> bulk(HttpHeaders headers, BulkRequest bulkRequest);
+
 	/**
 	 * Compose the actual command/s to run against Elasticsearch using the underlying {@link WebClient connection}.
 	 * {@link #execute(ReactiveElasticsearchClientCallback) Execute} selects an active server from the available ones and

src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveRestClients.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/reactive/RequestBodyEncodingException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/reactive/SingleNodeHostProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/reactive/WebClientProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.springframework.data.elasticsearch.client.reactive;
 
 import java.net.InetSocketAddress;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.client.reactive.ClientHttpConnector;
@@ -34,6 +35,8 @@ import org.springframework.web.reactive.function.client.WebClient;
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Huw Ayling-Miller
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 public interface WebClientProvider {
@@ -96,6 +99,14 @@ public interface WebClientProvider {
 	 */
 	Consumer<Throwable> getErrorListener();
 
+	/**
+	 * Obtain the {@link String pathPrefix} to be used.
+	 *
+	 * @return the pathPrefix if set.
+	 * @since 3.2.4
+	 */
+	String getPathPrefix();
+
 	/**
 	 * Create a new instance of {@link WebClientProvider} applying the given headers by default.
 	 *
@@ -111,4 +122,21 @@ public interface WebClientProvider {
 	 * @return new instance of {@link WebClientProvider}.
 	 */
 	WebClientProvider withErrorListener(Consumer<Throwable> errorListener);
+
+	/**
+	 * Create a new instance of {@link WebClientProvider} where HTTP requests are called with the given path prefix.
+	 *
+	 * @param pathPrefix Path prefix to add to requests
+	 * @return new instance of {@link WebClientProvider}
+	 * @since 3.2.4
+	 */
+	WebClientProvider withPathPrefix(String pathPrefix);
+
+	/**
+	 * Create a new instance of {@link WebClientProvider} calling the given {@link Function} to configure the {@link WebClient}.
+	 * @param webClientConfigurer configuration function
+	 * @return new instance of {@link WebClientProvider}
+	 * @since 3.2.4
+	 */
+	WebClientProvider withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer);
 }

src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,8 +60,8 @@ import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.client.RethrottleRequest;
+import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
-import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.SuppressForbidden;
@@ -82,10 +82,12 @@ import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.index.reindex.ReindexRequest;
 import org.elasticsearch.index.reindex.UpdateByQueryRequest;
+import org.elasticsearch.index.seqno.SequenceNumbers;
 import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
 import org.elasticsearch.tasks.TaskId;
 import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
 import org.springframework.http.HttpMethod;
+import org.springframework.lang.Nullable;
 
 /**
  * <p>
@@ -97,6 +99,8 @@ import org.springframework.http.HttpMethod;
  * <p>
  * Only intended for internal use.
  *
+ * @author Christoph Strobl
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 public class RequestConverters {
@@ -116,6 +120,8 @@ public class RequestConverters {
 		parameters.withTimeout(deleteRequest.timeout());
 		parameters.withVersion(deleteRequest.version());
 		parameters.withVersionType(deleteRequest.versionType());
+		parameters.withIfSeqNo(deleteRequest.ifSeqNo());
+		parameters.withIfPrimaryTerm(deleteRequest.ifPrimaryTerm());
 		parameters.withRefreshPolicy(deleteRequest.getRefreshPolicy());
 		parameters.withWaitForActiveShards(deleteRequest.waitForActiveShards());
 		return request;
@@ -315,6 +321,8 @@ public class RequestConverters {
 		parameters.withTimeout(indexRequest.timeout());
 		parameters.withVersion(indexRequest.version());
 		parameters.withVersionType(indexRequest.versionType());
+		parameters.withIfSeqNo(indexRequest.ifSeqNo());
+		parameters.withIfPrimaryTerm(indexRequest.ifPrimaryTerm());
 		parameters.withPipeline(indexRequest.getPipeline());
 		parameters.withRefreshPolicy(indexRequest.getRefreshPolicy());
 		parameters.withWaitForActiveShards(indexRequest.waitForActiveShards());
@@ -381,6 +389,32 @@ public class RequestConverters {
 		return request;
 	}
 
+	/**
+	 * Creates a count request.
+	 *
+	 * @param countRequest the search defining the data to be counted
+	 * @return Elasticsearch count request
+	 * @since 3.2
+	 */
+	public static Request count(CountRequest countRequest) {
+		Request request = new Request(HttpMethod.POST.name(),
+				endpoint(countRequest.indices(), countRequest.types(), "_count"));
+
+		Params params = new Params(request);
+		addCountRequestParams(params, countRequest);
+
+		if (countRequest.source() != null) {
+			request.setEntity(createEntity(countRequest.source(), REQUEST_BODY_CONTENT_TYPE));
+		}
+		return request;
+	}
+
+	private static void addCountRequestParams(Params params, CountRequest countRequest) {
+		params.withRouting(countRequest.routing());
+		params.withPreference(countRequest.preference());
+		params.withIndicesOptions(countRequest.indicesOptions());
+	}
+
 	private static void addSearchRequestParams(Params params, SearchRequest searchRequest) {
 		params.putParam("typed_keys", "true");
 		params.withRouting(searchRequest.routing());
@@ -917,6 +951,20 @@ public class RequestConverters {
 			return this;
 		}
 
+		Params withIfSeqNo(long seqNo) {
+			if (seqNo != SequenceNumbers.UNASSIGNED_SEQ_NO) {
+				return putParam("if_seq_no", Long.toString(seqNo));
+			}
+			return this;
+		}
+
+		Params withIfPrimaryTerm(long primaryTerm) {
+			if (primaryTerm != SequenceNumbers.UNASSIGNED_PRIMARY_TERM) {
+				return putParam("if_primary_term", Long.toString(primaryTerm));
+			}
+			return this;
+		}
+
 		Params withWaitForActiveShards(ActiveShardCount activeShardCount) {
 			return withWaitForActiveShards(activeShardCount, ActiveShardCount.DEFAULT);
 		}

src/main/java/org/springframework/data/elasticsearch/config/AbstractElasticsearchConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/AbstractReactiveElasticsearchConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/NodeClientBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/RestClientBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/TransportClientBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java

@@ -0,0 +1,54 @@
+package org.springframework.data.elasticsearch.core;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.elasticsearch.ElasticsearchException;
+import org.springframework.data.elasticsearch.annotations.Mapping;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+/**
+ * AbstractElasticsearchTemplate
+ * 
+ * @author Sascha Woo
+ */
+public abstract class AbstractElasticsearchTemplate {
+
+	static final Integer INDEX_MAX_RESULT_WINDOW = 10_000;
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(AbstractElasticsearchTemplate.class);
+
+	protected ElasticsearchConverter elasticsearchConverter;
+
+	public AbstractElasticsearchTemplate(ElasticsearchConverter elasticsearchConverter) {
+
+		Assert.notNull(elasticsearchConverter, "elasticsearchConverter must not be null.");
+		this.elasticsearchConverter = elasticsearchConverter;
+	}
+
+	protected String buildMapping(Class<?> clazz) {
+
+		// load mapping specified in Mapping annotation if present
+		if (clazz.isAnnotationPresent(Mapping.class)) {
+			String mappingPath = clazz.getAnnotation(Mapping.class).mappingPath();
+			if (!StringUtils.isEmpty(mappingPath)) {
+				String mappings = ResourceUtil.readFileFromClasspath(mappingPath);
+				if (!StringUtils.isEmpty(mappings)) {
+					return mappings;
+				}
+			} else {
+				LOGGER.info("mappingPath in @Mapping has to be defined. Building mappings using @Field");
+			}
+		}
+
+		// build mapping from field annotations
+		try {
+			MappingBuilder mappingBuilder = new MappingBuilder(elasticsearchConverter);
+			return mappingBuilder.buildPropertyMapping(clazz);
+		} catch (Exception e) {
+			throw new ElasticsearchException("Failed to build mapping for " + clazz.getSimpleName(), e);
+		}
+	}
+
+}

src/main/java/org/springframework/data/elasticsearch/core/AbstractResultMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/DefaultEntityMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 
 import org.elasticsearch.action.get.GetResponse;
@@ -29,6 +28,7 @@ import org.elasticsearch.action.get.MultiGetResponse;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.document.DocumentField;
 import org.elasticsearch.search.SearchHit;
+
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.data.domain.Pageable;
@@ -189,8 +189,8 @@ public class DefaultResultMapper extends AbstractResultMapper {
 	}
 
 	@Override
-	public <T> LinkedList<T> mapResults(MultiGetResponse responses, Class<T> clazz) {
-		LinkedList<T> list = new LinkedList<>();
+	public <T> List<T> mapResults(MultiGetResponse responses, Class<T> clazz) {
+		List<T> list = new ArrayList<>();
 		for (MultiGetItemResponse response : responses.getResponses()) {
 			if (!response.isFailed() && response.getResponse().isExists()) {
 				T result = mapEntity(response.getResponse().getSourceAsString(), clazz);

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchEntityMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import com.fasterxml.jackson.databind.ObjectReader;
-import com.fasterxml.jackson.databind.ObjectWriter;
 import lombok.RequiredArgsConstructor;
 
 import java.io.IOException;
@@ -52,6 +50,8 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.ObjectWriter;
 
 /**
  * Elasticsearch specific {@link EntityReader} & {@link EntityWriter} implementation based on domain type
@@ -241,27 +241,31 @@ public class ElasticsearchEntityMapper implements
 		Map<String, Object> target = new LinkedHashMap<>();
 		for (Entry<String, Object> entry : source.entrySet()) {
 
-			if (isSimpleType(entry.getValue())) {
-				target.put(entry.getKey(),
-						readSimpleValue(entry.getValue(), targetType.isMap() ? targetType.getComponentType() : targetType));
+			String entryKey = entry.getKey();
+			Object entryValue = entry.getValue();
+
+			if (entryValue == null) {
+				target.put(entryKey, null);
+			} else if (isSimpleType(entryValue)) {
+				target.put(entryKey,
+						readSimpleValue(entryValue, targetType.isMap() ? targetType.getComponentType() : targetType));
 			} else {
 
-				ElasticsearchPersistentEntity<?> targetEntity = computeGenericValueTypeForRead(property, entry.getValue());
+				ElasticsearchPersistentEntity<?> targetEntity = computeGenericValueTypeForRead(property, entryValue);
 
 				if (targetEntity.getTypeInformation().isMap()) {
 
-					Map<String, Object> valueMap = (Map) entry.getValue();
+					Map<String, Object> valueMap = (Map) entryValue;
 					if (typeMapper.containsTypeInformation(valueMap)) {
-						target.put(entry.getKey(), readEntity(targetEntity, (Map) entry.getValue()));
+						target.put(entryKey, readEntity(targetEntity, (Map) entryValue));
 					} else {
-						target.put(entry.getKey(), readValue(valueMap, property, targetEntity.getTypeInformation()));
+						target.put(entryKey, readValue(valueMap, property, targetEntity.getTypeInformation()));
 					}
 
 				} else if (targetEntity.getTypeInformation().isCollectionLike()) {
-					target.put(entry.getKey(),
-							readValue(entry.getValue(), property, targetEntity.getTypeInformation().getActualType()));
+					target.put(entryKey, readValue(entryValue, property, targetEntity.getTypeInformation().getActualType()));
 				} else {
-					target.put(entry.getKey(), readEntity(targetEntity, (Map) entry.getValue()));
+					target.put(entryKey, readEntity(targetEntity, (Map) entryValue));
 				}
 			}
 		}
@@ -281,7 +285,9 @@ public class ElasticsearchEntityMapper implements
 
 		for (Object value : source) {
 
-			if (isSimpleType(value)) {
+			if (value == null) {
+				target.add(null);
+			} else if (isSimpleType(value)) {
 				target.add(
 						readSimpleValue(value, targetType.getComponentType() != null ? targetType.getComponentType() : targetType));
 			} else {
@@ -493,7 +499,14 @@ public class ElasticsearchEntityMapper implements
 
 		if (!typeHint.getActualType().getType().equals(Object.class)
 				&& isSimpleType(typeHint.getMapValueType().getType())) {
-			mapSource.forEach(it -> target.put(it.getKey(), getWriteSimpleValue(it.getValue())));
+			mapSource.forEach(it -> {
+
+				if (it.getValue() == null) {
+					target.put(it.getKey(), null);
+				} else {
+					target.put(it.getKey(), getWriteSimpleValue(it.getValue()));
+				}
+			});
 		} else {
 
 			mapSource.forEach(it -> {

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchExceptionTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchOperations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,20 +15,28 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import org.elasticsearch.action.update.UpdateResponse;
-import org.elasticsearch.cluster.metadata.AliasMetaData;
-import org.elasticsearch.common.Nullable;
-import org.springframework.data.domain.Page;
-import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
-import org.springframework.data.elasticsearch.core.query.*;
-import org.springframework.data.util.CloseableIterator;
-
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.elasticsearch.action.update.UpdateResponse;
+import org.elasticsearch.cluster.metadata.AliasMetaData;
+import org.springframework.data.domain.Page;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.query.AliasQuery;
+import org.springframework.data.elasticsearch.core.query.BulkOptions;
+import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
+import org.springframework.data.elasticsearch.core.query.DeleteQuery;
+import org.springframework.data.elasticsearch.core.query.GetQuery;
+import org.springframework.data.elasticsearch.core.query.IndexQuery;
+import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
+import org.springframework.data.elasticsearch.core.query.SearchQuery;
+import org.springframework.data.elasticsearch.core.query.StringQuery;
+import org.springframework.data.elasticsearch.core.query.UpdateQuery;
+import org.springframework.data.util.CloseableIterator;
+import org.springframework.lang.Nullable;
+
 /**
  * ElasticsearchOperations
  *
@@ -37,13 +45,25 @@ import java.util.stream.Collectors;
  * @author Kevin Leturc
  * @author Zetang Zeng
  * @author Dmitriy Yakovlev
+ * @author Peter-Josef Meisch
  */
 public interface ElasticsearchOperations {
 
 	/**
-	 * @return Converter in use
+	 * adding new alias
+	 *
+	 * @param query
+	 * @return
 	 */
-	ElasticsearchConverter getElasticsearchConverter();
+	boolean addAlias(AliasQuery query);
+
+	/**
+	 * removing previously created alias
+	 *
+	 * @param query
+	 * @return
+	 */
+	boolean removeAlias(AliasQuery query);
 
 	/**
 	 * Create an index for a class
@@ -84,6 +104,16 @@ public interface ElasticsearchOperations {
 	 */
 	<T> boolean putMapping(Class<T> clazz);
 
+	/**
+	 * Create mapping for the given class and put the mapping to the given indexName and type.
+	 *
+	 * @param indexName
+	 * @param type
+	 * @param mappings
+	 * @since 3.2
+	 */
+	<T> boolean putMapping(String indexName, String type, Class<T> clazz);
+
 	/**
 	 * Create mapping for a given indexName and type
 	 *
@@ -101,14 +131,13 @@ public interface ElasticsearchOperations {
 	 */
 	<T> boolean putMapping(Class<T> clazz, Object mappings);
 
-
 	/**
 	 * Get mapping for a class
 	 *
 	 * @param clazz
 	 * @param <T>
 	 */
-	<T> Map getMapping(Class<T> clazz);
+	<T> Map<String, Object> getMapping(Class<T> clazz);
 
 	/**
 	 * Get mapping for a given indexName and type
@@ -116,22 +145,31 @@ public interface ElasticsearchOperations {
 	 * @param indexName
 	 * @param type
 	 */
-	Map getMapping(String indexName, String type);
+	Map<String, Object> getMapping(String indexName, String type);
 
 	/**
 	 * Get settings for a given indexName
 	 *
 	 * @param indexName
 	 */
-	Map getSetting(String indexName);
+	Map<String, Object> getSetting(String indexName);
 
 	/**
 	 * Get settings for a given class
 	 *
 	 * @param clazz
 	 */
-	<T> Map getSetting(Class<T> clazz);
+	<T> Map<String, Object> getSetting(Class<T> clazz);
 
+	/**
+	 * get all the alias pointing to specified index
+	 *
+	 * @param indexName
+	 * @return
+	 */
+	List<AliasMetaData> queryForAlias(String indexName);
+
+	<T> T query(SearchQuery query, ResultsExtractor<T> resultsExtractor);
 
 	/**
 	 * Execute the query against elasticsearch and return the first returned object
@@ -198,7 +236,8 @@ public interface ElasticsearchOperations {
 	<T> List<Page<T>> queryForPage(List<SearchQuery> queries, Class<T> clazz);
 
 	/**
-	 * Execute the multi-search against elasticsearch and return result as {@link List} of {@link Page} using custom mapper
+	 * Execute the multi-search against elasticsearch and return result as {@link List} of {@link Page} using custom
+	 * mapper
 	 *
 	 * @param queries
 	 * @param clazz
@@ -216,7 +255,8 @@ public interface ElasticsearchOperations {
 	List<Page<?>> queryForPage(List<SearchQuery> queries, List<Class<?>> classes);
 
 	/**
-	 * Execute the multi-search against elasticsearch and return result as {@link List} of {@link Page} using custom mapper
+	 * Execute the multi-search against elasticsearch and return result as {@link List} of {@link Page} using custom
+	 * mapper
 	 *
 	 * @param queries
 	 * @param classes
@@ -254,7 +294,8 @@ public interface ElasticsearchOperations {
 	/**
 	 * Executes the given {@link CriteriaQuery} against elasticsearch and return result as {@link CloseableIterator}.
 	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps an Elasticsearch scroll context that needs to be closed in case of error.
+	 * Returns a {@link CloseableIterator} that wraps an Elasticsearch scroll context that needs to be closed in case of
+	 * error.
 	 *
 	 * @param <T> element return type
 	 * @param query
@@ -267,7 +308,8 @@ public interface ElasticsearchOperations {
 	/**
 	 * Executes the given {@link SearchQuery} against elasticsearch and return result as {@link CloseableIterator}.
 	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps an Elasticsearch scroll context that needs to be closed in case of error.
+	 * Returns a {@link CloseableIterator} that wraps an Elasticsearch scroll context that needs to be closed in case of
+	 * error.
 	 *
 	 * @param <T> element return type
 	 * @param query
@@ -278,9 +320,11 @@ public interface ElasticsearchOperations {
 	<T> CloseableIterator<T> stream(SearchQuery query, Class<T> clazz);
 
 	/**
-	 * Executes the given {@link SearchQuery} against elasticsearch and return result as {@link CloseableIterator} using custom mapper.
+	 * Executes the given {@link SearchQuery} against elasticsearch and return result as {@link CloseableIterator} using
+	 * custom mapper.
 	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps an Elasticsearch scroll context that needs to be closed in case of error.
+	 * Returns a {@link CloseableIterator} that wraps an Elasticsearch scroll context that needs to be closed in case of
+	 * error.
 	 *
 	 * @param <T> element return type
 	 * @param query
@@ -393,7 +437,7 @@ public interface ElasticsearchOperations {
 	 * @param clazz
 	 * @return
 	 */
-	<T> LinkedList<T> multiGet(SearchQuery searchQuery, Class<T> clazz);
+	<T> List<T> multiGet(SearchQuery searchQuery, Class<T> clazz);
 
 	/**
 	 * Execute a multiGet against elasticsearch for the given ids with MultiGetResultMapper
@@ -403,7 +447,7 @@ public interface ElasticsearchOperations {
 	 * @param multiGetResultMapper
 	 * @return
 	 */
-	<T> LinkedList<T> multiGet(SearchQuery searchQuery, Class<T> clazz, MultiGetResultMapper multiGetResultMapper);
+	<T> List<T> multiGet(SearchQuery searchQuery, Class<T> clazz, MultiGetResultMapper multiGetResultMapper);
 
 	/**
 	 * Index an object. Will do save or update
@@ -422,18 +466,40 @@ public interface ElasticsearchOperations {
 	UpdateResponse update(UpdateQuery updateQuery);
 
 	/**
-	 * Bulk index all objects. Will do save or update
+	 * Bulk index all objects. Will do save or update.
 	 *
-	 * @param queries
+	 * @param queries the queries to execute in bulk
 	 */
-	void bulkIndex(List<IndexQuery> queries);
+	default void bulkIndex(List<IndexQuery> queries) {
+		bulkIndex(queries, BulkOptions.defaultOptions());
+	}
+
+	/**
+	 * Bulk index all objects. Will do save or update.
+	 *
+	 * @param queries the queries to execute in bulk
+	 * @param bulkOptions options to be added to the bulk request
+	 * @since 3.2
+	 */
+	void bulkIndex(List<IndexQuery> queries, BulkOptions bulkOptions);
 
 	/**
 	 * Bulk update all objects. Will do update
 	 *
-	 * @param queries
+	 * @param queries the queries to execute in bulk
 	 */
-	void bulkUpdate(List<UpdateQuery> queries);
+	default void bulkUpdate(List<UpdateQuery> queries) {
+		bulkUpdate(queries, BulkOptions.defaultOptions());
+	}
+
+	/**
+	 * Bulk update all objects. Will do update
+	 *
+	 * @param queries the queries to execute in bulk
+	 * @param bulkOptions options to be added to the bulk request
+	 * @since 3.2
+	 */
+	void bulkUpdate(List<UpdateQuery> queries, BulkOptions bulkOptions);
 
 	/**
 	 * Delete the one object with provided id
@@ -445,7 +511,6 @@ public interface ElasticsearchOperations {
 	 */
 	String delete(String indexName, String type, String id);
 
-
 	/**
 	 * Delete all records matching the criteria
 	 *
@@ -453,6 +518,7 @@ public interface ElasticsearchOperations {
 	 * @param criteriaQuery
 	 */
 	<T> void delete(CriteriaQuery criteriaQuery, Class<T> clazz);
+
 	/**
 	 * Delete the one object with provided id
 	 *
@@ -524,7 +590,6 @@ public interface ElasticsearchOperations {
 	 * refresh the index
 	 *
 	 * @param indexName
-	 *
 	 */
 	void refresh(String indexName);
 
@@ -532,7 +597,6 @@ public interface ElasticsearchOperations {
 	 * refresh the index
 	 *
 	 * @param clazz
-	 *
 	 */
 	<T> void refresh(Class<T> clazz);
 
@@ -541,7 +605,7 @@ public interface ElasticsearchOperations {
 	 *
 	 * @param query The search query.
 	 * @param scrollTimeInMillis The time in millisecond for scroll feature
-	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
+	 *          {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
 	 * @param clazz The class of entity to retrieve.
 	 * @return The scan id for input query.
 	 */
@@ -552,18 +616,19 @@ public interface ElasticsearchOperations {
 	 *
 	 * @param query The search query.
 	 * @param scrollTimeInMillis The time in millisecond for scroll feature
-	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
+	 *          {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
 	 * @param mapper Custom impl to map result to entities
 	 * @return The scan id for input query.
 	 */
-	<T> ScrolledPage<T> startScroll(long scrollTimeInMillis, SearchQuery query, Class<T> clazz, SearchResultMapper mapper);
+	<T> ScrolledPage<T> startScroll(long scrollTimeInMillis, SearchQuery query, Class<T> clazz,
+			SearchResultMapper mapper);
 
 	/**
 	 * Returns scrolled page for given query
 	 *
 	 * @param criteriaQuery The search query.
 	 * @param scrollTimeInMillis The time in millisecond for scroll feature
-	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
+	 *          {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
 	 * @param clazz The class of entity to retrieve.
 	 * @return The scan id for input query.
 	 */
@@ -574,20 +639,22 @@ public interface ElasticsearchOperations {
 	 *
 	 * @param criteriaQuery The search query.
 	 * @param scrollTimeInMillis The time in millisecond for scroll feature
-	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
+	 *          {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
 	 * @param mapper Custom impl to map result to entities
 	 * @return The scan id for input query.
 	 */
-	<T> ScrolledPage<T> startScroll(long scrollTimeInMillis, CriteriaQuery criteriaQuery, Class<T> clazz, SearchResultMapper mapper);
-
+	<T> ScrolledPage<T> startScroll(long scrollTimeInMillis, CriteriaQuery criteriaQuery, Class<T> clazz,
+			SearchResultMapper mapper);
 
 	<T> ScrolledPage<T> continueScroll(@Nullable String scrollId, long scrollTimeInMillis, Class<T> clazz);
-	<T> ScrolledPage<T> continueScroll(@Nullable String scrollId, long scrollTimeInMillis, Class<T> clazz, SearchResultMapper mapper);
+
+	<T> ScrolledPage<T> continueScroll(@Nullable String scrollId, long scrollTimeInMillis, Class<T> clazz,
+			SearchResultMapper mapper);
+
 	/**
 	 * Clears the search contexts associated with specified scroll ids.
 	 *
 	 * @param scrollId
-	 *
 	 */
 	<T> void clearScroll(String scrollId);
 
@@ -601,33 +668,10 @@ public interface ElasticsearchOperations {
 	 */
 	<T> Page<T> moreLikeThis(MoreLikeThisQuery query, Class<T> clazz);
 
-	/**
-	 * adding new alias
-	 *
-	 * @param query
-	 * @return
-	 */
-	Boolean addAlias(AliasQuery query);
-
-	/**
-	 * removing previously created alias
-	 *
-	 * @param query
-	 * @return
-	 */
-	Boolean removeAlias(AliasQuery query);
-
-	/**
-	 * get all the alias pointing to specified index
-	 *
-	 * @param indexName
-	 * @return
-	 */
-	List<AliasMetaData> queryForAlias(String indexName);
-
-
-	<T> T query(SearchQuery query, ResultsExtractor<T> resultsExtractor);
-
-
 	ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz);
+
+	/**
+	 * @return Converter in use
+	 */
+	ElasticsearchConverter getElasticsearchConverter();
 }

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,16 +20,13 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.springframework.util.CollectionUtils.isEmpty;
 import static org.springframework.util.StringUtils.*;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Set;
 
@@ -65,7 +62,6 @@ import org.elasticsearch.client.Response;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.cluster.metadata.AliasMetaData;
-import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
@@ -83,23 +79,21 @@ import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.FieldSortBuilder;
+import org.elasticsearch.search.sort.ScoreSortBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
 import org.elasticsearch.search.suggest.SuggestBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.ElasticsearchException;
 import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Mapping;
 import org.springframework.data.elasticsearch.annotations.Setting;
 import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
 import org.springframework.data.elasticsearch.core.client.support.AliasData;
@@ -111,6 +105,7 @@ import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersiste
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.core.query.*;
 import org.springframework.data.util.CloseableIterator;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -142,13 +137,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  * @author Christoph Strobl
  * @author Lorenzo Spinelli
  * @author Dmitriy Yakovlev
+ * @author Roman Puchkovskiy
+ * @author Martin Choraine
+ * @author Farid Azaza
+ * @author Peter-Josef Meisch
+ * @author Mathias Teier
+ * @author Gyula Attila Csorogi
+ * @author Alexander Shabunevich
  */
-public class ElasticsearchRestTemplate
+public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate
 		implements ElasticsearchOperations, EsClient<RestHighLevelClient>, ApplicationContextAware {
 
 	private static final Logger logger = LoggerFactory.getLogger(ElasticsearchRestTemplate.class);
+
 	private RestHighLevelClient client;
-	private ElasticsearchConverter elasticsearchConverter;
 	private ResultsMapper resultsMapper;
 	private String searchTimeout;
 
@@ -177,8 +179,9 @@ public class ElasticsearchRestTemplate
 	public ElasticsearchRestTemplate(RestHighLevelClient client, ElasticsearchConverter elasticsearchConverter,
 			ResultsMapper resultsMapper) {
 
+		super(elasticsearchConverter);
+
 		Assert.notNull(client, "Client must not be null!");
-		Assert.notNull(elasticsearchConverter, "ElasticsearchConverter must not be null!");
 		Assert.notNull(resultsMapper, "ResultsMapper must not be null!");
 
 		this.client = client;
@@ -195,6 +198,54 @@ public class ElasticsearchRestTemplate
 		this.searchTimeout = searchTimeout;
 	}
 
+	@Override
+	public boolean addAlias(AliasQuery query) {
+		Assert.notNull(query.getIndexName(), "No index defined for Alias");
+		Assert.notNull(query.getAliasName(), "No alias defined");
+		IndicesAliasesRequest.AliasActions aliasAction = IndicesAliasesRequest.AliasActions.add()
+				.alias(query.getAliasName()).index(query.getIndexName());
+
+		if (query.getFilterBuilder() != null) {
+			aliasAction.filter(query.getFilterBuilder());
+		} else if (query.getFilter() != null) {
+			aliasAction.filter(query.getFilter());
+		} else if (hasText(query.getRouting())) {
+			aliasAction.routing(query.getRouting());
+		} else if (hasText(query.getSearchRouting())) {
+			aliasAction.searchRouting(query.getSearchRouting());
+		} else if (hasText(query.getIndexRouting())) {
+			aliasAction.indexRouting(query.getIndexRouting());
+		}
+
+		IndicesAliasesRequest request = new IndicesAliasesRequest();
+		request.addAliasAction(aliasAction);
+		try {
+			return client.indices().updateAliases(request, RequestOptions.DEFAULT).isAcknowledged();
+		} catch (IOException e) {
+			throw new ElasticsearchException("failed to update aliases with request: " + request, e);
+		}
+	}
+
+	@Override
+	public boolean removeAlias(AliasQuery query) {
+
+		Assert.notNull(query.getIndexName(), "No index defined for Alias");
+		Assert.notNull(query.getAliasName(), "No alias defined");
+
+		AliasActions aliasAction = IndicesAliasesRequest.AliasActions.remove() //
+				.index(query.getIndexName()) //
+				.alias(query.getAliasName());
+
+		IndicesAliasesRequest request = Requests.indexAliasesRequest() //
+				.addAliasAction(aliasAction);
+
+		try {
+			return client.indices().updateAliases(request, RequestOptions.DEFAULT).isAcknowledged();
+		} catch (IOException e) {
+			throw new ElasticsearchException("failed to update aliases with request: " + request, e);
+		}
+	}
+
 	@Override
 	public <T> boolean createIndex(Class<T> clazz) {
 		return createIndexIfNotCreated(clazz);
@@ -204,7 +255,7 @@ public class ElasticsearchRestTemplate
 	public boolean createIndex(String indexName) {
 		Assert.notNull(indexName, "No index defined for Query");
 		try {
-			return client.indices().create(Requests.createIndexRequest(indexName)).isAcknowledged();
+			return client.indices().create(createIndexRequest(indexName), RequestOptions.DEFAULT).isAcknowledged();
 		} catch (Exception e) {
 			throw new ElasticsearchException("Failed to create index " + indexName, e);
 		}
@@ -212,23 +263,7 @@ public class ElasticsearchRestTemplate
 
 	@Override
 	public <T> boolean putMapping(Class<T> clazz) {
-		if (clazz.isAnnotationPresent(Mapping.class)) {
-			String mappingPath = clazz.getAnnotation(Mapping.class).mappingPath();
-			if (hasText(mappingPath)) {
-				String mappings = readFileFromClasspath(mappingPath);
-				if (hasText(mappings)) {
-					return putMapping(clazz, mappings);
-				}
-			} else {
-				logger.info("mappingPath in @Mapping has to be defined. Building mappings using @Field");
-			}
-		}
-		try {
-			MappingBuilder mappingBuilder = new MappingBuilder(elasticsearchConverter);
-			return putMapping(clazz, mappingBuilder.buildPropertyMapping(clazz));
-		} catch (Exception e) {
-			throw new ElasticsearchException("Failed to build mapping for " + clazz.getSimpleName(), e);
-		}
+		return putMapping(clazz, buildMapping(clazz));
 	}
 
 	@Override
@@ -237,6 +272,11 @@ public class ElasticsearchRestTemplate
 				mapping);
 	}
 
+	@Override
+	public <T> boolean putMapping(String indexName, String type, Class<T> clazz) {
+		return putMapping(indexName, type, buildMapping(clazz));
+	}
+
 	@Override
 	public boolean putMapping(String indexName, String type, Object mapping) {
 		Assert.notNull(indexName, "No index defined for putMapping()");
@@ -250,17 +290,17 @@ public class ElasticsearchRestTemplate
 			request.source((XContentBuilder) mapping);
 		}
 		try {
-			return client.indices().putMapping(request).isAcknowledged();
+			return client.indices().putMapping(request, RequestOptions.DEFAULT).isAcknowledged();
 		} catch (IOException e) {
 			throw new ElasticsearchException("Failed to put mapping for " + indexName, e);
 		}
 	}
 
 	@Override
-	public Map getMapping(String indexName, String type) {
+	public Map<String, Object> getMapping(String indexName, String type) {
 		Assert.notNull(indexName, "No index defined for getMapping()");
 		Assert.notNull(type, "No type defined for getMapping()");
-		Map mappings = null;
+		Map<String, Object> mappings = null;
 		RestClient restClient = client.getLowLevelClient();
 		try {
 			Response response = restClient.performRequest("GET", "/" + indexName + "/_mapping/" + type);
@@ -273,7 +313,7 @@ public class ElasticsearchRestTemplate
 	}
 
 	@Override
-	public <T> Map getMapping(Class<T> clazz) {
+	public <T> Map<String, Object> getMapping(Class<T> clazz) {
 		return getMapping(getPersistentEntityFor(clazz).getIndexName(), getPersistentEntityFor(clazz).getIndexType());
 	}
 
@@ -281,7 +321,7 @@ public class ElasticsearchRestTemplate
 		ObjectMapper mapper = new ObjectMapper();
 
 		try {
-			Map result = null;
+			Map<String, Object> result = null;
 			JsonNode node = mapper.readTree(mappingResponse);
 
 			node = node.findValue("mappings").findValue(type);
@@ -311,9 +351,8 @@ public class ElasticsearchRestTemplate
 				query.getId());
 		GetResponse response;
 		try {
-			response = client.get(request);
-			T entity = mapper.mapResult(response, clazz);
-			return entity;
+			response = client.get(request, RequestOptions.DEFAULT);
+			return mapper.mapResult(response, clazz);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error while getting for request: " + request.toString(), e);
 		}
@@ -375,7 +414,7 @@ public class ElasticsearchRestTemplate
 	private MultiSearchResponse.Item[] getMultiSearchResult(MultiSearchRequest request) {
 		MultiSearchResponse response;
 		try {
-			response = client.multiSearch(request);
+			response = client.multiSearch(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request: " + request.toString(), e);
 		}
@@ -410,7 +449,7 @@ public class ElasticsearchRestTemplate
 
 	@Override
 	public <T> T query(SearchQuery query, ResultsExtractor<T> resultsExtractor) {
-		SearchResponse response = doSearch(prepareSearch(query, Optional.ofNullable(query.getQuery())), query);
+		SearchResponse response = doSearch(prepareSearch(query, Optional.ofNullable(query.getQuery()), null), query);
 		return resultsExtractor.extract(response);
 	}
 
@@ -431,14 +470,14 @@ public class ElasticsearchRestTemplate
 
 	@Override
 	public <T> List<String> queryForIds(SearchQuery query) {
-		SearchRequest request = prepareSearch(query, Optional.ofNullable(query.getQuery()));
+		SearchRequest request = prepareSearch(query, Optional.ofNullable(query.getQuery()), null);
 		request.source().query(query.getQuery());
 		if (query.getFilter() != null) {
 			request.source().postFilter(query.getFilter());
 		}
 		SearchResponse response;
 		try {
-			response = client.search(request);
+			response = client.search(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request: " + request.toString(), e);
 		}
@@ -470,7 +509,7 @@ public class ElasticsearchRestTemplate
 
 		SearchResponse response;
 		try {
-			response = client.search(request);
+			response = client.search(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request: " + request.toString(), e);
 		}
@@ -488,7 +527,7 @@ public class ElasticsearchRestTemplate
 		request.source().query((wrapperQuery(query.getSource())));
 		SearchResponse response;
 		try {
-			response = client.search(request);
+			response = client.search(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request: " + request.toString(), e);
 		}
@@ -497,7 +536,7 @@ public class ElasticsearchRestTemplate
 
 	@Override
 	public <T> CloseableIterator<T> stream(CriteriaQuery query, Class<T> clazz) {
-		final long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
+		long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
 		return doStream(scrollTimeInMillis, startScroll(scrollTimeInMillis, query, clazz), clazz, resultsMapper);
 	}
 
@@ -507,68 +546,15 @@ public class ElasticsearchRestTemplate
 	}
 
 	@Override
-	public <T> CloseableIterator<T> stream(SearchQuery query, final Class<T> clazz, final SearchResultMapper mapper) {
-		final long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
+	public <T> CloseableIterator<T> stream(SearchQuery query, Class<T> clazz, SearchResultMapper mapper) {
+		long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
 		return doStream(scrollTimeInMillis, startScroll(scrollTimeInMillis, query, clazz, mapper), clazz, mapper);
 	}
 
-	private <T> CloseableIterator<T> doStream(final long scrollTimeInMillis, final ScrolledPage<T> page,
-			final Class<T> clazz, final SearchResultMapper mapper) {
-		return new CloseableIterator<T>() {
-
-			/** As we couldn't retrieve single result with scroll, store current hits. */
-			private volatile Iterator<T> currentHits = page.iterator();
-
-			/** The scroll id. */
-			private volatile String scrollId = page.getScrollId();
-
-			/** If stream is finished (ie: cluster returns no results. */
-			private volatile boolean finished = !currentHits.hasNext();
-
-			@Override
-			public void close() {
-				try {
-					// Clear scroll on cluster only in case of error (cause elasticsearch auto clear scroll when it's done)
-					if (!finished && scrollId != null && currentHits != null && currentHits.hasNext()) {
-						clearScroll(scrollId);
-					}
-				} finally {
-					currentHits = null;
-					scrollId = null;
-				}
-			}
-
-			@Override
-			public boolean hasNext() {
-				// Test if stream is finished
-				if (finished) {
-					return false;
-				}
-				// Test if it remains hits
-				if (currentHits == null || !currentHits.hasNext()) {
-					// Do a new request
-					final ScrolledPage<T> scroll = continueScroll(scrollId, scrollTimeInMillis, clazz, mapper);
-					// Save hits and scroll id
-					currentHits = scroll.iterator();
-					finished = !currentHits.hasNext();
-					scrollId = scroll.getScrollId();
-				}
-				return currentHits.hasNext();
-			}
-
-			@Override
-			public T next() {
-				if (hasNext()) {
-					return currentHits.next();
-				}
-				throw new NoSuchElementException();
-			}
-
-			@Override
-			public void remove() {
-				throw new UnsupportedOperationException("remove");
-			}
-		};
+	private <T> CloseableIterator<T> doStream(long scrollTimeInMillis, ScrolledPage<T> page, Class<T> clazz,
+			SearchResultMapper mapper) {
+		return StreamQueries.streamResults(page, scrollId -> continueScroll(scrollId, scrollTimeInMillis, clazz, mapper),
+				this::clearScroll);
 	}
 
 	@Override
@@ -613,10 +599,11 @@ public class ElasticsearchRestTemplate
 		if (elasticsearchQuery != null) {
 			sourceBuilder.query(elasticsearchQuery);
 		}
+		sourceBuilder.size(0);
 		countRequest.source(sourceBuilder);
 
 		try {
-			return client.search(countRequest).getHits().getTotalHits();
+			return client.search(countRequest, RequestOptions.DEFAULT).getHits().getTotalHits();
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error while searching for request: " + countRequest.toString(), e);
 		}
@@ -631,9 +618,10 @@ public class ElasticsearchRestTemplate
 		if (elasticsearchFilter != null) {
 			searchRequest.source().postFilter(elasticsearchFilter);
 		}
+		searchRequest.source().size(0);
 		SearchResponse response;
 		try {
-			response = client.search(searchRequest);
+			response = client.search(searchRequest, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request: " + searchRequest.toString(), e);
 		}
@@ -641,10 +629,10 @@ public class ElasticsearchRestTemplate
 	}
 
 	private <T> SearchRequest prepareCount(Query query, Class<T> clazz) {
-		String indexName[] = !isEmpty(query.getIndices())
+		String[] indexName = !isEmpty(query.getIndices())
 				? query.getIndices().toArray(new String[query.getIndices().size()])
 				: retrieveIndexNameFromPersistentEntity(clazz);
-		String types[] = !isEmpty(query.getTypes()) ? query.getTypes().toArray(new String[query.getTypes().size()])
+		String[] types = !isEmpty(query.getTypes()) ? query.getTypes().toArray(new String[query.getTypes().size()])
 				: retrieveTypeFromPersistentEntity(clazz);
 
 		Assert.notNull(indexName, "No index defined for Query");
@@ -658,7 +646,7 @@ public class ElasticsearchRestTemplate
 	}
 
 	@Override
-	public <T> LinkedList<T> multiGet(SearchQuery searchQuery, Class<T> clazz) {
+	public <T> List<T> multiGet(SearchQuery searchQuery, Class<T> clazz) {
 		return resultsMapper.mapResults(getMultiResponse(searchQuery, clazz), clazz);
 	}
 
@@ -690,14 +678,14 @@ public class ElasticsearchRestTemplate
 			request.add(item);
 		}
 		try {
-			return client.multiGet(request);
+			return client.multiGet(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error while multiget for request: " + request.toString(), e);
 		}
 	}
 
 	@Override
-	public <T> LinkedList<T> multiGet(SearchQuery searchQuery, Class<T> clazz, MultiGetResultMapper getResultMapper) {
+	public <T> List<T> multiGet(SearchQuery searchQuery, Class<T> clazz, MultiGetResultMapper getResultMapper) {
 		return getResultMapper.mapResults(getMultiResponse(searchQuery, clazz), clazz);
 	}
 
@@ -706,7 +694,7 @@ public class ElasticsearchRestTemplate
 		String documentId;
 		IndexRequest request = prepareIndex(query);
 		try {
-			documentId = client.index(request).getId();
+			documentId = client.index(request, RequestOptions.DEFAULT).getId();
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error while index for request: " + request.toString(), e);
 		}
@@ -721,64 +709,110 @@ public class ElasticsearchRestTemplate
 	public UpdateResponse update(UpdateQuery query) {
 		UpdateRequest request = prepareUpdate(query);
 		try {
-			return client.update(request);
+			return client.update(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error while update for request: " + request.toString(), e);
 		}
 	}
 
 	private UpdateRequest prepareUpdate(UpdateQuery query) {
+
 		String indexName = hasText(query.getIndexName()) ? query.getIndexName()
 				: getPersistentEntityFor(query.getClazz()).getIndexName();
 		String type = hasText(query.getType()) ? query.getType() : getPersistentEntityFor(query.getClazz()).getIndexType();
+
 		Assert.notNull(indexName, "No index defined for Query");
 		Assert.notNull(type, "No type define for Query");
 		Assert.notNull(query.getId(), "No Id define for Query");
-		Assert.notNull(query.getUpdateRequest(), "No IndexRequest define for Query");
-		UpdateRequest updateRequest = new UpdateRequest(indexName, type, query.getId());
-		updateRequest.routing(query.getUpdateRequest().routing());
+		Assert.notNull(query.getUpdateRequest(), "No UpdateRequest define for Query");
 
-		if (query.getUpdateRequest().script() == null) {
-			// doc
-			if (query.DoUpsert()) {
-				updateRequest.docAsUpsert(true).doc(query.getUpdateRequest().doc());
-			} else {
-				updateRequest.doc(query.getUpdateRequest().doc());
-			}
-		} else {
-			// or script
-			updateRequest.script(query.getUpdateRequest().script());
+		UpdateRequest queryUpdateRequest = query.getUpdateRequest();
+
+		UpdateRequest updateRequest = new UpdateRequest(indexName, type, query.getId()) //
+				.routing(queryUpdateRequest.routing()) //
+				.retryOnConflict(queryUpdateRequest.retryOnConflict()) //
+				.timeout(queryUpdateRequest.timeout()) //
+				.waitForActiveShards(queryUpdateRequest.waitForActiveShards()) //
+				.setRefreshPolicy(queryUpdateRequest.getRefreshPolicy()) //
+				.waitForActiveShards(queryUpdateRequest.waitForActiveShards()) //
+				.scriptedUpsert(queryUpdateRequest.scriptedUpsert()) //
+				.docAsUpsert(queryUpdateRequest.docAsUpsert());
+
+		if (query.DoUpsert()) {
+			updateRequest.docAsUpsert(true);
+		}
+		if (queryUpdateRequest.script() != null) {
+			updateRequest.script(queryUpdateRequest.script());
+		}
+		if (queryUpdateRequest.doc() != null) {
+			updateRequest.doc(queryUpdateRequest.doc());
+		}
+		if (queryUpdateRequest.upsertRequest() != null) {
+			updateRequest.upsert(queryUpdateRequest.upsertRequest());
 		}
 
 		return updateRequest;
 	}
 
 	@Override
-	public void bulkIndex(List<IndexQuery> queries) {
+	public void bulkIndex(List<IndexQuery> queries, BulkOptions bulkOptions) {
+
+		Assert.notNull(queries, "List of IndexQuery must not be null");
+		Assert.notNull(bulkOptions, "BulkOptions must not be null");
+
 		BulkRequest bulkRequest = new BulkRequest();
+		setBulkOptions(bulkRequest, bulkOptions);
 		for (IndexQuery query : queries) {
 			bulkRequest.add(prepareIndex(query));
 		}
 		try {
-			checkForBulkUpdateFailure(client.bulk(bulkRequest));
+			checkForBulkUpdateFailure(client.bulk(bulkRequest, RequestOptions.DEFAULT));
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error while bulk for request: " + bulkRequest.toString(), e);
 		}
 	}
 
 	@Override
-	public void bulkUpdate(List<UpdateQuery> queries) {
+	public void bulkUpdate(List<UpdateQuery> queries, BulkOptions bulkOptions) {
+
+		Assert.notNull(queries, "List of UpdateQuery must not be null");
+		Assert.notNull(bulkOptions, "BulkOptions must not be null");
+
 		BulkRequest bulkRequest = new BulkRequest();
+		setBulkOptions(bulkRequest, bulkOptions);
 		for (UpdateQuery query : queries) {
 			bulkRequest.add(prepareUpdate(query));
 		}
 		try {
-			checkForBulkUpdateFailure(client.bulk(bulkRequest));
+			checkForBulkUpdateFailure(client.bulk(bulkRequest, RequestOptions.DEFAULT));
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error while bulk for request: " + bulkRequest.toString(), e);
 		}
 	}
 
+	private static void setBulkOptions(BulkRequest bulkRequest, BulkOptions bulkOptions) {
+
+		if (bulkOptions.getTimeout() != null) {
+			bulkRequest.timeout(bulkOptions.getTimeout());
+		}
+
+		if (bulkOptions.getRefreshPolicy() != null) {
+			bulkRequest.setRefreshPolicy(bulkOptions.getRefreshPolicy());
+		}
+
+		if (bulkOptions.getWaitForActiveShards() != null) {
+			bulkRequest.waitForActiveShards(bulkOptions.getWaitForActiveShards());
+		}
+
+		if (bulkOptions.getPipeline() != null) {
+			bulkRequest.pipeline(bulkOptions.getPipeline());
+		}
+
+		if (bulkOptions.getRoutingId() != null) {
+			bulkRequest.routing(bulkOptions.getRoutingId());
+		}
+	}
+
 	private void checkForBulkUpdateFailure(BulkResponse bulkResponse) {
 		if (bulkResponse.hasFailures()) {
 			Map<String, String> failedDocuments = new HashMap<>();
@@ -803,7 +837,7 @@ public class ElasticsearchRestTemplate
 		GetIndexRequest request = new GetIndexRequest();
 		request.indices(indexName);
 		try {
-			return client.indices().exists(request);
+			return client.indices().exists(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error while for indexExists request: " + request.toString(), e);
 		}
@@ -832,7 +866,7 @@ public class ElasticsearchRestTemplate
 		if (indexExists(indexName)) {
 			DeleteIndexRequest request = new DeleteIndexRequest(indexName);
 			try {
-				return client.indices().delete(request).isAcknowledged();
+				return client.indices().delete(request, RequestOptions.DEFAULT).isAcknowledged();
 			} catch (IOException e) {
 				throw new ElasticsearchException("Error while deleting index request: " + request.toString(), e);
 			}
@@ -844,7 +878,7 @@ public class ElasticsearchRestTemplate
 	public String delete(String indexName, String type, String id) {
 		DeleteRequest request = new DeleteRequest(indexName, type, id);
 		try {
-			return client.delete(request).getId();
+			return client.delete(request, RequestOptions.DEFAULT).getId();
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error while deleting item request: " + request.toString(), e);
 		}
@@ -901,10 +935,12 @@ public class ElasticsearchRestTemplate
 
 	private <T> SearchRequest prepareScroll(Query query, long scrollTimeInMillis, Class<T> clazz) {
 		setPersistentEntityIndexAndType(query, clazz);
-		return prepareScroll(query, scrollTimeInMillis);
+		ElasticsearchPersistentEntity<?> entity = getPersistentEntity(clazz);
+		return prepareScroll(query, scrollTimeInMillis, entity);
 	}
 
-	private SearchRequest prepareScroll(Query query, long scrollTimeInMillis) {
+	private SearchRequest prepareScroll(Query query, long scrollTimeInMillis,
+			@Nullable ElasticsearchPersistentEntity<?> entity) {
 		SearchRequest request = new SearchRequest(toArray(query.getIndices()));
 		SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
 		request.types(toArray(query.getTypes()));
@@ -924,7 +960,28 @@ public class ElasticsearchRestTemplate
 		}
 
 		if (query.getSort() != null) {
-			prepareSort(query, searchSourceBuilder);
+			prepareSort(query, searchSourceBuilder, entity);
+		}
+
+		if (query.getIndicesOptions() != null) {
+			request.indicesOptions(query.getIndicesOptions());
+		}
+
+		if (query instanceof SearchQuery) {
+			SearchQuery searchQuery = (SearchQuery) query;
+
+			if (searchQuery.getHighlightFields() != null || searchQuery.getHighlightBuilder() != null) {
+				HighlightBuilder highlightBuilder = searchQuery.getHighlightBuilder();
+				if (highlightBuilder == null) {
+					highlightBuilder = new HighlightBuilder();
+				}
+				if (searchQuery.getHighlightFields() != null) {
+					for (HighlightBuilder.Field highlightField : searchQuery.getHighlightFields()) {
+						highlightBuilder.field(highlightField);
+					}
+				}
+				searchSourceBuilder.highlighter(highlightBuilder);
+			}
 		}
 
 		request.source(searchSourceBuilder);
@@ -952,7 +1009,7 @@ public class ElasticsearchRestTemplate
 		request.source().version(true);
 
 		try {
-			return client.search(request);
+			return client.search(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request with scroll: " + request.toString(), e);
 		}
@@ -981,7 +1038,7 @@ public class ElasticsearchRestTemplate
 		}
 
 		try {
-			return client.search(request);
+			return client.search(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request with scroll: " + request.toString(), e);
 		}
@@ -1014,7 +1071,7 @@ public class ElasticsearchRestTemplate
 		request.scroll(TimeValue.timeValueMillis(scrollTimeInMillis));
 		SearchResponse response;
 		try {
-			response = client.searchScroll(request);
+			response = client.searchScroll(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request with scroll: " + request.toString(), e);
 		}
@@ -1027,7 +1084,7 @@ public class ElasticsearchRestTemplate
 		request.scroll(TimeValue.timeValueMillis(scrollTimeInMillis));
 		SearchResponse response;
 		try {
-			response = client.searchScroll(request);
+			response = client.searchScroll(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request with scroll: " + request.toString(), e);
 		}
@@ -1040,7 +1097,7 @@ public class ElasticsearchRestTemplate
 		request.addScrollId(scrollId);
 		try {
 			// TODO: Something useful with the response.
-			ClearScrollResponse response = client.clearScroll(request);
+			ClearScrollResponse response = client.clearScroll(request, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request with scroll: " + request.toString(), e);
 		}
@@ -1092,7 +1149,7 @@ public class ElasticsearchRestTemplate
 		prepareSearch(searchRequest, searchQuery);
 
 		try {
-			return client.search(searchRequest);
+			return client.search(searchRequest, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request with scroll: " + searchRequest.toString(), e);
 		}
@@ -1117,6 +1174,10 @@ public class ElasticsearchRestTemplate
 			}
 		}
 
+		if (searchQuery.getCollapseBuilder() != null) {
+			searchRequest.source().collapse(searchQuery.getCollapseBuilder());
+		}
+
 		if (searchQuery.getHighlightFields() != null || searchQuery.getHighlightBuilder() != null) {
 			HighlightBuilder highlightBuilder = searchQuery.getHighlightBuilder();
 			if (highlightBuilder == null) {
@@ -1162,7 +1223,7 @@ public class ElasticsearchRestTemplate
 		if (clazz.isAnnotationPresent(Setting.class)) {
 			String settingPath = clazz.getAnnotation(Setting.class).settingPath();
 			if (hasText(settingPath)) {
-				String settings = readFileFromClasspath(settingPath);
+				String settings = ResourceUtil.readFileFromClasspath(settingPath);
 				if (hasText(settings)) {
 					return createIndex(getPersistentEntityFor(clazz).getIndexName(), settings);
 				}
@@ -1184,7 +1245,7 @@ public class ElasticsearchRestTemplate
 			request.settings((XContentBuilder) settings);
 		}
 		try {
-			return client.indices().create(request).isAcknowledged();
+			return client.indices().create(request, RequestOptions.DEFAULT).isAcknowledged();
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for creating index: " + request.toString(), e);
 		}
@@ -1249,15 +1310,15 @@ public class ElasticsearchRestTemplate
 
 	private <T> SearchRequest prepareSearch(Query query, Class<T> clazz) {
 		setPersistentEntityIndexAndType(query, clazz);
-		return prepareSearch(query, Optional.empty());
+		return prepareSearch(query, Optional.empty(), clazz);
 	}
 
 	private <T> SearchRequest prepareSearch(SearchQuery query, Class<T> clazz) {
 		setPersistentEntityIndexAndType(query, clazz);
-		return prepareSearch(query, Optional.ofNullable(query.getQuery()));
+		return prepareSearch(query, Optional.ofNullable(query.getQuery()), clazz);
 	}
 
-	private SearchRequest prepareSearch(Query query, Optional<QueryBuilder> builder) {
+	private SearchRequest prepareSearch(Query query, Optional<QueryBuilder> builder, @Nullable Class<?> clazz) {
 		Assert.notNull(query.getIndices(), "No index defined for Query");
 		Assert.notNull(query.getTypes(), "No type defined for Query");
 
@@ -1278,8 +1339,17 @@ public class ElasticsearchRestTemplate
 		}
 
 		if (query.getPageable().isPaged()) {
-			startRecord = query.getPageable().getPageNumber() * query.getPageable().getPageSize();
+			long offset = query.getPageable().getOffset();
+
+			if (offset > Integer.MAX_VALUE) {
+				throw new IllegalArgumentException(String.format("Offset must not be more than %d", Integer.MAX_VALUE));
+			}
+
+			startRecord = (int) offset;
 			sourceBuilder.size(query.getPageable().getPageSize());
+		} else {
+			startRecord = 0;
+			sourceBuilder.size(INDEX_MAX_RESULT_WINDOW);
 		}
 		sourceBuilder.from(startRecord);
 
@@ -1292,26 +1362,55 @@ public class ElasticsearchRestTemplate
 		}
 
 		if (query.getSort() != null) {
-			prepareSort(query, sourceBuilder);
+			prepareSort(query, sourceBuilder, getPersistentEntity(clazz));
 		}
 
 		if (query.getMinScore() > 0) {
 			sourceBuilder.minScore(query.getMinScore());
 		}
+
+		if (query.getPreference() != null) {
+			request.preference(query.getPreference());
+		}
+
+		if (query.getSearchType() != null) {
+			request.searchType(query.getSearchType());
+		}
+
 		request.source(sourceBuilder);
 		return request;
 	}
 
-	private void prepareSort(Query query, SearchSourceBuilder sourceBuilder) {
+	private void prepareSort(Query query, SearchSourceBuilder sourceBuilder,
+			@Nullable ElasticsearchPersistentEntity<?> entity) {
+
 		for (Sort.Order order : query.getSort()) {
-			FieldSortBuilder sort = SortBuilders.fieldSort(order.getProperty())
-					.order(order.getDirection().isDescending() ? SortOrder.DESC : SortOrder.ASC);
-			if (order.getNullHandling() == Sort.NullHandling.NULLS_FIRST) {
-				sort.missing("_first");
-			} else if (order.getNullHandling() == Sort.NullHandling.NULLS_LAST) {
-				sort.missing("_last");
+			SortOrder sortOrder = order.getDirection().isDescending() ? SortOrder.DESC : SortOrder.ASC;
+
+			if (ScoreSortBuilder.NAME.equals(order.getProperty())) {
+				ScoreSortBuilder sort = SortBuilders //
+						.scoreSort() //
+						.order(sortOrder);
+
+				sourceBuilder.sort(sort);
+			} else {
+				ElasticsearchPersistentProperty property = (entity != null) //
+						? entity.getPersistentProperty(order.getProperty()) //
+						: null;
+				String fieldName = property != null ? property.getFieldName() : order.getProperty();
+
+				FieldSortBuilder sort = SortBuilders //
+						.fieldSort(fieldName) //
+						.order(sortOrder);
+
+				if (order.getNullHandling() == Sort.NullHandling.NULLS_FIRST) {
+					sort.missing("_first");
+				} else if (order.getNullHandling() == Sort.NullHandling.NULLS_LAST) {
+					sort.missing("_last");
+				}
+
+				sourceBuilder.sort(sort);
 			}
-			sourceBuilder.sort(sort);
 		}
 	}
 
@@ -1364,7 +1463,7 @@ public class ElasticsearchRestTemplate
 		Assert.notNull(indexName, "No index defined for refresh()");
 		try {
 			// TODO: Do something with the response.
-			client.indices().refresh(refreshRequest(indexName));
+			client.indices().refresh(refreshRequest(indexName), RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("failed to refresh index: " + indexName, e);
 		}
@@ -1375,48 +1474,6 @@ public class ElasticsearchRestTemplate
 		refresh(getPersistentEntityFor(clazz).getIndexName());
 	}
 
-	@Override
-	public Boolean addAlias(AliasQuery query) {
-		Assert.notNull(query.getIndexName(), "No index defined for Alias");
-		Assert.notNull(query.getAliasName(), "No alias defined");
-		final IndicesAliasesRequest.AliasActions aliasAction = IndicesAliasesRequest.AliasActions.add()
-				.alias(query.getAliasName()).index(query.getIndexName());
-
-		if (query.getFilterBuilder() != null) {
-			aliasAction.filter(query.getFilterBuilder());
-		} else if (query.getFilter() != null) {
-			aliasAction.filter(query.getFilter());
-		} else if (hasText(query.getRouting())) {
-			aliasAction.routing(query.getRouting());
-		} else if (hasText(query.getSearchRouting())) {
-			aliasAction.searchRouting(query.getSearchRouting());
-		} else if (hasText(query.getIndexRouting())) {
-			aliasAction.indexRouting(query.getIndexRouting());
-		}
-
-		IndicesAliasesRequest request = new IndicesAliasesRequest();
-		request.addAliasAction(aliasAction);
-		try {
-			return client.indices().updateAliases(request).isAcknowledged();
-		} catch (IOException e) {
-			throw new ElasticsearchException("failed to update aliases with request: " + request, e);
-		}
-	}
-
-	@Override
-	public Boolean removeAlias(AliasQuery query) {
-		Assert.notNull(query.getIndexName(), "No index defined for Alias");
-		Assert.notNull(query.getAliasName(), "No alias defined");
-		IndicesAliasesRequest request = new IndicesAliasesRequest();
-		AliasActions aliasAction = new AliasActions(AliasActions.Type.REMOVE);
-		request.addAliasAction(aliasAction);
-		try {
-			return client.indices().updateAliases(request).isAcknowledged();
-		} catch (IOException e) {
-			throw new ElasticsearchException("failed to update aliases with request: " + request, e);
-		}
-	}
-
 	@Override
 	public List<AliasMetaData> queryForAlias(String indexName) {
 		List<AliasMetaData> aliases = null;
@@ -1441,16 +1498,17 @@ public class ElasticsearchRestTemplate
 	 * @param aliasResponse
 	 * @return
 	 */
-	List<AliasMetaData> convertAliasResponse(String aliasResponse) {
+	private List<AliasMetaData> convertAliasResponse(String aliasResponse) {
 		ObjectMapper mapper = new ObjectMapper();
 
 		try {
 			JsonNode node = mapper.readTree(aliasResponse);
-
-			Iterator<String> names = node.fieldNames();
-			String name = names.next();
 			node = node.findValue("aliases");
 
+			if (node == null) {
+				return Collections.emptyList();
+			}
+
 			Map<String, AliasData> aliasData = mapper.readValue(mapper.writeValueAsString(node),
 					new TypeReference<Map<String, AliasData>>() {});
 
@@ -1469,6 +1527,11 @@ public class ElasticsearchRestTemplate
 		}
 	}
 
+	@Nullable
+	private ElasticsearchPersistentEntity<?> getPersistentEntity(@Nullable Class<?> clazz) {
+		return clazz != null ? elasticsearchConverter.getMappingContext().getPersistentEntity(clazz) : null;
+	}
+
 	@Override
 	public ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz) {
 		Assert.isTrue(clazz.isAnnotationPresent(Document.class), "Unable to identify index name. " + clazz.getSimpleName()
@@ -1560,34 +1623,9 @@ public class ElasticsearchRestTemplate
 		return resultsMapper;
 	}
 
+	@Deprecated
 	public static String readFileFromClasspath(String url) {
-		StringBuilder stringBuilder = new StringBuilder();
-
-		BufferedReader bufferedReader = null;
-
-		try {
-			ClassPathResource classPathResource = new ClassPathResource(url);
-			InputStreamReader inputStreamReader = new InputStreamReader(classPathResource.getInputStream());
-			bufferedReader = new BufferedReader(inputStreamReader);
-			String line;
-
-			String lineSeparator = System.getProperty("line.separator");
-			while ((line = bufferedReader.readLine()) != null) {
-				stringBuilder.append(line).append(lineSeparator);
-			}
-		} catch (Exception e) {
-			logger.debug(String.format("Failed to load file from url: %s: %s", url, e.getMessage()));
-			return null;
-		} finally {
-			if (bufferedReader != null)
-				try {
-					bufferedReader.close();
-				} catch (IOException e) {
-					logger.debug(String.format("Unable to close buffered reader.. %s", e.getMessage()));
-				}
-		}
-
-		return stringBuilder.toString();
+		return ResourceUtil.readFileFromClasspath(url);
 	}
 
 	public SearchResponse suggest(SuggestBuilder suggestion, String... indices) {
@@ -1597,7 +1635,7 @@ public class ElasticsearchRestTemplate
 		searchRequest.source(sourceBuilder);
 
 		try {
-			return client.search(searchRequest);
+			return client.search(searchRequest, RequestOptions.DEFAULT);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Could not execute search request : " + searchRequest.toString(), e);
 		}

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,16 +19,12 @@ import static org.elasticsearch.client.Requests.*;
 import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.springframework.util.CollectionUtils.*;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 
 import org.elasticsearch.action.ActionFuture;
@@ -51,12 +47,12 @@ import org.elasticsearch.action.search.MultiSearchRequest;
 import org.elasticsearch.action.search.MultiSearchResponse;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.cluster.metadata.AliasMetaData;
-import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
@@ -82,13 +78,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.ElasticsearchException;
 import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Mapping;
 import org.springframework.data.elasticsearch.annotations.Setting;
 import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
@@ -99,6 +93,7 @@ import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersiste
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.core.query.*;
 import org.springframework.data.util.CloseableIterator;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -124,16 +119,20 @@ import org.springframework.util.StringUtils;
  * @author Ivan Greene
  * @author Christoph Strobl
  * @author Dmitriy Yakovlev
+ * @author Peter-Josef Meisch
+ * @author Martin Choraine
+ * @author Farid Azaza
+ * @author Gyula Attila Csorogi
+ * @author Alexander Shabunevich
  */
-public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<Client>, ApplicationContextAware {
+public class ElasticsearchTemplate extends AbstractElasticsearchTemplate
+		implements ElasticsearchOperations, EsClient<Client>, ApplicationContextAware {
 
 	private static final Logger QUERY_LOGGER = LoggerFactory
 			.getLogger("org.springframework.data.elasticsearch.core.QUERY");
 	private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchTemplate.class);
-	private static final String FIELD_SCORE = "_score";
 
 	private Client client;
-	private ElasticsearchConverter elasticsearchConverter;
 	private ResultsMapper resultsMapper;
 	private String searchTimeout;
 
@@ -162,12 +161,12 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 	public ElasticsearchTemplate(Client client, ElasticsearchConverter elasticsearchConverter,
 			ResultsMapper resultsMapper) {
 
+		super(elasticsearchConverter);
+
 		Assert.notNull(client, "Client must not be null!");
-		Assert.notNull(elasticsearchConverter, "ElasticsearchConverter must not be null!");
 		Assert.notNull(resultsMapper, "ResultsMapper must not be null!");
 
 		this.client = client;
-		this.elasticsearchConverter = elasticsearchConverter;
 		this.resultsMapper = resultsMapper;
 	}
 
@@ -180,6 +179,35 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 		this.searchTimeout = searchTimeout;
 	}
 
+	@Override
+	public boolean addAlias(AliasQuery query) {
+		Assert.notNull(query.getIndexName(), "No index defined for Alias");
+		Assert.notNull(query.getAliasName(), "No alias defined");
+		IndicesAliasesRequest.AliasActions aliasAction = IndicesAliasesRequest.AliasActions.add()
+				.alias(query.getAliasName()).index(query.getIndexName());
+
+		if (query.getFilterBuilder() != null) {
+			aliasAction.filter(query.getFilterBuilder());
+		} else if (query.getFilter() != null) {
+			aliasAction.filter(query.getFilter());
+		} else if (!StringUtils.isEmpty(query.getRouting())) {
+			aliasAction.routing(query.getRouting());
+		} else if (!StringUtils.isEmpty(query.getSearchRouting())) {
+			aliasAction.searchRouting(query.getSearchRouting());
+		} else if (!StringUtils.isEmpty(query.getIndexRouting())) {
+			aliasAction.indexRouting(query.getIndexRouting());
+		}
+		return client.admin().indices().prepareAliases().addAliasAction(aliasAction).execute().actionGet().isAcknowledged();
+	}
+
+	@Override
+	public boolean removeAlias(AliasQuery query) {
+		Assert.notNull(query.getIndexName(), "No index defined for Alias");
+		Assert.notNull(query.getAliasName(), "No alias defined");
+		return client.admin().indices().prepareAliases().removeAlias(query.getIndexName(), query.getAliasName()).execute()
+				.actionGet().isAcknowledged();
+	}
+
 	@Override
 	public <T> boolean createIndex(Class<T> clazz) {
 		return createIndexIfNotCreated(clazz);
@@ -193,23 +221,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 
 	@Override
 	public <T> boolean putMapping(Class<T> clazz) {
-		if (clazz.isAnnotationPresent(Mapping.class)) {
-			String mappingPath = clazz.getAnnotation(Mapping.class).mappingPath();
-			if (!StringUtils.isEmpty(mappingPath)) {
-				String mappings = readFileFromClasspath(mappingPath);
-				if (!StringUtils.isEmpty(mappings)) {
-					return putMapping(clazz, mappings);
-				}
-			} else {
-				LOGGER.info("mappingPath in @Mapping has to be defined. Building mappings using @Field");
-			}
-		}
-		try {
-			MappingBuilder mappingBuilder = new MappingBuilder(elasticsearchConverter);
-			return putMapping(clazz, mappingBuilder.buildPropertyMapping(clazz));
-		} catch (Exception e) {
-			throw new ElasticsearchException("Failed to build mapping for " + clazz.getSimpleName(), e);
-		}
+		return putMapping(clazz, buildMapping(clazz));
 	}
 
 	@Override
@@ -218,6 +230,11 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 				mapping);
 	}
 
+	@Override
+	public <T> boolean putMapping(String indexName, String type, Class<T> clazz) {
+		return putMapping(indexName, type, buildMapping(clazz));
+	}
+
 	@Override
 	public boolean putMapping(String indexName, String type, Object mapping) {
 		Assert.notNull(indexName, "No index defined for putMapping()");
@@ -234,10 +251,10 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 	}
 
 	@Override
-	public Map getMapping(String indexName, String type) {
+	public Map<String, Object> getMapping(String indexName, String type) {
 		Assert.notNull(indexName, "No index defined for putMapping()");
 		Assert.notNull(type, "No type defined for putMapping()");
-		Map mappings = null;
+		Map<String, Object> mappings = null;
 		try {
 			mappings = client.admin().indices().getMappings(new GetMappingsRequest().indices(indexName).types(type))
 					.actionGet().getMappings().get(indexName).get(type).getSourceAsMap();
@@ -249,7 +266,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 	}
 
 	@Override
-	public <T> Map getMapping(Class<T> clazz) {
+	public <T> Map<String, Object> getMapping(Class<T> clazz) {
 		return getMapping(getPersistentEntityFor(clazz).getIndexName(), getPersistentEntityFor(clazz).getIndexType());
 	}
 
@@ -362,7 +379,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 
 	@Override
 	public <T> T query(SearchQuery query, ResultsExtractor<T> resultsExtractor) {
-		SearchResponse response = doSearch(prepareSearch(query), query);
+		SearchResponse response = doSearch(prepareSearch(query, (ElasticsearchPersistentEntity) null), query);
 		return resultsExtractor.extract(response);
 	}
 
@@ -383,7 +400,8 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 
 	@Override
 	public <T> List<String> queryForIds(SearchQuery query) {
-		SearchRequestBuilder request = prepareSearch(query).setQuery(query.getQuery());
+		SearchRequestBuilder request = prepareSearch(query, (ElasticsearchPersistentEntity) null)
+				.setQuery(query.getQuery());
 		if (query.getFilter() != null) {
 			request.setPostFilter(query.getFilter());
 		}
@@ -428,9 +446,8 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 
 	@Override
 	public <T> CloseableIterator<T> stream(CriteriaQuery query, Class<T> clazz) {
-		final long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
-		return doStream(scrollTimeInMillis, startScroll(scrollTimeInMillis, query, clazz), clazz,
-				resultsMapper);
+		long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
+		return doStream(scrollTimeInMillis, startScroll(scrollTimeInMillis, query, clazz), clazz, resultsMapper);
 	}
 
 	@Override
@@ -439,69 +456,15 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 	}
 
 	@Override
-	public <T> CloseableIterator<T> stream(SearchQuery query, final Class<T> clazz, final SearchResultMapper mapper) {
-		final long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
-		return doStream(scrollTimeInMillis, startScroll(scrollTimeInMillis, query, clazz, mapper), clazz,
-				mapper);
+	public <T> CloseableIterator<T> stream(SearchQuery query, Class<T> clazz, SearchResultMapper mapper) {
+		long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
+		return doStream(scrollTimeInMillis, startScroll(scrollTimeInMillis, query, clazz, mapper), clazz, mapper);
 	}
 
-	private <T> CloseableIterator<T> doStream(final long scrollTimeInMillis, final ScrolledPage<T> page,
-			final Class<T> clazz, final SearchResultMapper mapper) {
-		return new CloseableIterator<T>() {
-
-			/** As we couldn't retrieve single result with scroll, store current hits. */
-			private volatile Iterator<T> currentHits = page.iterator();
-
-			/** The scroll id. */
-			private volatile String scrollId = page.getScrollId();
-
-			/** If stream is finished (ie: cluster returns no results. */
-			private volatile boolean finished = !currentHits.hasNext();
-
-			@Override
-			public void close() {
-				try {
-					// Clear scroll on cluster only in case of error (cause elasticsearch auto clear scroll when it's done)
-					if (!finished && scrollId != null && currentHits != null && currentHits.hasNext()) {
-						clearScroll(scrollId);
-					}
-				} finally {
-					currentHits = null;
-					scrollId = null;
-				}
-			}
-
-			@Override
-			public boolean hasNext() {
-				// Test if stream is finished
-				if (finished) {
-					return false;
-				}
-				// Test if it remains hits
-				if (currentHits == null || !currentHits.hasNext()) {
-					// Do a new request
-					final ScrolledPage<T> scroll = continueScroll(scrollId, scrollTimeInMillis, clazz, mapper);
-					// Save hits and scroll id
-					currentHits = scroll.iterator();
-					finished = !currentHits.hasNext();
-					scrollId = scroll.getScrollId();
-				}
-				return currentHits.hasNext();
-			}
-
-			@Override
-			public T next() {
-				if (hasNext()) {
-					return currentHits.next();
-				}
-				throw new NoSuchElementException();
-			}
-
-			@Override
-			public void remove() {
-				throw new UnsupportedOperationException("remove");
-			}
-		};
+	private <T> CloseableIterator<T> doStream(long scrollTimeInMillis, ScrolledPage<T> page, Class<T> clazz,
+			SearchResultMapper mapper) {
+		return StreamQueries.streamResults(page, scrollId -> continueScroll(scrollId, scrollTimeInMillis, clazz, mapper),
+				this::clearScroll);
 	}
 
 	@Override
@@ -546,6 +509,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 		if (elasticsearchQuery != null) {
 			countRequestBuilder.setQuery(elasticsearchQuery);
 		}
+		countRequestBuilder.setSize(0);
 		return countRequestBuilder.execute().actionGet().getHits().getTotalHits();
 	}
 
@@ -559,6 +523,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 		if (elasticsearchFilter != null) {
 			searchRequestBuilder.setPostFilter(elasticsearchFilter);
 		}
+		searchRequestBuilder.setSize(0);
 		return searchRequestBuilder.execute().actionGet().getHits().getTotalHits();
 	}
 
@@ -581,7 +546,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 	}
 
 	@Override
-	public <T> LinkedList<T> multiGet(SearchQuery searchQuery, Class<T> clazz) {
+	public <T> List<T> multiGet(SearchQuery searchQuery, Class<T> clazz) {
 		return resultsMapper.mapResults(getMultiResponse(searchQuery, clazz), clazz);
 	}
 
@@ -616,7 +581,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 	}
 
 	@Override
-	public <T> LinkedList<T> multiGet(SearchQuery searchQuery, Class<T> clazz, MultiGetResultMapper getResultMapper) {
+	public <T> List<T> multiGet(SearchQuery searchQuery, Class<T> clazz, MultiGetResultMapper getResultMapper) {
 		return getResultMapper.mapResults(getMultiResponse(searchQuery, clazz), clazz);
 	}
 
@@ -636,35 +601,53 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 	}
 
 	private UpdateRequestBuilder prepareUpdate(UpdateQuery query) {
+
 		String indexName = !StringUtils.isEmpty(query.getIndexName()) ? query.getIndexName()
 				: getPersistentEntityFor(query.getClazz()).getIndexName();
 		String type = !StringUtils.isEmpty(query.getType()) ? query.getType()
 				: getPersistentEntityFor(query.getClazz()).getIndexType();
+
 		Assert.notNull(indexName, "No index defined for Query");
 		Assert.notNull(type, "No type define for Query");
 		Assert.notNull(query.getId(), "No Id define for Query");
-		Assert.notNull(query.getUpdateRequest(), "No IndexRequest define for Query");
-		UpdateRequestBuilder updateRequestBuilder = client.prepareUpdate(indexName, type, query.getId());
-		updateRequestBuilder.setRouting(query.getUpdateRequest().routing());
+		Assert.notNull(query.getUpdateRequest(), "No UpdateRequest define for Query");
 
-		if (query.getUpdateRequest().script() == null) {
-			// doc
-			if (query.DoUpsert()) {
-				updateRequestBuilder.setDocAsUpsert(true).setDoc(query.getUpdateRequest().doc());
-			} else {
-				updateRequestBuilder.setDoc(query.getUpdateRequest().doc());
-			}
-		} else {
-			// or script
-			updateRequestBuilder.setScript(query.getUpdateRequest().script());
+		UpdateRequest queryUpdateRequest = query.getUpdateRequest();
+
+		UpdateRequestBuilder updateRequestBuilder = client.prepareUpdate(indexName, type, query.getId()) //
+				.setRouting(queryUpdateRequest.routing()) //
+				.setRetryOnConflict(queryUpdateRequest.retryOnConflict()) //
+				.setTimeout(queryUpdateRequest.timeout()) //
+				.setWaitForActiveShards(queryUpdateRequest.waitForActiveShards()) //
+				.setRefreshPolicy(queryUpdateRequest.getRefreshPolicy()) //
+				.setWaitForActiveShards(queryUpdateRequest.waitForActiveShards()) //
+				.setScriptedUpsert(queryUpdateRequest.scriptedUpsert()) //
+				.setDocAsUpsert(queryUpdateRequest.docAsUpsert());
+
+		if (query.DoUpsert()) {
+			updateRequestBuilder.setDocAsUpsert(true);
+		}
+		if (queryUpdateRequest.script() != null) {
+			updateRequestBuilder.setScript(queryUpdateRequest.script());
+		}
+		if (queryUpdateRequest.doc() != null) {
+			updateRequestBuilder.setDoc(queryUpdateRequest.doc());
+		}
+		if (queryUpdateRequest.upsertRequest() != null) {
+			updateRequestBuilder.setUpsert(queryUpdateRequest.upsertRequest());
 		}
 
 		return updateRequestBuilder;
 	}
 
 	@Override
-	public void bulkIndex(List<IndexQuery> queries) {
+	public void bulkIndex(List<IndexQuery> queries, BulkOptions bulkOptions) {
+
+		Assert.notNull(queries, "List of IndexQuery must not be null");
+		Assert.notNull(bulkOptions, "BulkOptions must not be null");
+
 		BulkRequestBuilder bulkRequest = client.prepareBulk();
+		setBulkOptions(bulkRequest, bulkOptions);
 		for (IndexQuery query : queries) {
 			bulkRequest.add(prepareIndex(query));
 		}
@@ -672,14 +655,42 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 	}
 
 	@Override
-	public void bulkUpdate(List<UpdateQuery> queries) {
+	public void bulkUpdate(List<UpdateQuery> queries, BulkOptions bulkOptions) {
+
+		Assert.notNull(queries, "List of UpdateQuery must not be null");
+		Assert.notNull(bulkOptions, "BulkOptions must not be null");
+
 		BulkRequestBuilder bulkRequest = client.prepareBulk();
+		setBulkOptions(bulkRequest, bulkOptions);
 		for (UpdateQuery query : queries) {
 			bulkRequest.add(prepareUpdate(query));
 		}
 		checkForBulkUpdateFailure(bulkRequest.execute().actionGet());
 	}
 
+	private static void setBulkOptions(BulkRequestBuilder bulkRequest, BulkOptions bulkOptions) {
+
+		if (bulkOptions.getTimeout() != null) {
+			bulkRequest.setTimeout(bulkOptions.getTimeout());
+		}
+
+		if (bulkOptions.getRefreshPolicy() != null) {
+			bulkRequest.setRefreshPolicy(bulkOptions.getRefreshPolicy());
+		}
+
+		if (bulkOptions.getWaitForActiveShards() != null) {
+			bulkRequest.setWaitForActiveShards(bulkOptions.getWaitForActiveShards());
+		}
+
+		if (bulkOptions.getPipeline() != null) {
+			bulkRequest.pipeline(bulkOptions.getPipeline());
+		}
+
+		if (bulkOptions.getRoutingId() != null) {
+			bulkRequest.routing(bulkOptions.getRoutingId());
+		}
+	}
+
 	private void checkForBulkUpdateFailure(BulkResponse bulkResponse) {
 		if (bulkResponse.hasFailures()) {
 			Map<String, String> failedDocuments = new HashMap<>();
@@ -776,10 +787,11 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 
 	private <T> SearchRequestBuilder prepareScroll(Query query, long scrollTimeInMillis, Class<T> clazz) {
 		setPersistentEntityIndexAndType(query, clazz);
-		return prepareScroll(query, scrollTimeInMillis);
+		return prepareScroll(query, scrollTimeInMillis, getPersistentEntity(clazz));
 	}
 
-	private SearchRequestBuilder prepareScroll(Query query, long scrollTimeInMillis) {
+	private SearchRequestBuilder prepareScroll(Query query, long scrollTimeInMillis,
+			@Nullable ElasticsearchPersistentEntity<?> entity) {
 		SearchRequestBuilder requestBuilder = client.prepareSearch(toArray(query.getIndices()))
 				.setTypes(toArray(query.getTypes())).setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).setFrom(0)
 				.setVersion(true);
@@ -798,7 +810,28 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 		}
 
 		if (query.getSort() != null) {
-			prepareSort(query, requestBuilder);
+			prepareSort(query, requestBuilder, entity);
+		}
+
+		if (query.getIndicesOptions() != null) {
+			requestBuilder.setIndicesOptions(query.getIndicesOptions());
+		}
+
+		if (query instanceof SearchQuery) {
+			SearchQuery searchQuery = (SearchQuery) query;
+
+			if (searchQuery.getHighlightFields() != null || searchQuery.getHighlightBuilder() != null) {
+				HighlightBuilder highlightBuilder = searchQuery.getHighlightBuilder();
+				if (highlightBuilder == null) {
+					highlightBuilder = new HighlightBuilder();
+				}
+				if (searchQuery.getHighlightFields() != null) {
+					for (HighlightBuilder.Field highlightField : searchQuery.getHighlightFields()) {
+						highlightBuilder.field(highlightField);
+					}
+				}
+				requestBuilder.highlighter(highlightBuilder);
+			}
 		}
 
 		return requestBuilder;
@@ -951,6 +984,10 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 			}
 		}
 
+		if (searchQuery.getCollapseBuilder() != null) {
+			searchRequest.setCollapse(searchQuery.getCollapseBuilder());
+		}
+
 		if (searchQuery.getHighlightFields() != null || searchQuery.getHighlightBuilder() != null) {
 			HighlightBuilder highlightBuilder = searchQuery.getHighlightBuilder();
 			if (highlightBuilder == null) {
@@ -981,6 +1018,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 				searchRequest.addAggregation(aggregatedFacet.getFacet());
 			}
 		}
+
 		return searchRequest.setQuery(searchQuery.getQuery());
 	}
 
@@ -1005,7 +1043,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 		if (clazz.isAnnotationPresent(Setting.class)) {
 			String settingPath = clazz.getAnnotation(Setting.class).settingPath();
 			if (!StringUtils.isEmpty(settingPath)) {
-				String settings = readFileFromClasspath(settingPath);
+				String settings = ResourceUtil.readFileFromClasspath(settingPath);
 				if (!StringUtils.isEmpty(settings)) {
 					return createIndex(getPersistentEntityFor(clazz).getIndexName(), settings);
 				}
@@ -1034,10 +1072,10 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 		return createIndex(getPersistentEntityFor(clazz).getIndexName(), settings);
 	}
 
-	private <T> Map getDefaultSettings(ElasticsearchPersistentEntity<T> persistentEntity) {
+	private <T> Map<String, String> getDefaultSettings(ElasticsearchPersistentEntity<T> persistentEntity) {
 
 		if (persistentEntity.isUseServerConfiguration())
-			return new HashMap();
+			return new HashMap<>();
 
 		return new MapBuilder<String, String>().put("index.number_of_shards", String.valueOf(persistentEntity.getShards()))
 				.put("index.number_of_replicas", String.valueOf(persistentEntity.getReplicas()))
@@ -1046,12 +1084,12 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 	}
 
 	@Override
-	public <T> Map getSetting(Class<T> clazz) {
+	public <T> Map<String, Object> getSetting(Class<T> clazz) {
 		return getSetting(getPersistentEntityFor(clazz).getIndexName());
 	}
 
 	@Override
-	public Map getSetting(String indexName) {
+	public Map<String, Object> getSetting(String indexName) {
 		Assert.notNull(indexName, "No index defined for getSettings");
 		Settings settings = client.admin().indices().getSettings(new GetSettingsRequest()).actionGet().getIndexToSettings()
 				.get(indexName);
@@ -1060,10 +1098,10 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 
 	private <T> SearchRequestBuilder prepareSearch(Query query, Class<T> clazz) {
 		setPersistentEntityIndexAndType(query, clazz);
-		return prepareSearch(query);
+		return prepareSearch(query, getPersistentEntity(clazz));
 	}
 
-	private SearchRequestBuilder prepareSearch(Query query) {
+	private SearchRequestBuilder prepareSearch(Query query, @Nullable ElasticsearchPersistentEntity<?> entity) {
 		Assert.notNull(query.getIndices(), "No index defined for Query");
 		Assert.notNull(query.getTypes(), "No type defined for Query");
 
@@ -1078,8 +1116,17 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 		}
 
 		if (query.getPageable().isPaged()) {
-			startRecord = query.getPageable().getPageNumber() * query.getPageable().getPageSize();
+			long offset = query.getPageable().getOffset();
+
+			if (offset > Integer.MAX_VALUE) {
+				throw new IllegalArgumentException(String.format("Offset must not be more than %d", Integer.MAX_VALUE));
+			}
+
+			startRecord = (int) offset;
 			searchRequestBuilder.setSize(query.getPageable().getPageSize());
+		} else {
+			startRecord = 0;
+			searchRequestBuilder.setSize(INDEX_MAX_RESULT_WINDOW);
 		}
 		searchRequestBuilder.setFrom(startRecord);
 
@@ -1092,28 +1139,38 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 		}
 
 		if (query.getSort() != null) {
-			prepareSort(query, searchRequestBuilder);
+			prepareSort(query, searchRequestBuilder, entity);
 		}
 
 		if (query.getMinScore() > 0) {
 			searchRequestBuilder.setMinScore(query.getMinScore());
 		}
+
+		if (query.getPreference() != null) {
+			searchRequestBuilder.setPreference(query.getPreference());
+		}
+
 		return searchRequestBuilder;
 	}
 
-	private void prepareSort(Query query, SearchRequestBuilder searchRequestBuilder) {
+	private void prepareSort(Query query, SearchRequestBuilder searchRequestBuilder,
+			@Nullable ElasticsearchPersistentEntity<?> entity) {
 		for (Sort.Order order : query.getSort()) {
 			SortOrder sortOrder = order.getDirection().isDescending() ? SortOrder.DESC : SortOrder.ASC;
 
-			if (FIELD_SCORE.equals(order.getProperty())) {
+			if (ScoreSortBuilder.NAME.equals(order.getProperty())) {
 				ScoreSortBuilder sort = SortBuilders //
 						.scoreSort() //
 						.order(sortOrder);
 
 				searchRequestBuilder.addSort(sort);
 			} else {
+				ElasticsearchPersistentProperty property = entity != null //
+						? entity.getPersistentProperty(order.getProperty()) //
+						: null;
+				String fieldName = property != null ? property.getFieldName() : order.getProperty();
 				FieldSortBuilder sort = SortBuilders //
-						.fieldSort(order.getProperty()) //
+						.fieldSort(fieldName) //
 						.order(sortOrder);
 
 				if (order.getNullHandling() == Sort.NullHandling.NULLS_FIRST) {
@@ -1182,41 +1239,17 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 		refresh(getPersistentEntityFor(clazz).getIndexName());
 	}
 
-	@Override
-	public Boolean addAlias(AliasQuery query) {
-		Assert.notNull(query.getIndexName(), "No index defined for Alias");
-		Assert.notNull(query.getAliasName(), "No alias defined");
-		final IndicesAliasesRequest.AliasActions aliasAction = IndicesAliasesRequest.AliasActions.add()
-				.alias(query.getAliasName()).index(query.getIndexName());
-
-		if (query.getFilterBuilder() != null) {
-			aliasAction.filter(query.getFilterBuilder());
-		} else if (query.getFilter() != null) {
-			aliasAction.filter(query.getFilter());
-		} else if (!StringUtils.isEmpty(query.getRouting())) {
-			aliasAction.routing(query.getRouting());
-		} else if (!StringUtils.isEmpty(query.getSearchRouting())) {
-			aliasAction.searchRouting(query.getSearchRouting());
-		} else if (!StringUtils.isEmpty(query.getIndexRouting())) {
-			aliasAction.indexRouting(query.getIndexRouting());
-		}
-		return client.admin().indices().prepareAliases().addAliasAction(aliasAction).execute().actionGet().isAcknowledged();
-	}
-
-	@Override
-	public Boolean removeAlias(AliasQuery query) {
-		Assert.notNull(query.getIndexName(), "No index defined for Alias");
-		Assert.notNull(query.getAliasName(), "No alias defined");
-		return client.admin().indices().prepareAliases().removeAlias(query.getIndexName(), query.getAliasName()).execute()
-				.actionGet().isAcknowledged();
-	}
-
 	@Override
 	public List<AliasMetaData> queryForAlias(String indexName) {
 		return client.admin().indices().getAliases(new GetAliasesRequest().indices(indexName)).actionGet().getAliases()
 				.get(indexName);
 	}
 
+	@Nullable
+	private ElasticsearchPersistentEntity<?> getPersistentEntity(@Nullable Class<?> clazz) {
+		return clazz != null ? elasticsearchConverter.getMappingContext().getPersistentEntity(clazz) : null;
+	}
+
 	@Override
 	public ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz) {
 		Assert.isTrue(clazz.isAnnotationPresent(Document.class), "Unable to identify index name. " + clazz.getSimpleName()
@@ -1308,34 +1341,9 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, EsClient<
 		return resultsMapper;
 	}
 
+	@Deprecated
 	public static String readFileFromClasspath(String url) {
-		StringBuilder stringBuilder = new StringBuilder();
-
-		BufferedReader bufferedReader = null;
-
-		try {
-			ClassPathResource classPathResource = new ClassPathResource(url);
-			InputStreamReader inputStreamReader = new InputStreamReader(classPathResource.getInputStream());
-			bufferedReader = new BufferedReader(inputStreamReader);
-			String line;
-
-			String lineSeparator = System.getProperty("line.separator");
-			while ((line = bufferedReader.readLine()) != null) {
-				stringBuilder.append(line).append(lineSeparator);
-			}
-		} catch (Exception e) {
-			LOGGER.debug(String.format("Failed to load file from url: %s: %s", url, e.getMessage()));
-			return null;
-		} finally {
-			if (bufferedReader != null)
-				try {
-					bufferedReader.close();
-				} catch (IOException e) {
-					LOGGER.debug(String.format("Unable to close buffered reader.. %s", e.getMessage()));
-				}
-		}
-
-		return stringBuilder.toString();
+		return ResourceUtil.readFileFromClasspath(url);
 	}
 
 	public SearchResponse suggest(SuggestBuilder suggestion, String... indices) {

src/main/java/org/springframework/data/elasticsearch/core/EntityMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/EntityOperations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/EsClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/FacetedPage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/FacetedPageImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/GetResultMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -418,7 +418,7 @@ class MappingBuilder {
 			String mappingPath = entity.getRequiredAnnotation(DynamicTemplates.class).mappingPath();
 			if (hasText(mappingPath)) {
 
-				String jsonString = ElasticsearchTemplate.readFileFromClasspath(mappingPath);
+				String jsonString = ResourceUtil.readFileFromClasspath(mappingPath);
 				if (hasText(jsonString)) {
 
 					ObjectMapper objectMapper = new ObjectMapper();

src/main/java/org/springframework/data/elasticsearch/core/MultiGetResultMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.data.elasticsearch.core;
 
-import java.util.LinkedList;
+import java.util.List;
 
 import org.elasticsearch.action.get.MultiGetResponse;
 
@@ -25,5 +25,5 @@ import org.elasticsearch.action.get.MultiGetResponse;
  */
 public interface MultiGetResultMapper {
 
-	<T> LinkedList<T> mapResults(MultiGetResponse responses, Class<T> clazz);
+	<T> List<T> mapResults(MultiGetResponse responses, Class<T> clazz);
 }

src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchOperations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@ import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.action.support.WriteRequest.RefreshPolicy;
 import org.elasticsearch.client.Requests;
+import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.index.get.GetResult;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -50,7 +51,6 @@ import org.elasticsearch.search.sort.SortOrder;
 import org.reactivestreams.Publisher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.NoSuchIndexException;
@@ -76,6 +76,10 @@ import org.springframework.util.Assert;
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Farid Azaza
+ * @author Martin Choraine
+ * @author Peter-Josef Meisch
+ * @author Mathias Teier
  * @since 3.2
  */
 public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOperations {
@@ -244,68 +248,135 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
 			@Nullable String type) {
 
 		return Flux.defer(() -> {
+			SearchRequest request = prepareSearchRequest(buildSearchRequest(query, entity, index, type));
 
-			IndexCoordinates indexCoordinates = operations.determineIndex(entity, index, type);
-			SearchRequest request = new SearchRequest(indices(query, indexCoordinates::getIndexName));
-			request.types(indexTypes(query, indexCoordinates::getTypeName));
-
-			SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-			searchSourceBuilder.query(mappedQuery(query, entity));
-			searchSourceBuilder.version(entity.hasVersionProperty());
-			searchSourceBuilder.trackScores(query.getTrackScores());
-
-			QueryBuilder postFilterQuery = mappedFilterQuery(query, entity);
-			if (postFilterQuery != null) {
-				searchSourceBuilder.postFilter(postFilterQuery);
-			}
-
-			if (query.getSourceFilter() != null) {
-				searchSourceBuilder.fetchSource(query.getSourceFilter().getIncludes(), query.getSourceFilter().getExcludes());
-			}
-
-			sort(query, entity).forEach(searchSourceBuilder::sort);
-
-			if (query.getMinScore() > 0) {
-				searchSourceBuilder.minScore(query.getMinScore());
-			}
-
-			if (query.getIndicesOptions() != null) {
-				request.indicesOptions(query.getIndicesOptions());
-			}
-
-			Pageable pageable = query.getPageable();
-
-			if (pageable.isPaged()) {
-
-				long offset = pageable.getOffset();
-				if (offset > Integer.MAX_VALUE) {
-					throw new IllegalArgumentException(String.format("Offset must not be more than %s", Integer.MAX_VALUE));
-				}
-
-				searchSourceBuilder.from((int) offset);
-				searchSourceBuilder.size(pageable.getPageSize());
-
-				request.source(searchSourceBuilder);
-				return doFind(prepareSearchRequest(request));
-
+			if (query.getPageable().isPaged()) {
+				return doFind(request);
 			} else {
-
-				request.source(searchSourceBuilder);
-				return doScan(prepareSearchRequest(request));
+				return doScroll(request);
 			}
 		});
 	}
 
+	@Override
+	public Mono<Long> count(Query query, Class<?> entityType, String index, String type) {
+		return doCount(query, getPersistentEntity(entityType), index, type);
+	}
+
+	private Mono<Long> doCount(Query query, ElasticsearchPersistentEntity<?> entity, @Nullable String index,
+			@Nullable String type) {
+		return Mono.defer(() -> {
+
+			CountRequest countRequest = buildCountRequest(query, entity, index, type);
+			CountRequest request = prepareCountRequest(countRequest);
+			return doCount(request);
+		});
+
+	}
+
+	private CountRequest buildCountRequest(Query query, ElasticsearchPersistentEntity<?> entity, @Nullable String index,
+			@Nullable String type) {
+
+		IndexCoordinates indexCoordinates = operations.determineIndex(entity, index, type);
+		CountRequest request = new CountRequest(indices(query, indexCoordinates::getIndexName));
+		SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+		searchSourceBuilder.query(mappedQuery(query, entity));
+		searchSourceBuilder.trackScores(query.getTrackScores());
+
+		QueryBuilder postFilterQuery = mappedFilterQuery(query, entity);
+		if (postFilterQuery != null) {
+			searchSourceBuilder.postFilter(postFilterQuery);
+		}
+
+		if (query.getSourceFilter() != null) {
+			searchSourceBuilder.fetchSource(query.getSourceFilter().getIncludes(), query.getSourceFilter().getExcludes());
+		}
+
+		if (query instanceof SearchQuery && ((SearchQuery) query).getCollapseBuilder() != null) {
+			searchSourceBuilder.collapse(((SearchQuery) query).getCollapseBuilder());
+		}
+
+		sort(query, entity).forEach(searchSourceBuilder::sort);
+
+		if (query.getMinScore() > 0) {
+			searchSourceBuilder.minScore(query.getMinScore());
+		}
+
+		if (query.getIndicesOptions() != null) {
+			request.indicesOptions(query.getIndicesOptions());
+		}
+
+		if (query.getPreference() != null) {
+			request.preference(query.getPreference());
+		}
+		request.source(searchSourceBuilder);
+		return request;
+	}
+
+	private SearchRequest buildSearchRequest(Query query, ElasticsearchPersistentEntity<?> entity, @Nullable String index,
+			@Nullable String type) {
+		IndexCoordinates indexCoordinates = operations.determineIndex(entity, index, type);
+		SearchRequest request = new SearchRequest(indices(query, indexCoordinates::getIndexName));
+		SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+		searchSourceBuilder.query(mappedQuery(query, entity));
+		searchSourceBuilder.version(entity.hasVersionProperty());
+		searchSourceBuilder.trackScores(query.getTrackScores());
+
+		QueryBuilder postFilterQuery = mappedFilterQuery(query, entity);
+		if (postFilterQuery != null) {
+			searchSourceBuilder.postFilter(postFilterQuery);
+		}
+
+		if (query.getSourceFilter() != null) {
+			searchSourceBuilder.fetchSource(query.getSourceFilter().getIncludes(), query.getSourceFilter().getExcludes());
+		}
+
+		if (query instanceof SearchQuery && ((SearchQuery) query).getCollapseBuilder() != null) {
+			searchSourceBuilder.collapse(((SearchQuery) query).getCollapseBuilder());
+		}
+
+		sort(query, entity).forEach(searchSourceBuilder::sort);
+
+		if (query.getMinScore() > 0) {
+			searchSourceBuilder.minScore(query.getMinScore());
+		}
+
+		if (query.getIndicesOptions() != null) {
+			request.indicesOptions(query.getIndicesOptions());
+		}
+
+		if (query.getPreference() != null) {
+			request.preference(query.getPreference());
+		}
+
+		if (query.getSearchType() != null) {
+			request.searchType(query.getSearchType());
+		}
+
+		Pageable pageable = query.getPageable();
+
+		if (pageable.isPaged()) {
+
+			long offset = pageable.getOffset();
+			if (offset > Integer.MAX_VALUE) {
+				throw new IllegalArgumentException(String.format("Offset must not be more than %s", Integer.MAX_VALUE));
+			}
+
+			searchSourceBuilder.from((int) offset);
+			searchSourceBuilder.size(pageable.getPageSize());
+
+			request.source(searchSourceBuilder);
+		} else {
+			searchSourceBuilder.from(0);
+			searchSourceBuilder.size(AbstractElasticsearchTemplate.INDEX_MAX_RESULT_WINDOW);
+			request.source(searchSourceBuilder);
+		}
+		return request;
+	}
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations#count(Query, Class, String, String)
 	 */
-	@Override
-	public Mono<Long> count(Query query, Class<?> entityType, String index, String type) {
-
-		// TODO: ES 7.0 has a dedicated CountRequest - use that one once available.
-		return find(query, entityType, index, type).count();
-	}
 
 	/*
 	 * (non-Javadoc)
@@ -442,6 +513,22 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
 		return prepareWriteRequest(request);
 	}
 
+	/**
+	 * Customization hook to modify a generated {@link SearchRequest} prior to its execution. Eg. by setting the
+	 * {@link SearchRequest#indicesOptions(IndicesOptions) indices options} if applicable.
+	 *
+	 * @param request the generated {@link CountRequest}.
+	 * @return never {@literal null}.
+	 */
+	protected CountRequest prepareCountRequest(CountRequest request) {
+
+		if (indicesOptions == null) {
+			return request;
+		}
+
+		return request.indicesOptions(indicesOptions);
+	}
+
 	/**
 	 * Customization hook to modify a generated {@link SearchRequest} prior to its execution. Eg. by setting the
 	 * {@link SearchRequest#indicesOptions(IndicesOptions) indices options} if applicable.
@@ -542,16 +629,32 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
 				.onErrorResume(NoSuchIndexException.class, it -> Mono.empty());
 	}
 
+	/**
+	 * Customization hook on the actual execution result {@link Publisher}. <br />
+	 *
+	 * @param request the already prepared {@link CountRequest} ready to be executed.
+	 * @return a {@link Mono} emitting the result of the operation.
+	 */
+	protected Mono<Long> doCount(CountRequest request) {
+
+		if (QUERY_LOGGER.isDebugEnabled()) {
+			QUERY_LOGGER.debug("Executing doCount: {}", request);
+		}
+
+		return Mono.from(execute(client -> client.count(request))) //
+				.onErrorResume(NoSuchIndexException.class, it -> Mono.empty());
+	}
+
 	/**
 	 * Customization hook on the actual execution result {@link Publisher}. <br />
 	 *
 	 * @param request the already prepared {@link SearchRequest} ready to be executed.
 	 * @return a {@link Flux} emitting the result of the operation.
 	 */
-	protected Flux<SearchHit> doScan(SearchRequest request) {
+	protected Flux<SearchHit> doScroll(SearchRequest request) {
 
 		if (QUERY_LOGGER.isDebugEnabled()) {
-			QUERY_LOGGER.debug("Executing doScan: {}", request);
+			QUERY_LOGGER.debug("Executing doScroll: {}", request);
 		}
 
 		return Flux.from(execute(client -> client.scroll(request))) //
@@ -650,9 +753,7 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
 			elasticsearchQuery = new WrapperQueryBuilder(((StringQuery) query).getSource());
 		} else if (query instanceof NativeSearchQuery) {
 			elasticsearchQuery = ((NativeSearchQuery) query).getQuery();
-		}
-
-		else {
+		} else {
 			throw new IllegalArgumentException(String.format("Unknown query type '%s'.", query.getClass()));
 		}
 

src/main/java/org/springframework/data/elasticsearch/core/ResourceUtil.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2019-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.util.StreamUtils;
+
+/**
+ * Utility to read {@link org.springframework.core.io.Resource}s.
+ *
+ * @author Mark Paluch
+ * @since 3.2
+ */
+abstract class ResourceUtil {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(ResourceUtil.class);
+
+	/**
+	 * Read a {@link ClassPathResource} into a {@link String}.
+	 *
+	 * @param url
+	 * @return
+	 */
+	public static String readFileFromClasspath(String url) {
+
+		ClassPathResource classPathResource = new ClassPathResource(url);
+		try (InputStream is = classPathResource.getInputStream()) {
+			return StreamUtils.copyToString(is, Charset.defaultCharset());
+		} catch (Exception e) {
+			LOGGER.debug(String.format("Failed to load file from url: %s: %s", url, e.getMessage()));
+			return null;
+		}
+	}
+
+	// Utility constructor
+	private ResourceUtil() {}
+}

src/main/java/org/springframework/data/elasticsearch/core/ResultsExtractor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/ResultsMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/ScoredPage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/ScrolledPage.java

@@ -2,12 +2,14 @@
 package org.springframework.data.elasticsearch.core;
 
 import org.springframework.data.domain.Page;
+import org.springframework.lang.Nullable;
 
 /**
  * @author Artur Konczak
+ * @author Peter-Josef Meisch
+ * @author Sascha Woo
  */
 public interface ScrolledPage<T> extends Page<T> {
 
-    String getScrollId();
-
+	String getScrollId();
 }

src/main/java/org/springframework/data/elasticsearch/core/SearchResultMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/SearchResultMapperAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/StreamQueries.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright 2019-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.springframework.data.util.CloseableIterator;
+import org.springframework.util.Assert;
+
+/**
+ * Utility to support streaming queries.
+ *
+ * @author Mark Paluch
+ * @author Sascha Woo
+ * @since 3.2
+ */
+abstract class StreamQueries {
+
+	/**
+	 * Stream query results using {@link ScrolledPage}.
+	 *
+	 * @param page the initial scrolled page.
+	 * @param continueScrollFunction function to continue scrolling applies to the current scrollId.
+	 * @param clearScrollConsumer consumer to clear the scroll context by accepting the current scrollId.
+	 * @param <T>
+	 * @return the {@link CloseableIterator}.
+	 */
+	static <T> CloseableIterator<T> streamResults(ScrolledPage<T> page,
+			Function<String, ScrolledPage<T>> continueScrollFunction, Consumer<String> clearScrollConsumer) {
+
+		Assert.notNull(page, "page must not be null.");
+		Assert.notNull(page.getScrollId(), "scrollId must not be null.");
+		Assert.notNull(continueScrollFunction, "continueScrollFunction must not be null.");
+		Assert.notNull(clearScrollConsumer, "clearScrollConsumer must not be null.");
+
+		return new CloseableIterator<T>() {
+
+			// As we couldn't retrieve single result with scroll, store current hits.
+			private volatile Iterator<T> scrollHits = page.iterator();
+			private volatile String scrollId = page.getScrollId();
+			private volatile boolean continueScroll = scrollHits.hasNext();
+
+			@Override
+			public void close() {
+
+				try {
+					clearScrollConsumer.accept(scrollId);
+				} finally {
+					scrollHits = null;
+					scrollId = null;
+				}
+			}
+
+			@Override
+			public boolean hasNext() {
+
+				if (!continueScroll) {
+					return false;
+				}
+
+				if (!scrollHits.hasNext()) {
+					ScrolledPage<T> nextPage = continueScrollFunction.apply(scrollId);
+					scrollHits = nextPage.iterator();
+					scrollId = nextPage.getScrollId();
+					continueScroll = scrollHits.hasNext();
+				}
+
+				return scrollHits.hasNext();
+			}
+
+			@Override
+			public T next() {
+				if (hasNext()) {
+					return scrollHits.next();
+				}
+				throw new NoSuchElementException();
+			}
+
+			@Override
+			public void remove() {
+				throw new UnsupportedOperationException();
+			}
+		};
+	}
+
+	// utility constructor
+	private StreamQueries() {
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/aggregation/impl/AggregatedPageImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/client/support/AliasData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/core/convert/DateTimeConverters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.